机构注册part4

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

@@ -1,8 +1,8 @@
 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.model.UserPo;
 import com.caimei365.user.service.ClubService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -42,17 +42,17 @@ public class ClubApi {
      */
     @Idempotent(prefix="idempotent_club", keys={"#baseUser"}, expire=5)
     @PostMapping("/register")
-    public JsonModel<BaseUser> register(Integer source,
-                                        String userName,
-                                        String bindMobile,
-                                        String password,
-                                        String passWordConfirm,
-                                        String smsCode,
-                                        Integer isAgreed,
-                                        String unionId,
-                                        String nickName,
-                                        String avatarUrl,
-                                        ServerWebExchange serverWebExchange) {
+    public JsonModel<UserPo> register(Integer source,
+                                      String userName,
+                                      String bindMobile,
+                                      String password,
+                                      String passWordConfirm,
+                                      String smsCode,
+                                      Integer isAgreed,
+                                      String unionId,
+                                      String nickName,
+                                      String avatarUrl,
+                                      ServerWebExchange serverWebExchange) {
         return clubService.register(source, userName, bindMobile, password, passWordConfirm, smsCode, isAgreed, unionId, nickName, avatarUrl, serverWebExchange);
     }
 

src/main/java/com/caimei365/user/mapper/RegisterUserDao.java

@@ -1,6 +1,8 @@
 package com.caimei365.user.mapper;
 
 import com.caimei365.user.model.ClubPo;
+import com.caimei365.user.model.OperationPo;
+import com.caimei365.user.model.ShopPo;
 import com.caimei365.user.model.UserPo;
 import org.apache.ibatis.annotations.Mapper;
 

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

@@ -2,6 +2,7 @@ package com.caimei365.user.service;
 
 import com.caimei365.user.model.BaseUser;
 import com.caimei365.user.model.JsonModel;
+import com.caimei365.user.model.UserPo;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
@@ -27,6 +28,6 @@ public interface ClubService {
      * @param serverWebExchange ServerWebExchange
      * @return BaseUser
      */
-    JsonModel<BaseUser> register(Integer source, String userName, String bindMobile, String password, String passWordConfirm, String smsCode, Integer isAgreed, String unionId, String nickName, String avatarUrl, ServerWebExchange serverWebExchange);
+    JsonModel<UserPo> register(Integer source, String userName, String bindMobile, String password, String passWordConfirm, String smsCode, Integer isAgreed, String unionId, String nickName, String avatarUrl, ServerWebExchange serverWebExchange);
 
 }

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

@@ -53,8 +53,8 @@ public class ClubServiceImpl implements ClubService {
      * @return BaseUser
      */
     @Override
-    @Transactional
-    public JsonModel<BaseUser> register(Integer source, String userName, String bindMobile, String password, String passWordConfirm, String smsCode, Integer isAgreed, String unionId, String nickName, String avatarUrl, ServerWebExchange serverWebExchange) {
+    @Transactional(rollbackFor = Exception.class)
+    public JsonModel<UserPo> register(Integer source, String userName, String bindMobile, String password, String passWordConfirm, String smsCode, Integer isAgreed, String unionId, String nickName, String avatarUrl, ServerWebExchange serverWebExchange) {
         // 打印IP
         String ip = RequestUtil.getIp(serverWebExchange);
         log.info("X-Forwarded-For:" + ip);
@@ -126,8 +126,7 @@ public class ClubServiceImpl implements ClubService {
          */
         int insertFlag = registerUserDao.insertClubUser(user);
         if (insertFlag < 1) {
-            log.info(user.getUserId() + " 插入数据库异常user:" + user.toString());
-            return JsonModel.error("插入数据库异常", null);
+            throw new RuntimeException("插入数据库异常user:" + user.toString());
         }
         /*
             组装机构数据
@@ -154,8 +153,7 @@ public class ClubServiceImpl implements ClubService {
          */
         int insertClubFlag = registerUserDao.insertClub(club);
         if (insertClubFlag < 1) {
-            log.info(club.getUserId() + " 插入数据库异常club:" + club.toString());
-            return JsonModel.error("插入数据库异常", null);
+            throw new RuntimeException("插入数据库异常club:" + club.toString());
         }
         // user更新clubId
         user.setClubId(club.getClubId());
@@ -208,13 +206,10 @@ public class ClubServiceImpl implements ClubService {
             int insertOperationFlag = registerUserDao.insertOperation(operation);
             if (insertOperationFlag < 1) {
                 log.info(operation.getUserId() + " 插入数据库异常operation:" + operation.toString());
-                return JsonModel.error("插入数据库异常", null);
             }
             log.info("注册普通机构,默认绑定为机构运营人员");
         }
-        //return model.success(clubVo);
-
-        return null;
+        return JsonModel.success(user);
     }
 }
 

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

@@ -1,12 +1,12 @@
 package com.caimei365.user.service.impl;
 
+import com.caimei365.user.components.RedisService;
 import com.caimei365.user.mapper.BaseUserDao;
 import com.caimei365.user.mapper.RegisterUserDao;
 import com.caimei365.user.model.BaseUser;
 import com.caimei365.user.model.JsonModel;
 import com.caimei365.user.model.ShopPo;
 import com.caimei365.user.model.UserPo;
-import com.caimei365.user.service.RedisService;
 import com.caimei365.user.service.ShopService;
 import com.caimei365.user.utils.Md5Util;
 import com.caimei365.user.utils.RequestUtil;
@@ -17,7 +17,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.server.ServerWebExchange;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;