机构更新资料

src/main/java/com/caimei365/user/controller/RegisterApi.java

@@ -2,10 +2,7 @@ package com.caimei365.user.controller;
 
 import com.caimei365.user.idempotent.Idempotent;
 import com.caimei365.user.model.ResponseJson;
-import com.caimei365.user.model.dto.ClubOnlineDto;
-import com.caimei365.user.model.dto.ClubRegisterDto;
-import com.caimei365.user.model.dto.ClubUpgradeDto;
-import com.caimei365.user.model.dto.ShopRegisterDto;
+import com.caimei365.user.model.dto.*;
 import com.caimei365.user.model.po.ClubPo;
 import com.caimei365.user.model.po.ShopPo;
 import com.caimei365.user.service.RegisterService;
@@ -170,10 +167,19 @@ public class RegisterApi {
         return registerService.shopRegister(shopRegisterDto, passWordConfirm, smsCode, isAgreed, whichStep, headers);
     }
 
+    /**
+     * 更新供应商申请信息
+     *
+     * spi旧接口：/supplier/updateCompanyInfo
+     *
+     * @param shopApplyDto  ShopApplyDto
+     * @param headers       HttpHeaders
+     * @return              ShopPo
+     */
     @ApiOperation("更新供应商申请信息")
     @PostMapping("/apply/update")
-    public ResponseJson<ShopPo> updateShopApplyInfo(ShopRegisterDto shopRegisterDto, @RequestHeader HttpHeaders headers){
-        return registerService.updateShopApply(shopRegisterDto, headers);
+    public ResponseJson<ShopPo> updateShopApplyInfo(ShopApplyDto shopApplyDto, @RequestHeader HttpHeaders headers){
+        return registerService.updateShopApply(shopApplyDto, headers);
     }
 
 }

src/main/java/com/caimei365/user/model/dto/ClubOnlineDto.java

@@ -1,9 +1,9 @@
 package com.caimei365.user.model.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -12,6 +12,7 @@ import java.io.Serializable;
  * @author : Aslee
  * @date : 2021/3/18
  */
