消息通知配置与商家认证

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/CarouselImagesModifyParam.java

@@ -6,6 +6,7 @@ import lombok.experimental.SuperBuilder;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -18,7 +19,7 @@ import java.util.Date;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class CarouselImagesModifyParam {
+public class CarouselImagesModifyParam implements Serializable {
 
     /**
      * 标题

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/CarouselImagesPagingParam.java

@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -18,7 +19,7 @@ import java.util.Date;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class CarouselImagesPagingParam {
+public class CarouselImagesPagingParam implements Serializable {
 
     /**
      * 分页信息

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/HotMerchantModifyParam.java

@@ -7,6 +7,7 @@ import lombok.experimental.SuperBuilder;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -19,7 +20,7 @@ import java.util.Date;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class HotMerchantModifyParam {
+public class HotMerchantModifyParam implements Serializable {
 
     /**
      * 用户ID

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/IncomeRecordModifyParam.java

@@ -5,6 +5,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -18,16 +21,12 @@ import java.util.Date;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class IncomeRecordModifyParam {
-
-    /**
-     * 邀请用户id
-     */
-    private Long inviterId;
+public class IncomeRecordModifyParam implements Serializable {
 
     /**
      * 被邀请用户id
      */
+    @NotNull(message = "用户id不能为空")
     private Long inviteeId;
 
     /**
@@ -40,15 +39,5 @@ public class IncomeRecordModifyParam {
      */
     private Long orderId;
 
-    /**
-     * 配置ID
-     */
-    private Long configId;
-
-    /**
-     * 邀请产生的金额或数量
-     */
-    private BigDecimal amount;
-
 
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/MerchantAuthModifyParam.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -16,33 +17,101 @@ import java.util.Date;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class MerchantAuthModifyParam {
-    /**
-     * 主键
-     */
-    private Long id;
-    private String businessLicenseId; // 营业执照编号
-    private String businessLicenseNumber; // 营业执照证件号
-    private Date businessLicenseExpirationDate; // 营业执照有效期
-    private String idCardNumber; // 身份证号
-    private byte[] idCardPhoto; // 身份证照片
-    private Date idCardExpirationDate; // 身份证有效期
-    private String storeImage; // 店铺图
-    private String legalRepresentativeName; // 法人姓名
-    private String applicant; // 申请人
-    private String legalRepresentativeGender; // 法人性别
-    private String mobileNumber; // 手机号
-    private String account; // 账号
-    private Date accountRegistrationDate; // 账号注册日期
-    private String storeType; // 店铺类型
-    private String storeName; // 店名
-    private String storeAddress; // 店铺地址
-    private String businessLicensePhoto; // 经营许可证照片
-    private String businessLicenseNumberValid; // 经营许可证号
-    private Date businessLicenseExpirationDateValid; // 经营许可证有效期
-    private Date applicationTime; // 申请时间
-    private String reviewStatus; // 审核状态
-    private String reviewer; // 审核人
-    private String recommendationUser; // 推荐人
-    private Date reviewTime; // 审核时间
+public class MerchantAuthModifyParam implements Serializable {
+    /**
+     * 营业执照编号
+     */
+    private String businessLicenseId;
+    /**
+     * 营业执照证件号
+     */
+    private String businessLicenseNumber;
+    /**
+     * 营业执照有效期
+     */
+    private Date businessLicenseExpirationDate;
+    /**
+     * 身份证号
+     */
+    private String idCardNumber;
+    /**
+     * 身份证照片
+     */
+    private byte[] idCardPhoto;
+    /**
+     * 身份证有效期
+     */
+    private Date idCardExpirationDate;
+    /**
+     * 店铺图
+     */
+    private String storeImage;
+    /**
+     * 法人姓名
+     */
+    private String legalRepresentativeName;
+    /**
+     * 申请人
+     */
+    private String applicant;
+    /**
+     * 法人性别
+     */
+    private String legalRepresentativeGender;
+    /**
+     * 手机号
+     */
+    private String mobileNumber;
+    /**
+     * 账号
+     */
+    private String account;
+    /**
+     * 账号注册日期
+     */
+    private Date accountRegistrationDate;
+    /**
+     * 店铺类型
+     */
+    private String storeType;
+    /**
+     *店名
+     */
+    private String storeName;
+    /**
+     * 店铺地址
+     */
+    private String storeAddress;
+    /**
+     * 经营许可证照片
+     */
+    private String businessLicensePhoto;
+    /**
+     * 经营许可证号
+     */
+    private String businessLicenseNumberValid;
+    /**
+     * 经营许可证有效期
+     */
+    private Date businessLicenseExpirationDateValid;
+    /**
+     * 申请时间
+     */
+    private Date applicationTime;
+    /**
+     * 审核状态
+     */
+    private String reviewStatus;
+    /**
+     * 审核人
+     */
+    private String reviewer;
+    /**
+     * 推荐人
+     */
+    private String recommendationUser;
+    /**
+     * 审核时间
+     */
+    private Date reviewTime;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/MerchantAuthPagingParam.java

@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -18,7 +19,7 @@ import java.util.Date;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class MerchantAuthPagingParam {
+public class MerchantAuthPagingParam implements Serializable {
     /**
      * 分页信息
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/NoticeModifyParam.java

@@ -4,6 +4,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -16,11 +18,12 @@ import java.util.Date;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class NoticeModifyParam {
+public class NoticeModifyParam implements Serializable {
 
     /**
      * 标题
      */
+    @NotEmpty(message = "标题不能为空")
     private String title;
 
     /**
@@ -31,11 +34,13 @@ public class NoticeModifyParam {
     /**
      * 通知对象
      */
+    @NotEmpty(message = "通知对象不能为空")
     private String sendObject;
 
     /**
      * 状态
      */
+    @NotEmpty(message = "状态不能为空")
     private String status;
 
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/NoticePagingParam.java

@@ -7,6 +7,7 @@ import lombok.experimental.SuperBuilder;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.io.Serializable;
 
 /**
  * 通知配置
@@ -18,7 +19,7 @@ import javax.validation.constraints.Size;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class NoticePagingParam {
+public class NoticePagingParam implements Serializable {
 
     /**
      * 分页信息

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/HotMerchantService.java

@@ -18,7 +18,7 @@ public interface HotMerchantService {
      * @param param 新增参数
      * @return 热门搜索主键
      */
-    Long addHotMerchant(HotMerchantModifyParam param);
+    Long addHotMerchant(Long id);
 
     /**
      * 热门搜索商家

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/HotMerchant.java

@@ -35,7 +35,7 @@ public class HotMerchant implements Entity<Long> {
     /**
      * 商家id
      */
-    private String merchantId;
+    private Long merchantId;
 
     /**
      * 创建时间
@@ -45,4 +45,8 @@ public class HotMerchant implements Entity<Long> {
      * 创建人
      */
     private Long creator;
+    /**
+     * 点击次数
+     */
+    private Integer count;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CategoryServiceImpl.java

@@ -1,5 +1,6 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -62,18 +63,22 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
                 .orderByAsc(Category::getSort).list();
         categories.sort(Comparator.comparing(Category::getType).thenComparing(Category::getSort));
         List<CategoryDTO> categoryDTOS = CategoryCopier.INSTANCE.copying(categories);
-        categoryDTOS = categoryDTOS.stream().filter(
-                categoryDTO -> categoryDTO.getParentId() == 0L
-        ).collect(Collectors.toList());
-        List<CategoryDTO> categoryList = CategoryCopier.INSTANCE.copying(categories).stream().filter(
-                categoryDTO -> categoryDTO.getParentId() != 0L
-        ).collect(Collectors.toList());
-        Map<Long,List<CategoryDTO>> map = categoryList.stream()
-                .collect(Collectors.groupingBy(CategoryDTO::getParentId));
-        categoryDTOS.forEach(item ->{
-            item.setChildren(map.get(item.getId()));
-        });
-        return categoryDTOS;
+       List<CategoryDTO> categoryList = new ArrayList<>();
+       for (CategoryDTO categoryDTO:categoryDTOS){
+           if (categoryDTO.getParentId() == 0){
+               categoryList.add(categoryDTO);
+           }
+       }
+        for (CategoryDTO categoryDTO:categoryList){
+            List<CategoryDTO> categorys = new ArrayList<>();
+            for (CategoryDTO categorydto:categoryDTOS){
+                if (categorydto.getParentId() == categoryDTO.getId()){
+                    categorys.add(categorydto);
+                }
+            }
+            categoryDTO.setChildren(categorys);
+        }
+        return categoryList;
     }
 
     @Override

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/HotMerchantServiceImpl.java

@@ -23,19 +23,22 @@ import java.util.List;
 public class HotMerchantServiceImpl extends ServiceImpl<HotMerchantMapper, HotMerchant> implements HotMerchantService,
         com.chelvc.cloud.vehicle.api.service.HotMerchantService{
     @Override
-    public Long addHotMerchant(@NonNull HotMerchantModifyParam param) {
-        HotMerchant hotMerchant = HotMerchantCopier.INSTANCE.copying(param);
+    public Long addHotMerchant(@NonNull Long id) {
+        HotMerchant hotMerchant = new HotMerchant();
+        hotMerchant.setMerchantId(id);
         Long userId = SessionContextHolder.getId();
         hotMerchant.setUserId(userId);
         hotMerchant.setCreator(userId);
         hotMerchant.setCreateTime(new Date());
+        hotMerchant.setCount(1);
         this.save(hotMerchant);
         return hotMerchant.getId();
     }
 
     @Override
     public List<MerchantDTO> listHotMerchant(){
-        return this.baseMapper.listHotMerchant();
+        List<MerchantDTO> merchantList = this.baseMapper.listHotMerchant();
+        return merchantList;
     }
 
 

vehicle-server/src/main/resources/mapper/HotmerchantMapper.xml

@@ -18,7 +18,7 @@
                mt.create_time as createTime
             FROM
                 ( SELECT merchant_id,user_id, count( merchant_id) FROM hot_merchant GROUP BY merchant_id,user_id ORDER BY count( merchant_id ) DESC ) t
-                LEFT JOIN merchant m ON t.merchant_id = m.id where t.user_id = #{userId}
+                LEFT JOIN merchant mt ON t.merchant_id = mt.id where t.user_id = #{userId}
     </select>
 
 </mapper>