chao 4 anos atrás
pai
commit
dd5d9e690c

+ 1 - 2
src/main/java/com/caimei365/user/controller/ShopApi.java

@@ -1,7 +1,6 @@
 package com.caimei365.user.controller;
 
 import com.caimei365.user.idempotent.Idempotent;
-import com.caimei365.user.model.BaseUser;
 import com.caimei365.user.model.JsonModel;
 import com.caimei365.user.service.ShopService;
 import io.swagger.annotations.ApiImplicitParam;
@@ -51,7 +50,7 @@ public class ShopApi {
      */
     @Idempotent(prefix="idempotent_club", keys={"#baseUser"}, expire=5)
     @PostMapping("/pc/register")
-    public JsonModel<UserLoginVo> pcRegister(Integer source,
+    public JsonModel pcRegister(Integer source,
                                         String name,
                                         String sName,
                                         String bindMobile,

+ 2 - 2
src/main/java/com/caimei365/user/service/impl/ShopServiceImpl.java

@@ -62,7 +62,7 @@ public class ShopServiceImpl implements ShopService {
      * @return BaseUser
      */
     @Override
-    public JsonModel<UserLoginVo> register(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange) {
+    public JsonModel register(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange) {
         // 打印IP
         String ip = RequestUtil.getIp(serverWebExchange);
         log.info("X-Forwarded-For:" + ip);
@@ -221,7 +221,7 @@ public class ShopServiceImpl implements ShopService {
      * @return BaseUser
      */
     @Override
-    public JsonModel<UserLoginVo> appletsRegister(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange, Integer whichStep) {
+    public JsonModel appletsRegister(Integer source, String name, String sName, String bindMobile, String email, String smsCode, String password, String passWordConfirm, String linkMan, Integer provinceId, Integer cityId, Integer townId, String address, String socialCreditCode, String businessLicenseImage, String firstShopType, String secondShopType, String mainPro, Integer isAgreed, ServerWebExchange serverWebExchange, Integer whichStep) {
         // 参数校验
         if (1 == whichStep) {
             if (StringUtils.isBlank(bindMobile) || StringUtils.isBlank(password)