帮助中心增加类型识别

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/HelpCategoryDTO.java

@@ -31,6 +31,11 @@ public class HelpCategoryDTO implements Serializable
      */
     private String name;
 
+    /**
+     * 分类类型  0-帮助中心 1-规则中心 2-佣金中心
+     */
+    private Integer type;
+
     /** 分类图标 */
     private String icon;
 

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/param/HelpCategoryModifyParam.java

@@ -5,6 +5,7 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -33,6 +34,11 @@ public class HelpCategoryModifyParam implements Serializable
 
     /** 分类图标 */
     private String icon;
+    /**
+     * 分类类型  0-帮助中心 1-规则中心 2-佣金中心
+     */
+    @NotNull(message = "类型不能为空")
+    private Integer type;
 
     /** 专题数量 */
     private Long helpCount;

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

@@ -103,7 +103,7 @@ public class MerchantAuthModifyParam implements Serializable {
 //    @NotNull(message = "所属地区不能为空")
 //    @Min(value = 100000, message = "所属地区不能小于100000")
 //    @Max(value = 999999, message = "所属地区不能大于999999")
-    private Integer storeAddress;
+    private String storeAddress;
     /**
      * 经营许可证照片
      */

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

@@ -34,6 +34,11 @@ public class HelpCategory extends ModifyEntity<Long>
     /** $column.columnComment */
     private String name;
 
+    /**
+     * 分类类型  0-帮助中心 1-规则中心 2-佣金中心
+     */
+    private Integer type;
+
     /** 分类图标 */
     private String icon;
 

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

@@ -43,7 +43,7 @@ public class MerchantAuth implements Entity<Long> {
     private Date accountRegistrationDate; // 账号注册日期
     private String storeType; // 店铺类型
     private String storeName; // 店名
-    private Integer storeAddress; // 店铺地址
+    private String storeAddress; // 店铺地址
     private String businessLicensePhoto; // 经营许可证照片
     private String businessLicenseNumberValid; // 经营许可证号
     private Date businessLicenseExpirationDateValid; // 经营许可证有效期

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

@@ -17,6 +17,7 @@ import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import org.mvel2.util.Make.String;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -62,6 +63,7 @@ public class HelpCategoryServiceImpl extends ServiceImpl<HelpCategoryMapper,Help
                 .like(StringUtils.notEmpty(param.getName()),HelpCategory::getName,param.getName())
                 .eq(StringUtils.notEmpty(param.getShowStatus()),HelpCategory::getShowStatus,param.getShowStatus())
                 .eq(StringUtils.notEmpty(param.getCategoryId()),HelpCategory::getId,param.getCategoryId())
+                .eq(HelpCategory::getType,param.getType())
                 .orderByDesc(HelpCategory::getSort)
                 .list();
         List<HelpCategoryDTO> helpCategoryList = HelpCategoryCopier.INSTANCE.copying(helpCategories);

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

@@ -52,7 +52,7 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
     public Long addMerchantAuth(@NonNull MerchantAuthModifyParam param) {
         Long userId = SessionContextHolder.getId();
         if (StringUtils.isEmpty(param.getStoreAddress())){
-            param.setStoreAddress(param.getRegion());
+            param.setStoreAddress(param.getStoreAddress());
         }
         MerchantAuth merchantAuth = MerchantAuthCopier.INSTANCE.copying(param);
         MerchantAuth count = this.lambdaQuery().eq(MerchantAuth::getApplicant, userId).one();
@@ -76,7 +76,7 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
         param1.setOpening(param.getOpening());
         param1.setProvince(param.getProvince());
         param1.setCity(param.getCity());
-        param1.setRegion(param.getStoreAddress());
+        param1.setRegion(param.getRegion());
         param1.setDistrict(param.getDistrict());
         param1.setLatitude(param.getLatitude());
         param1.setLongitude(param.getLongitude());
@@ -96,7 +96,7 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
     @Override
     public void updateMerchantAuth(@NonNull Long id, @NonNull MerchantAuthModifyParam param) {
         if (StringUtils.isEmpty(param.getStoreAddress())){
-            param.setStoreAddress(param.getRegion());
+            param.setStoreAddress(param.getStoreAddress());
         }
         MerchantAuth merchantAuth = AssertUtils.available(this.getById(id), "商家认证不存在");
         MerchantAuthCopier.INSTANCE.copying(param, merchantAuth);
@@ -114,7 +114,7 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
         param1.setOpening(param.getOpening());
         param1.setProvince(param.getProvince());
         param1.setCity(param.getCity());
-        param1.setRegion(param.getStoreAddress());
+        param1.setRegion(param.getRegion());
         param1.setDistrict(param.getDistrict());
         param1.setLatitude(param.getLatitude());
         param1.setLongitude(param.getLongitude());