接口文档2

src/main/java/com/caimei365/user/controller/AllApi.txt

@@ -18,7 +18,7 @@ public class AllApi {
      * @param passWordConfirm       用户确认密码
      * @param name                  组织名称
      * @param linkMan               联系人
-     * @param sname                 供应商公司简称
+     * @param shortName                 供应商公司简称
      * @param provinceID            省
      * @param cityID                市
      * @param townID                所在县区Id
@@ -389,7 +389,7 @@ public class AllApi {
      * @param clubID                        机构ID
      * @param name                          机构名称
      * @param linkMan1                      联系人
-     * @param sname                         机构简称
+     * @param shortName                         机构简称
      * @param contractEmail1                邮箱
      * @param provinceID                    省
      * @param cityID                        市

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

@@ -57,10 +57,10 @@ public class BaseApi {
     @GetMapping("/sms/code")
     public ResponseJson getSmsCode(
         @ApiParam(required = true, value = "手机号") @RequestParam("mobile") String mobile,
-        String activateCodeType,
-        String imgCode,
-        String token,
-        Integer platformType
+        @ApiParam(required = true, value = "1:找回密码,2:手机号注册机构,3:供应商注册") String activateCodeType,
+        @ApiParam(required = true, value = "图片验证码") String imgCode,
+        @ApiParam(required = true, value = "图片token") String token,
+        @ApiParam(required = true, value = "0:www，1:crm/h5，2:小程序") Integer platformType
     ) {
         return baseService.getSmsCode(mobile, activateCodeType, imgCode, token, platformType);
     }

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

@@ -4,11 +4,10 @@ import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.model.dto.ClubUpdateDto;
 import com.caimei365.user.service.ClubService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -36,8 +35,11 @@ public class ClubApi {
      *
      * @return Map(userPo,clubPo)
      */
+    @ApiOperation("查询机构资料")
     @GetMapping("/info")
-    public ResponseJson<Map<String, Object>> getClubUserInfo(Integer userId) {
+    public ResponseJson<Map<String, Object>> getClubUserInfo(
+    	@ApiParam(required = true, value = "用户Id") @RequestParam("userId") Integer userId
+    ) {
         return clubService.getClubUserInfo(userId);
     }
 
@@ -50,7 +52,7 @@ public class ClubApi {
 	 *                      clubId                 机构ID
 	 *                      userId                 用户ID
 	 *                      name                   机构名称
-	 *                      sName                  机构简称(sname)
+	 *                      shortName                  机构简称(shortName)
 	 *                      contractEmail          邮箱（contractEmail1）
 	 *                      contractPhone          固定电话
 	 *                      linkMan                联系人（linkMan1）
@@ -71,6 +73,7 @@ public class ClubApi {
 	 *                  }
 	 * @return ClubUpdateDto
      */
+	@ApiOperation("更新机构资料")
     @PostMapping("/info/update")
     public ResponseJson<ClubUpdateDto> updateClubUserInfo(ClubUpdateDto club) {
 		return clubService.updateClubUserInfo(club);

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

@@ -4,6 +4,8 @@ import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.model.vo.UserLoginVo;
 import com.caimei365.user.service.LoginService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.*;
@@ -33,8 +35,12 @@ public class LoginApi {
      * @param password 密码
      * @return BaseUser
      */
+    @ApiOperation("登录(用户名，密码)")
     @PostMapping("/password")
-    public ResponseJson<UserLoginVo> passwordLogin(String mobileOrEmail, String password) {
+    public ResponseJson<UserLoginVo> passwordLogin(
+        @ApiParam(required = true, value = "手机号或邮箱") @RequestParam("mobileOrEmail") String mobileOrEmail,
+        @ApiParam(required = true, value = "密码") @RequestParam("password") String password
+    ) {
         return loginService.passwordLogin(mobileOrEmail, password);
     }
 
@@ -47,8 +53,14 @@ public class LoginApi {
      * @param encryptedData 微信加密数据
      * @param iv            加密算法的初始向量
      */
+    @ApiOperation("微信授权登录(小程序)")
     @PostMapping("/auth/applets")
-    public ResponseJson<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, @RequestHeader HttpHeaders headers) {
+    public ResponseJson<UserLoginVo> appletsAuthorization(
+        @ApiParam("微信授权code") @RequestParam("code") String code,
+        @ApiParam("微信加密数据") @RequestParam("encryptedData") String encryptedData,
+        @ApiParam("加密算法的初始向量") @RequestParam("iv") String iv,
+        @RequestHeader HttpHeaders headers
+    ) {
         return loginService.appletsAuthorization(code, encryptedData, iv, headers);
     }
 
@@ -60,8 +72,12 @@ public class LoginApi {
      * @param redirectUri 用于微信授权的中间页面
      * @param mode        授权方式：1静默授权，其他手动同意授权
      */
+    @ApiOperation("微信公众号授权链接(www)")
     @GetMapping("/auth/link")
-    public ResponseJson<String> getAuthorizationLink(String redirectUri, Integer mode) {
+    public ResponseJson<String> getAuthorizationLink(
+        @ApiParam("用于微信授权的中间页面") @RequestParam("redirectUri") String redirectUri,
+        @ApiParam("授权方式：1静默授权，其他手动同意授权") @RequestParam("mode") Integer mode
+    ) {
         return loginService.getAuthorizationLink(redirectUri, mode);
     }
 
@@ -74,8 +90,14 @@ public class LoginApi {
      * @param state 安全认证
      * @param mode  1:静默授权,2:用户手动授权
      */
+    @ApiOperation("微信公众号授权登录(www)")
     @GetMapping("/auth/website")
-    public ResponseJson<UserLoginVo> websiteAuthorization(String code, String state, Integer mode, @RequestHeader HttpHeaders headers) {
+    public ResponseJson<UserLoginVo> websiteAuthorization(
+        @ApiParam("微信授权code") @RequestParam("code") String code,
+        @ApiParam("安全认证") @RequestParam("state") String state,
+        @ApiParam("1:静默授权,2:用户手动授权") @RequestParam("mode") Integer mode,
+        @RequestHeader HttpHeaders headers
+    ) {
         return loginService.websiteAuthorization(code, state, mode, headers);
     }
 
@@ -96,6 +118,7 @@ public class LoginApi {
      *
      * @return Map(appId,redirectUri,state)
      */
+    @ApiOperation("获取生成微信二维码的参数")
     @GetMapping("/auth/parameters")
     public ResponseJson<Map<String, String>> getAuthParameters(){
         return loginService.getAuthParameters();
@@ -109,8 +132,12 @@ public class LoginApi {
      * @param code      微信code
      * @param state     安全认证key（第一步获取参数时自定义生成的uuid）
      */
+    @ApiOperation("扫码后微信服务器回调")
     @GetMapping("/auth/callback")
-    public void qrCodeAuthScan(String code, String state) {
+    public void qrCodeAuthScan(
+        @ApiParam("微信授权code") @RequestParam("code") String code,
+        @ApiParam("安全认证") @RequestParam("state") String state
+    ) {
         loginService.qrCodeAuthScan(code, state);
     }
 
@@ -122,8 +149,11 @@ public class LoginApi {
      * @param state   安全认证key（第一步获取参数时自定义生成的uuid）
      * @return UserLoginVo
      */
+    @ApiOperation("校验扫码登录结果")
     @GetMapping("/auth/scan/result")
-    public ResponseJson<UserLoginVo> qrCodeAuthScanResult(String state){
+    public ResponseJson<UserLoginVo> qrCodeAuthScanResult(
+        @ApiParam("安全认证") @RequestParam("state") String state
+    ){
         return loginService.qrCodeAuthScanResult(state);
     }
 
@@ -138,8 +168,14 @@ public class LoginApi {
      * @param unionId        微信unionId
      * @return UserLoginVo
      */
+    @ApiOperation("运营人员邀请码授权登录")
     @PostMapping("/auth/invitation")
-    public ResponseJson<UserLoginVo> invitationCodeLogin(String invitationCode, String nickName, String avatarUrl, String unionId) {
+    public ResponseJson<UserLoginVo> invitationCodeLogin(
+        @ApiParam("邀请码") @RequestParam("invitationCode") String invitationCode,
+        @ApiParam("微信昵称") @RequestParam("nickName") String nickName,
+        @ApiParam("微信头像(headimgurl)") @RequestParam("avatarUrl") String avatarUrl,
+        @ApiParam("微信unionId") @RequestParam("unionId") String unionId
+    ) {
         return loginService.invitationCodeLogin(invitationCode, nickName, avatarUrl, unionId);
     }
 
@@ -154,8 +190,14 @@ public class LoginApi {
      * @param smsCode   微信unionId
      * @return OperationPo
      */
+    @ApiOperation("运营人员绑定微信")
     @PostMapping("/auth/wechat/bind")
-    public ResponseJson<UserLoginVo> operationBindWeChat(Integer userId, String mobile, String smsCode, String unionId) {
+    public ResponseJson<UserLoginVo> operationBindWeChat(
+        @ApiParam("要绑定的用户Id") @RequestParam("userId") Integer userId,
+        @ApiParam("手机号") @RequestParam("mobile") String mobile,
+        @ApiParam("手机验证码(verificationCode)") @RequestParam("smsCode") String smsCode,
+        @ApiParam("微信unionId") @RequestParam("unionId") String unionId
+    ) {
         return loginService.operationBindWeChat(userId, mobile, smsCode, unionId);
     }
 

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

@@ -72,7 +72,7 @@ public class RegisterApi {
      *                      clubId                 机构ID
      *                      userId                 用户ID
      *                      name                   机构名称
-     *                      sName                  机构简称
+     *                      shortName                  机构简称
      *                      contractEmail          邮箱（contractEmail1）
      *                      contractPhone          固定电话
      *                      linkMan                联系人（linkMan1）
@@ -112,7 +112,7 @@ public class RegisterApi {
      *                  source                  注册来源: 0网站 1小程序
      *                  userId                  协销用户ID(userID)
      *                  name                    机构名称
-     *                  sName                   机构简称(sname)
+     *                  shortName                   机构简称(shortName)
      *                  bindMobile              企业绑定手机号
      *                  contractEmail           邮箱（email）
      *                  linkMan                 联系人（linkMan1）
@@ -137,7 +137,7 @@ public class RegisterApi {
     @PostMapping("/club/online")
     public ResponseJson<ClubPo> clubOnline(
         ClubOnlineDto onlineDto,
-        @ApiParam("是否同意勾选同意协议，1是，其他否") @RequestParam("isAgreed") Integer isAgreed,
+        @ApiParam(required = true, value = "是否同意勾选同意协议，1是，其他否") @RequestParam("isAgreed") Integer isAgreed,
         @RequestHeader HttpHeaders headers
     ) {
         return registerService.clubOnline(onlineDto, isAgreed, headers);
@@ -151,7 +151,7 @@ public class RegisterApi {
      * @param shopRegisterDto ShopRegisterDto{
      *                        source                注册来源: 0网站 1小程序
      *                        name                  组织名称
-     *                        sName                 供应商公司简称(sname)
+     *                        shortName                 供应商公司简称(shortName)
      *                        bindMobile            企业绑定手机号
      *                        email                 邮箱
      *                        password              密码
@@ -178,10 +178,10 @@ public class RegisterApi {
     @PostMapping("/shop/applets")
     public ResponseJson<ShopPo> shopRegister(
         ShopRegisterDto shopRegisterDto,
-        @ApiParam("用户确认密码") @RequestParam("passWordConfirm") String passWordConfirm,
-        @ApiParam("短信验证码") @RequestParam("smsCode") String smsCode,
-        @ApiParam("是否同意勾选同意协议，1是，其他否") @RequestParam("isAgreed") Integer isAgreed,
-        @ApiParam("注册步数: PC(0)，小程序(1,2,3)") @RequestParam("whichStep") Integer whichStep,
+        @ApiParam(required = true, value = "用户确认密码") @RequestParam("passWordConfirm") String passWordConfirm,
+        @ApiParam(required = true, value = "短信验证码") @RequestParam("smsCode") String smsCode,
+        @ApiParam(required = true, value = "是否同意勾选同意协议，1是，其他否") @RequestParam("isAgreed") Integer isAgreed,
+        @ApiParam(required = true, value = "注册步数: PC(0)，小程序(1,2,3)") @RequestParam("whichStep") Integer whichStep,
         @RequestHeader HttpHeaders headers
     ) {
         return registerService.shopRegister(shopRegisterDto, passWordConfirm, smsCode, isAgreed, whichStep, headers);

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

@@ -4,6 +4,8 @@ import com.caimei365.user.model.ResponseJson;
 import com.caimei365.user.model.dto.ShopUpdateDto;
 import com.caimei365.user.service.ShopService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,8 +34,11 @@ public class ShopApi {
      *
      * @return Map(userPo,clubPo)
      */
+    @ApiOperation("查询供应商资料")
     @GetMapping("/info")
-    public ResponseJson<Map<String, Object>> getShopUserInfo(Integer userId) {
+    public ResponseJson<Map<String, Object>> getShopUserInfo(
+    	@ApiParam(required = true, value = "用户Id") @RequestParam("userId") Integer userId
+    ) {
         return shopService.getShopUserInfo(userId);
     }
 
@@ -46,7 +51,7 @@ public class ShopApi {
      *                        shopId                    供应商Id
      *                        userId                    用户Id
      *                        name                      组织名称
-     *                        sName                     供应商公司简称(sname)
+     *                        shortName                     供应商公司简称(shortName)
      *                        email                     邮箱
      *                        contractPhone             固定电话
      *                        linkMan                   联系人
@@ -77,13 +82,16 @@ public class ShopApi {
      * @param productCertification      产品证书
      * @return ClubUpdateDto
      */
+    @ApiOperation("更新供应商资料")
     @PostMapping("/info/update")
-    public ResponseJson<ShopUpdateDto> updateShopUserInfo(ShopUpdateDto shopUpdateDto,
-                                                                String operationLicence,
-                                                                String hygienicLicense,
-                                                                String taxLicense,
-                                                                String honorCertification,
-                                                                String productCertification) {
+    public ResponseJson updateShopUserInfo(
+        ShopUpdateDto shopUpdateDto,
+        @ApiParam("生产经营证书(productionLicence)") @RequestParam("operationLicence") String operationLicence,
+        @ApiParam("卫生许可证") @RequestParam("hygienicLicense") String hygienicLicense,
+        @ApiParam("税务登记证") @RequestParam("taxLicense") String taxLicense,
+        @ApiParam("荣誉证书(certificateHonor)") @RequestParam("honorCertification") String honorCertification,
+        @ApiParam("产品证书") @RequestParam("productCertification") String productCertification
+    ) {
         return shopService.updateShopUserInfo(shopUpdateDto, operationLicence, hygienicLicense, taxLicense, honorCertification, productCertification);
     }
 

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

@@ -26,8 +26,8 @@ public class ClubOnlineDto implements Serializable {
     /**
      * 机构简称
      */
-    @ApiModelProperty("机构简称")
-    private String sName;
+    @ApiModelProperty("机构简称sname")
+    private String shortName;
     /**
      * 企业绑定手机号
      */

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

@@ -31,8 +31,8 @@ public class ClubUpdateDto implements Serializable {
     /**
      * 机构简称
      */
-    @ApiModelProperty("机构简称")
-    private String sName;
+    @ApiModelProperty("机构简称sname")
+    private String shortName;
     /**
      * 联系邮箱
      */

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

@@ -31,8 +31,8 @@ public class ClubUpgradeDto implements Serializable {
     /**
      * 机构简称
      */
-    @ApiModelProperty("机构简称")
-    private String sName;
+    @ApiModelProperty("机构简称sname")
+    private String shortName;
     /**
      * 联系邮箱
      */

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

@@ -24,10 +24,10 @@ public class ShopRegisterDto implements Serializable {
     @ApiModelProperty("组织名称")
     private String name;
     /**
-     * 供应商公司简称(sname)
+     * 供应商公司简称(shortName)
      */
-    @ApiModelProperty("供应商公司简称(sname)")
-    private String sName;
+    @ApiModelProperty("供应商公司简称(shortName)")
+    private String shortName;
 
     /**
      * 企业绑定手机号

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

@@ -29,10 +29,10 @@ public class ShopUpdateDto implements Serializable {
     @ApiModelProperty("组织名称")
     private String name;
     /**
-     * 供应商公司简称(sname)
+     * 供应商公司简称(shortName)
      */
-    @ApiModelProperty("供应商公司简称(sname)")
-    private String sName;
+    @ApiModelProperty("供应商公司简称sname")
+    private String shortName;
     /**
      * 邮箱
      */

src/main/java/com/caimei365/user/model/po/ClubPo.java

@@ -28,7 +28,7 @@ public class ClubPo implements Serializable {
     /**
      * 机构简称
      */
-    private String sName;
+    private String shortName;
     /**
      * 联系手机
      */

src/main/java/com/caimei365/user/model/po/ShopPo.java

@@ -29,7 +29,7 @@ public class ShopPo implements Serializable {
     /**
      * 供应商公司简称
      */
-    private String sName;
+    private String shortName;
     /**
      * 联系人
      */

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

@@ -28,7 +28,7 @@ public interface ClubService {
      *                      clubId                 机构ID
      *                      userId                 用户ID
      *                      name                   机构名称
-     *                      sName                  机构简称(sname)
+     *                      shortName                  机构简称(shortName)
      *                      contractEmail          邮箱（contractEmail1）
      *                      contractPhone          固定电话
      *                      linkMan                联系人（linkMan1）

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

@@ -43,7 +43,7 @@ public interface RegisterService {
      *                      clubId                 机构ID
      *                      userId                 用户ID
      *                      name                   机构名称
-     *                      sName                  机构简称
+     *                      shortName                  机构简称
      *                      contractEmail          邮箱（contractEmail1）
      *                      contractPhone          固定电话
      *                      linkMan                联系人（linkMan1）
@@ -76,7 +76,7 @@ public interface RegisterService {
      *                  source                  注册来源: 0网站 1小程序
      *                  userId                  协销用户ID(userID)
      *                  name                    机构名称
-     *                  sName                   机构简称(sname)
+     *                  shortName                   机构简称(shortName)
      *                  bindMobile              企业绑定手机号
      *                  contractEmail           邮箱（email）
      *                  linkMan                 联系人（linkMan1）
@@ -105,7 +105,7 @@ public interface RegisterService {
      * @param shopRegisterDto ShopRegisterDto{
      *                        source                注册来源: 0网站 1小程序
      *                        name                  组织名称
-     *                        sName                 供应商公司简称(sname)
+     *                        shortName                 供应商公司简称(shortName)
      *                        bindMobile            企业绑定手机号
      *                        email                 邮箱
      *                        password              密码

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

@@ -29,7 +29,7 @@ public interface ShopService {
      *                        shopId                    供应商Id
      *                        userId                    用户Id
      *                        name                      组织名称
-     *                        sName                     供应商公司简称(sname)
+     *                        shortName                     供应商公司简称(shortName)
      *                        email                     邮箱
      *                        contractPhone             固定电话
      *                        linkMan                   联系人
@@ -60,5 +60,5 @@ public interface ShopService {
      * @param productCertification      产品证书
      * @return ClubUpdateDto
      */
-    ResponseJson<ShopUpdateDto> updateShopUserInfo(ShopUpdateDto shopUpdateDto, String operationLicence, String hygienicLicense, String taxLicense, String honorCertification, String productCertification);
+    ResponseJson updateShopUserInfo(ShopUpdateDto shopUpdateDto, String operationLicence, String hygienicLicense, String taxLicense, String honorCertification, String productCertification);
 }

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

@@ -87,7 +87,7 @@ public class ClubServiceImpl implements ClubService {
      *                      clubId                 机构ID
      *                      userId                 用户ID
      *                      name                   机构名称
-     *                      sName                  机构简称(sname)
+     *                      shortName                  机构简称(shortName)
      *                      contractEmail          邮箱（contractEmail1）
      *                      contractPhone          固定电话
      *                      linkMan                联系人（linkMan1）

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

@@ -140,7 +140,7 @@ public class RegisterServiceImpl implements RegisterService {
         // 机构名称
         club.setName(user.getUserName());
         // 机构简称
-        club.setSName(user.getUserName());
+        club.setShortName(user.getUserName());
         // 联系手机
         club.setContractMobile(user.getBindMobile());
         // 联系人
@@ -226,7 +226,7 @@ public class RegisterServiceImpl implements RegisterService {
      *                      clubId                 机构ID
      *                      userId                 用户ID
      *                      name                   机构名称
-     *                      sName                  机构简称
+     *                      shortName                  机构简称
      *                      contractEmail          邮箱（contractEmail1）
      *                      contractPhone          固定电话
      *                      linkMan                联系人（linkMan1）
@@ -292,7 +292,7 @@ public class RegisterServiceImpl implements RegisterService {
         // 机构名称
         club.setName(upgradeDto.getName());
         // 机构简称
-        club.setSName(upgradeDto.getSName());
+        club.setShortName(upgradeDto.getShortName());
         // 联系邮箱
         club.setContractEmail(upgradeDto.getContractEmail());
         // 固定电话
@@ -343,7 +343,7 @@ public class RegisterServiceImpl implements RegisterService {
      *                  source                  注册来源: 0网站 1小程序
      *                  userId                  协销用户ID(userID)
      *                  name                    机构名称
-     *                  sName                   机构简称(sname)
+     *                  shortName                   机构简称(shortName)
      *                  bindMobile              企业绑定手机号
      *                  contractEmail           邮箱（email）
      *                  linkMan                 联系人（linkMan1）
@@ -485,7 +485,7 @@ public class RegisterServiceImpl implements RegisterService {
             // 机构名称
             club.setName(onlineDto.getName());
             // 机构简称
-            club.setSName(onlineDto.getSName());
+            club.setShortName(onlineDto.getShortName());
             // 邮箱
             club.setContractEmail(onlineDto.getContractEmail());
             // 待审查资料
@@ -521,7 +521,7 @@ public class RegisterServiceImpl implements RegisterService {
             // 机构名称
             club.setName(onlineDto.getLinkMan());
             // 机构简称
-            club.setSName(onlineDto.getLinkMan());
+            club.setShortName(onlineDto.getLinkMan());
             // 状态设置上线
             club.setStatus(90);
             /*
@@ -566,7 +566,7 @@ public class RegisterServiceImpl implements RegisterService {
      * @param shopRegisterDto ShopRegisterDto{
      *                        source                注册来源: 0网站 1小程序
      *                        name                  组织名称
-     *                        sName                 供应商公司简称(sname)
+     *                        shortName                 供应商公司简称(shortName)
      *                        bindMobile            企业绑定手机号
      *                        email                 邮箱
      *                        password              密码
@@ -645,7 +645,7 @@ public class RegisterServiceImpl implements RegisterService {
         user.setRegisterUserTypeId(1);
         // 组织名称
         user.setName(shopRegisterDto.getName());
-        user.setUserName(shopRegisterDto.getSName());
+        user.setUserName(shopRegisterDto.getShortName());
         // 绑定手机号
         user.setBindMobile(shopRegisterDto.getBindMobile());
         // 绑定邮箱
@@ -670,7 +670,7 @@ public class RegisterServiceImpl implements RegisterService {
         // 供应商公司名称
         shop.setName(shopRegisterDto.getName());
         // 供应商公司简称
-        shop.setSName(shopRegisterDto.getSName());
+        shop.setShortName(shopRegisterDto.getShortName());
         // 联系人
         shop.setLinkMan(shopRegisterDto.getLinkMan());
         // 绑定手机号

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

@@ -116,7 +116,7 @@ public class ShopServiceImpl implements ShopService {
      *                        shopId                    供应商Id
      *                        userId                    用户Id
      *                        name                      组织名称
-     *                        sName                     供应商公司简称(sname)
+     *                        shortName                     供应商公司简称(shortName)
      *                        email                     邮箱
      *                        contractPhone             固定电话
      *                        linkMan                   联系人
@@ -148,15 +148,15 @@ public class ShopServiceImpl implements ShopService {
      * @return ClubUpdateDto
      */
     @Override
-    public ResponseJson<ShopUpdateDto> updateShopUserInfo(ShopUpdateDto shopUpdateDto, String operationLicence, String hygienicLicense, String taxLicense, String honorCertification, String productCertification) {
+    public ResponseJson updateShopUserInfo(ShopUpdateDto shopUpdateDto, String operationLicence, String hygienicLicense, String taxLicense, String honorCertification, String productCertification) {
         // 参数校验
         if (null == shopUpdateDto.getUserId() || null == shopUpdateDto.getShopId()) {
-            return ResponseJson.error("参数异常", null);
+            return ResponseJson.error("参数异常");
         }
         if (StringUtils.isNotBlank(shopUpdateDto.getEmail())) {
             Integer userIdByEmail = baseMapper.getUserIdByEmail(shopUpdateDto.getEmail());
             if (null != userIdByEmail && !userIdByEmail.equals(shopUpdateDto.getUserId())) {
-                return ResponseJson.error("该邮箱已被使用", null);
+                return ResponseJson.error("该邮箱已被使用");
             }
         }
         /*
@@ -165,7 +165,7 @@ public class ShopServiceImpl implements ShopService {
         UserPo user = new UserPo();
         user.setUserId(shopUpdateDto.getUserId());
         user.setName(shopUpdateDto.getName());
-        user.setUserName(shopUpdateDto.getSName());
+        user.setUserName(shopUpdateDto.getShortName());
         user.setEmail(shopUpdateDto.getEmail());
         // 更新供应商用户信息
         shopMapper.updateShopUserByUpdateInfo(user);
@@ -216,6 +216,6 @@ public class ShopServiceImpl implements ShopService {
                 }
             }
         }
-        return ResponseJson.success("修改供应商资料成功", shopUpdateDto);
+        return ResponseJson.success("修改供应商资料成功", null);
     }
 }

src/main/resources/mapper/ClubMapper.xml

@@ -7,7 +7,7 @@
         where userID = #{userId}
     </update>
     <update id="updateClubByUpdateInfo">
-        update club set name = #{name}, sname = #{sName}, contractEmail1 = #{contractEmail},
+        update club set name = #{name}, sname = #{shortName}, contractEmail1 = #{contractEmail},
         <if test="contractPhone != null">
             contractPhone = #{contractPhone},
         </if>
@@ -35,7 +35,7 @@
         where clubID = #{clubId}
     </update>
     <select id="getClubById" resultType="com.caimei365.user.model.vo.ClubVo">
-        select clubID as clubId, userID as userId, name, sname as sName, contractMobile, contractEmail1,
+        select clubID as clubId, userID as userId, name, sname as shortName, contractMobile, contractEmail1,
                contractPhone, linkMan, provinceID as proviceId, cityID as cityId, townID as townId,
                address, headpic as shopPhoto, businessLicenseImage as businessLicense, socialCreditCode,
                firstClubType, secondClubType, department, medicalPracticeLicenseImg as medicalPracticeLicense,

src/main/resources/mapper/RegisterMapper.xml

@@ -6,12 +6,12 @@
                   values(#{registerTime},#{registerIp},#{source},#{registerUserTypeId},#{name},#{userName},#{bindMobile},#{email},#{userIdentity},#{userPermission},#{clubStatus},#{password},#{agreeFlag},#{validFlag},#{serviceProviderId},#{serviceProviderStatus})
     </insert>
     <insert id="insertClub" parameterType="com.caimei365.user.model.po.ClubPo" keyProperty="clubId" useGeneratedKeys="true">
-        insert into club(`name`, `sName`, `contractMobile`, `linkMan`, `userID`, `addTime`, `status`, `spID`, `scanFlag`)
-                  values(#{name},#{sName},#{contractMobile},#{linkMan},#{userId},#{addTime},#{status},#{serviceProviderId},#{scanFlag})
+        insert into club(`name`, `sname`, `contractMobile`, `linkMan`, `userID`, `addTime`, `status`, `spID`, `scanFlag`)
+                  values(#{name},#{shortName},#{contractMobile},#{linkMan},#{userId},#{addTime},#{status},#{serviceProviderId},#{scanFlag})
     </insert>
     <insert id="insertUpgradeClub" parameterType="com.caimei365.user.model.po.ClubPo" keyProperty="clubId" useGeneratedKeys="true">
-        insert into club(`name`, `sName`, `contractMobile`, `linkMan`, `userID`, `addTime`, `status`, `spID`, `scanFlag`,`contractEmail1`,`linkMan`, `provinceID`, `cityID`,`townID`, `address`, `headpic`, `businessLicenseImage`,`socialCreditCode`,`firstClubType`,`secondClubType`,`department`,`medicalPracticeLicenseImg`,`mainpro`)
-                  values(#{name},#{sName},#{contractMobile},#{linkMan},#{userId},#{addTime},#{status},#{serviceProviderId},#{scanFlag},#{contractEmail},#{linkMan},#{provinceId},#{cityId},#{townId},#{address},#{shopPhoto},#{businessLicense},#{socialCreditCode},#{firstClubType},#{secondClubType},#{department},#{medicalPracticeLicense},#{mainProduct})
+        insert into club(`name`, `sname`, `contractMobile`, `linkMan`, `userID`, `addTime`, `status`, `spID`, `scanFlag`,`contractEmail1`,`linkMan`, `provinceID`, `cityID`,`townID`, `address`, `headpic`, `businessLicenseImage`,`socialCreditCode`,`firstClubType`,`secondClubType`,`department`,`medicalPracticeLicenseImg`,`mainpro`)
+                  values(#{name},#{shortName},#{contractMobile},#{linkMan},#{userId},#{addTime},#{status},#{serviceProviderId},#{scanFlag},#{contractEmail},#{linkMan},#{provinceId},#{cityId},#{townId},#{address},#{shopPhoto},#{businessLicense},#{socialCreditCode},#{firstClubType},#{secondClubType},#{department},#{medicalPracticeLicense},#{mainProduct})
     </insert>
     <insert id="insertOperation" parameterType="com.caimei365.user.model.po.OperationPo" keyProperty="clubId" useGeneratedKeys="true">
         insert into cm_mall_operation_user(`userID`, `clubID`, `nickName`, `headimgurl`, `userType`, `mobile`, `linkName`, `status`, `unionId`, `openid`, `addTime`, `updateTime`, `bindTime`, `delFlag`)
@@ -23,7 +23,7 @@
     </insert>
     <insert id="insertShop" parameterType="com.caimei365.user.model.po.ShopPo" keyProperty="shopId" useGeneratedKeys="true">
         insert into shop(`userID`, `name`, `sname`, `linkMan`, `contractMobile`, `contractEmail1`, `provinceID`, `cityID`, `townID`, `address`, `socialCreditCode`, `businessLicenseImage`, `firstShopType`, `secondShopType`, `mainpro`, `addTime`, `validFlag`, `status`)
-        values(#{userId},#{name},#{sName},#{linkMan},#{contractMobile},#{contractEmail},#{provinceId},#{cityId},#{townId},#{address},#{socialCreditCode},#{businessLicense},#{firstShopType},#{secondShopType},#{mainProduct},#{addTime},#{validFlag},#{status})
+        values(#{userId},#{name},#{shortName},#{linkMan},#{contractMobile},#{contractEmail},#{provinceId},#{cityId},#{townId},#{address},#{socialCreditCode},#{businessLicense},#{firstShopType},#{secondShopType},#{mainProduct},#{addTime},#{validFlag},#{status})
     </insert>
     <update id="updateUserClubId">
         update user set clubID = #{clubId} where userID = #{userId}
@@ -39,7 +39,7 @@
         where userID = #{userId}
     </update>
     <update id="updateClubByUpgrade">
-        update club set userID = #{userId}, name = #{name}, sname = #{sName}, contractEmail1 = #{contractEmail},
+        update club set userID = #{userId}, name = #{name}, sname = #{shortName}, contractEmail1 = #{contractEmail},
                         <if test="contractPhone != null">
                             contractPhone = #{contractPhone},
                         </if>

src/main/resources/mapper/ShopMapper.xml

@@ -30,8 +30,8 @@
             <if test="name != null">
                 name = #{name},
             </if>
-            <if test="sName != null">
-                sname = #{sName},
+            <if test="shortName != null">
+                sname = #{shortName},
             </if>
             <if test="email != null">
                 contractEmail1 = #{email},
@@ -109,7 +109,7 @@
         SELECT image FROM shopcert WHERE shopID = #{shopId} AND shopCertTypeID = #{shopCertTypeId}
     </select>
     <select id="getShopById" resultType="com.caimei365.user.model.vo.ShopVo">
-        select userID as userId, shopID as shopId, name, sname as sName, linkMan, contractMobile,
+        select userID as userId, shopID as shopId, name, sname as shortName, linkMan, contractMobile,
                contractEmail1 as contractEmail, provinceID as proviceId, cityID as cityId, townID as townId,
                address, socialCreditCode, businessLicenseImage as businessLicense, firstShopType,
                secondShopType, mainpro as mainProduct, addTime, status, validFlag from shop where shopID = #{shopId}