商家端预约管理优化

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

@@ -156,6 +156,14 @@ public class MerchantAuthModifyParam implements Serializable {
     @Size(max = 255, message = "邮箱长度不能大于255")
     private String email;
 
+    /**
+     * 所属地区
+     */
+    @NotNull(message = "所属地区不能为空")
+    @Min(value = 100000, message = "所属地区不能小于100000")
+    @Max(value = 999999, message = "所属地区不能大于999999")
+    private Integer region;
+
 
     /**
      * 营业时间

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

@@ -45,6 +45,9 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
     @Override
     public Long addMerchantAuth(@NonNull MerchantAuthModifyParam param) {
         Long userId = SessionContextHolder.getId();
+        if (StringUtils.isEmpty(param.getStoreAddress())){
+            param.setStoreAddress(param.getRegion());
+        }
         MerchantAuth merchantAuth = MerchantAuthCopier.INSTANCE.copying(param);
         Integer count = this.lambdaQuery().eq(MerchantAuth::getApplicant, userId).count();
         AssertUtils.available(count <= 0, "商家认证已存在");
@@ -82,6 +85,9 @@ 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());
+        }
         MerchantAuth merchantAuth = AssertUtils.available(this.getById(id), "商家认证不存在");
         MerchantAuthCopier.INSTANCE.copying(param, merchantAuth);
         merchantAuth.setReviewStatus("2");