商家认证和商家信息合在一起

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

@@ -1,14 +1,18 @@
 package com.chelvc.cloud.vehicle.client.param;
+import com.chelvc.framework.common.model.File;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 商家认证数据模型
@@ -135,7 +139,7 @@ public class MerchantAuthModifyParam implements Serializable {
     /**
      * 店铺内部环境图
      */
-    private String storeInnerImage;
+    private List<File> storeInnerImage;
 
 
     /**
@@ -149,4 +153,69 @@ public class MerchantAuthModifyParam implements Serializable {
      */
     @Size(max = 255, message = "邮箱长度不能大于255")
     private String email;
+
+
+    /**
+     * 营业时间
+     */
+    @NotEmpty(message = "营业时间不能为空")
+    @Size(max = 50, message = "营业时间长度不能大于50")
+    private String opening;
+    /**
+     * 所属地区
+     */
+    @NotNull(message = "所属地区不能为空")
+    @Min(value = 100000, message = "所属地区不能小于100000")
+    @Max(value = 999999, message = "所属地区不能大于999999")
+    private Integer region;
+
+    /**
+     * 省
+     */
+    @NotNull(message = "所属省份不能为空")
+    @Min(value = 100000, message = "所属省份不能小于100000")
+    @Max(value = 999999, message = "所属省份不能大于999999")
+    private Integer province;
+
+    /**
+     * 市
+     */
+    @NotNull(message = "所属城市不能为空")
+    @Min(value = 100000, message = "所属城市不能小于100000")
+    @Max(value = 999999, message = "所属城市不能大于999999")
+    private Integer city;
+
+    /**
+     * 区
+     */
+    @NotNull(message = "所在地区不能为空")
+    @Min(value = 100000, message = "所属区不能小于100000")
+    @Max(value = 999999, message = "所属区不能大于999999")
+    private Integer district;
+
+    /**
+     * 经度
+     */
+    @NotNull(message = "经度不能为空")
+    private Double longitude;
+
+    /**
+     * 纬度
+     */
+    @NotNull(message = "纬度不能为空")
+    private Double latitude;
+
+    /**
+     * 商家主营业务
+     */
+    private Long mainBusiness;
+    /**
+     * 商家副营业务
+     */
+    private List<Long> ancillaryBusiness;
+
+    /**
+     * 营业状态 0-营业中 1-休息中
+     */
+    private String businessStatus;
 }

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

@@ -22,8 +22,10 @@ import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 商家认证业务操作实现
@@ -48,11 +50,22 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
         this.save(merchantAuth);
         MerchantModifyParam param1 = new MerchantModifyParam();
         param1.setName(param.getStoreName());
-        param1.setMobile(param.getLegalRepresentativeName());
+        param1.setLiaison(param.getLegalRepresentativeName());
         param1.setMobile(param.getMobileNumber());
         param1.setAddress(param.getStoreAddressDetail());
         param1.setRecommend(true);
         param1.setBusinessStatus("1");
+        param1.setLogo(param.getStoreImage());
+        param1.setOpening(param.getOpening());
+        param1.setProvince(param.getProvince());
+        param1.setCity(param.getCity());
+        param1.setRegion(param.getRegion());
+        param1.setDistrict(param.getDistrict());
+        param1.setLatitude(param.getLatitude());
+        param1.setLongitude(param.getLongitude());
+        param1.setMainBusiness(param.getMainBusiness());
+        param1.setAncillaryBusiness(param.getAncillaryBusiness());
+        param1.setBanners(param.getStoreInnerImage());
         this.merchantService.addMerchant(param1);
         return merchantAuth.getId();
     }
@@ -62,6 +75,32 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
         MerchantAuth merchantAuth = AssertUtils.available(this.getById(id), "商家认证不存在");
         MerchantAuthCopier.INSTANCE.copying(param, merchantAuth);
         this.updateById(merchantAuth);
+        MerchantModifyParam param1 = new MerchantModifyParam();
+        param1.setName(param.getStoreName());
+        param1.setLiaison(param.getLegalRepresentativeName());
+        param1.setMobile(param.getMobileNumber());
+        param1.setAddress(param.getStoreAddressDetail());
+        param1.setRecommend(true);
+        param1.setBusinessStatus("1");
+        param1.setLogo(param.getStoreImage());
+        param1.setOpening(param.getOpening());
+        param1.setProvince(param.getProvince());
+        param1.setCity(param.getCity());
+        param1.setRegion(param.getRegion());
+        param1.setDistrict(param.getDistrict());
+        param1.setLatitude(param.getLatitude());
+        param1.setLongitude(param.getLongitude());
+        param1.setMainBusiness(param.getMainBusiness());
+        param1.setAncillaryBusiness(param.getAncillaryBusiness());
+        param1.setBanners(param.getStoreInnerImage());
+        Long userId = SessionContextHolder.getId();
+        List<Long> merchantIds = this.merchantService.getMerchantIdsByUserId(userId);
+        if (CollectionUtils.isEmpty(merchantIds)){
+            this.merchantService.addMerchant(param1);
+        }else{
+            this.merchantService.updateMerchant(merchantIds.get(0),param1);
+        }
+
     }
 
     @Override