增加事务及调整同步Lkb顺序

src/main/java/cn/quantgroup/xyqb/controller/external/user/AppController.java

@@ -170,7 +170,8 @@ public class AppController implements IBaseController {
     LOGGER.info("app/login_super第三方用户登录, loginFrom:{},channelId：{},btRegisterChannelId:{} requestIp:{},idNo:{},name:{}", registerFrom,channelId,btRegisterChannelId, requestIp,idNo,name);
     User user = userService.findByPhoneInDb(phoneNo);
     if (user == null) {
-      user = register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId);
+//      user = register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId);
+      user = userRegisterService.register(registerFrom, phoneNo, idNo, name, channelId,btRegisterChannelId);
     }
     if (user == null) {
       return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -10,6 +10,7 @@ import cn.quantgroup.xyqb.model.*;
 import cn.quantgroup.xyqb.service.api.IUserApiService;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.http.IHttpService;
+import cn.quantgroup.xyqb.service.register.IUserRegisterService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.service.user.*;
 import cn.quantgroup.xyqb.service.wechat.IWechatService;
@@ -74,6 +75,8 @@ public class InnerController implements IBaseController {
 
   @Autowired
   private IHttpService httpService;
+  @Autowired
+  private IUserRegisterService userRegisterService;
 
   @Value("${xyqb.user.query.url}")
   private String queryUrl;
@@ -921,7 +924,8 @@ public class InnerController implements IBaseController {
       return JsonResult.buildErrorStateResult("用户已存在，手机号被占用", null);
     }
 
-    user = userService.registerAndReturn(Long.valueOf(registeredFrom), Long.valueOf(channelId), phoneNo, name, idNo, provinceCode, province, cityCode, city, districtCode, district, address, contacts);
+//    user = userService.registerAndReturn(Long.valueOf(registeredFrom), Long.valueOf(channelId), phoneNo, name, idNo, provinceCode, province, cityCode, city, districtCode, district, address, contacts);
+    user = userRegisterService.register(Long.valueOf(registeredFrom), Long.valueOf(channelId), phoneNo, name, idNo, provinceCode, province, cityCode, city, districtCode, district, address, contacts);
 
     UserRet userRet = new UserRet(user);
     return JsonResult.buildSuccessResult(null, userRet);

src/main/java/cn/quantgroup/xyqb/service/register/handler/impl/BaseUserRegisterHandler.java

@@ -36,10 +36,10 @@ public class BaseUserRegisterHandler extends AbstractUserRegisterHandler {
     @Override
     public User handleRegister(UserRegisterParam userRegisterParam) {
         String uuid = UUID.randomUUID().toString();
-        // 同步用户信息到Lkb
-        pushUserToLkb(uuid, userRegisterParam);
         // 保存user信息
         User user = saveUser(uuid, userRegisterParam);
+        // user保存成功后同步用户信息到Lkb
+        pushUserToLkb(uuid, userRegisterParam);
         userRegisterParam.setUser(user);
         if (successor != null){
             return successor.handleRegister(userRegisterParam);
@@ -86,6 +86,7 @@ public class BaseUserRegisterHandler extends AbstractUserRegisterHandler {
      * @param userRegisterParam
      */
     private void pushUserToLkb(String uuid, UserRegisterParam userRegisterParam) {
+        log.info("[pushUserToLkb]同步用户信息到Lkb，phoneNo : {}", userRegisterParam.getPhoneNo());
         boolean pushResult = lkbUserService.pushUser(uuid, userRegisterParam.getPhoneNo(),
                 userRegisterParam.getName(), userRegisterParam.getIdNo());
         if (!pushResult){

src/main/java/cn/quantgroup/xyqb/service/register/impl/UserRegisterServiceImpl.java

@@ -6,6 +6,7 @@ import cn.quantgroup.xyqb.model.UserRegisterParam;
 import cn.quantgroup.xyqb.service.register.AbstractUserRegisterService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Created by liqing on 2017/12/4 0004.
@@ -14,16 +15,19 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class UserRegisterServiceImpl extends AbstractUserRegisterService {
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public User registerDefault(UserRegisterParam userRegisterParam) {
         return getDefaultUserRegisterHandler().handleRegister(userRegisterParam);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public User registerExt(UserRegisterParam userRegisterParam) {
         return getExtUserRegisterHandler().handleRegister(userRegisterParam);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public User register(Long registerFrom, String phoneNo, String idNo, String name, Long channelId, Long btRegisterChannelId) {
         // 1、生成6位随机密码
@@ -42,6 +46,7 @@ public class UserRegisterServiceImpl extends AbstractUserRegisterService {
         return registerDefault(userRegisterParam);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public User register(String phoneNo, String password, Long registerFrom) {
         // 1、同步lkb
@@ -54,6 +59,7 @@ public class UserRegisterServiceImpl extends AbstractUserRegisterService {
         return registerDefault(userRegisterParam);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean register(String phoneNo, String password, Long registerFrom, String ip, Long channelId, Long btRegisterChannelId, String dimension) {
         // 1、同步lkb
@@ -72,6 +78,7 @@ public class UserRegisterServiceImpl extends AbstractUserRegisterService {
         return user != null;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public User register(String phoneNo, Long channelId, Long registerFrom, String appChannel, Long btRegisterChannelId, String dimension) {
         // 1、生成15位随机密码
@@ -83,12 +90,13 @@ public class UserRegisterServiceImpl extends AbstractUserRegisterService {
                 .registerFrom(registerFrom).phoneNo(phoneNo)
                 .channelId(channelId).btRegisterChannelId(btRegisterChannelId)
                 .dimension(dimension)
-                .generateRandomPwd(true).sendSuccessSms(false).sendAppSms(true)
+                .generateRandomPwd(true).sendSuccessSms(true).sendAppSms(true)
                 .sendSuccessMq(true)
                 .build();
         return registerDefault(userRegisterParam);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public User register(Long registeredFrom, Long channelId, String phoneNo, String name, String idNo, String provinceCode, String province, String cityCode, String city, String districtCode, String district, String address, String contacts) {
         // 1、生成6位随机密码
@@ -108,14 +116,15 @@ public class UserRegisterServiceImpl extends AbstractUserRegisterService {
         addressObj.setAddress(address);
         UserRegisterParam userRegisterParam = UserRegisterParam.builder()
                 .registerFrom(registeredFrom).phoneNo(phoneNo).idNo(idNo).name(name)
-                .channelId(channelId).btRegisterChannelId(registeredFrom)
+                .channelId(channelId)
                 .address(addressObj).contacts(contacts)
-                .generateRandomPwd(true).sendSuccessSms(false).sendAppSms(true)
-                .sendSuccessMq(false)
+                .generateRandomPwd(true).sendSuccessSms(true).sendAppSms(true)
+                .sendSuccessMq(true)
                 .build();
         return registerExt(userRegisterParam);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public User register(Long registerFrom, String phoneNo, String idNo, String name, Long channelId) {
         // 1、生成6位随机密码
@@ -127,7 +136,7 @@ public class UserRegisterServiceImpl extends AbstractUserRegisterService {
                 .registerFrom(registerFrom).phoneNo(phoneNo).idNo(idNo).name(name)
                 .channelId(channelId)
                 .generateRandomPwd(true).sendSuccessSms(true).sendAppSms(true)
-                .sendSuccessMq(false)
+                .sendSuccessMq(true)
                 .build();
         return registerDefault(userRegisterParam);
     }