+@ApiModel("协销拉机构上线")
 @Data
 public class ClubOnlineDto implements Serializable {
     /**

src/main/java/com/caimei365/user/model/dto/ClubRegisterDto.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * @author : Charles
  * @date : 2021/3/11
  */
-@ApiModel("机构注册参数")
+@ApiModel("机构注册")
 @Data
 public class ClubRegisterDto implements Serializable {
     /**

src/main/java/com/caimei365/user/model/dto/ClubUpdateDto.java

@@ -1,5 +1,6 @@
 package com.caimei365.user.model.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,6 +12,7 @@ import java.io.Serializable;
  * @author : Charles
  * @date : 2021/3/11
  */
+@ApiModel("机构更新资料")
 @Data
 public class ClubUpdateDto implements Serializable {
     /**

src/main/java/com/caimei365/user/model/dto/ClubUpgradeDto.java

@@ -1,5 +1,6 @@
 package com.caimei365.user.model.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,6 +12,7 @@ import java.io.Serializable;
  * @author : Charles
  * @date : 2021/3/11
  */
+@ApiModel("升级会员机构")
 @Data
 public class ClubUpgradeDto implements Serializable {
     /**

src/main/java/com/caimei365/user/model/dto/ShopApplyDto.java

@@ -0,0 +1,101 @@
+package com.caimei365.user.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/3/24
+ */
+@ApiModel("供应商更新资料")
+@Data
+public class ShopApplyDto implements Serializable {
+    /**
+     * 供应商Id
+     */
+    @ApiModelProperty("供应商Id")
+    private Integer shopId;
+    /**
+     * 用户Id
+     */
+    @ApiModelProperty("用户Id")
+    private Integer userId;
+    /**
+     * 组织名称
+     */
+    @ApiModelProperty("组织名称")
+    private String name;
+    /**
+     * 供应商公司简称(shortName)
+     */
+    @ApiModelProperty("供应商公司简称(sname)")
+    private String shortName;
+    /**
+     * 邮箱
+     */
+    @ApiModelProperty("邮箱")
+    private String email;
+    /**
+     * 联系人
+     */
+    @ApiModelProperty("联系人")
+    private String linkMan;
+/**
+     * 省(provinceId)
+     */
+    @ApiModelProperty("省")
+    private Integer provinceId;
+    /**
+     * 市(cityId)
+     */
+    @ApiModelProperty("市")
+    private Integer cityId;
+    /**
+     * 地址Id(townId)
+     */
+    @ApiModelProperty("地址Id")
+    private Integer townId;
+    /**
+     * 地址
+     */
+    @ApiModelProperty("地址")
+    private String address;
+    /**
+     * 统一社会信用代码
+     */
+    @NotNull(message = "营业执照编号不能为空")
+    @ApiModelProperty("统一社会信用代码")
+    private String socialCreditCode;
+    /**
+     * 营业执照(businessLicenseImage)
+     */
+    @ApiModelProperty("营业执照(businessLicenseImage)")
+    private String businessLicense;
+    /**
+     * 医疗=1和非医疗=2
+     */
+    @ApiModelProperty("医疗=1和非医疗=2")
+    private String firstShopType;
+    /**
+     * 医疗的二级分类 一类器械=1、二类器械 =2、三类器械=3、其他=4 /// 1和非医疗没有二级分类
+     */
+    @ApiModelProperty("医疗的二级分类 一类器械=1、二类器械 =2、三类器械=3、其他=4")
+    private String secondShopType;
+    /**
+     * 主打项目(mainpro)
+     */
+    @ApiModelProperty("主打项目(mainpro)")
+    private String mainProduct;
+    /**
+     * 是否同意勾选同意协议，1是，其他否
+     */
+    @NotNull
+    @ApiModelProperty("是否同意勾选同意协议，1是，其他否")
+    private Integer isAgreed;
+}

src/main/java/com/caimei365/user/model/dto/ShopRegisterDto.java

@@ -1,5 +1,6 @@
 package com.caimei365.user.model.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,6 +13,7 @@ import java.io.Serializable;
  * @author : Aslee
  * @date : 2021/3/12
  */
+@ApiModel("供应商注册")
 @Data
 public class ShopRegisterDto implements Serializable {
     /**

src/main/java/com/caimei365/user/model/dto/ShopUpdateDto.java

@@ -1,5 +1,6 @@
 package com.caimei365.user.model.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,6 +13,7 @@ import java.util.List;
  * @author : Aslee
  * @date : 2021/3/12
  */
+@ApiModel("供应商更新资料")
 @Data
 public class ShopUpdateDto implements Serializable {
     /**

src/main/java/com/caimei365/user/service/RegisterService.java

@@ -1,10 +1,7 @@
 package com.caimei365.user.service;
 
 import com.caimei365.user.model.ResponseJson;
-import com.caimei365.user.model.dto.ClubOnlineDto;
-import com.caimei365.user.model.dto.ClubRegisterDto;
-import com.caimei365.user.model.dto.ClubUpgradeDto;
-import com.caimei365.user.model.dto.ShopRegisterDto;
+import com.caimei365.user.model.dto.*;
 import com.caimei365.user.model.po.ClubPo;
 import com.caimei365.user.model.po.ShopPo;
 import org.springframework.http.HttpHeaders;
@@ -130,10 +127,11 @@ public interface RegisterService {
     ResponseJson<ShopPo> shopRegister(ShopRegisterDto shopRegisterDto, String passWordConfirm, String smsCode, Integer isAgreed, Integer whichStep, HttpHeaders headers);
 
     /**
+     * 更新供应商申请信息
      *
-     * @param shopRegisterDto   ShopRegisterDto
+     * @param shopApplyDto      ShopRegisterDto
      * @param headers           HttpHeaders
      * @return ShopPo
      */
-    ResponseJson<ShopPo> updateShopApply(ShopRegisterDto shopRegisterDto, HttpHeaders headers);
+    ResponseJson<ShopPo> updateShopApply(ShopApplyDto shopApplyDto, HttpHeaders headers);
 }

src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -111,7 +111,8 @@ public class ClubServiceImpl implements ClubService {
     @Override
     public ResponseJson<ClubUpdateDto> updateClubUserInfo(ClubUpdateDto club) {
         // 参数校验
-        if (club.getClubId() == null) {
+        if (club.getClubId() == null || club.getUserId() == null || StringUtils.isBlank(club.getLinkMan())
+        || StringUtils.isBlank(club.getName()) || StringUtils.isBlank(club.getContractEmail())) {
             return ResponseJson.error("参数异常", null);
         }
         UserPo user = new UserPo();

src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -4,10 +4,7 @@ import com.caimei365.user.mapper.BaseMapper;
 import com.caimei365.user.mapper.LoginMapper;
 import com.caimei365.user.mapper.RegisterMapper;
 import com.caimei365.user.model.ResponseJson;
-import com.caimei365.user.model.dto.ClubOnlineDto;
-import com.caimei365.user.model.dto.ClubRegisterDto;
-import com.caimei365.user.model.dto.ClubUpgradeDto;
-import com.caimei365.user.model.dto.ShopRegisterDto;
+import com.caimei365.user.model.dto.*;
 import com.caimei365.user.model.po.ClubPo;
 import com.caimei365.user.model.po.OperationPo;
 import com.caimei365.user.model.po.ShopPo;
@@ -720,12 +717,12 @@ public class RegisterServiceImpl implements RegisterService {
     }
 
     /**
-     * @param shopRegisterDto ShopRegisterDto
+     * @param shopApplyDto    ShopApplyDto
      * @param headers         HttpHeaders
      * @return ShopPo
      */
     @Override
-    public ResponseJson<ShopPo> updateShopApply(ShopRegisterDto shopRegisterDto, HttpHeaders headers) {
+    public ResponseJson<ShopPo> updateShopApply(ShopApplyDto shopApplyDto, HttpHeaders headers) {
         /*if (null == shopRegisterDto || null == ShopRegisterDto.getUserId() || null == shop.getShopID()) {
             return ResponseJson.error("参数异常", null);
         }