fix 一致性

server/src/main/java/com/pica/cloud/account/account/server/controller/AccountController.java

@@ -224,7 +224,7 @@ public class AccountController extends AccountBaseController {
         this.checkMobilePhone(request.getMobile());
         //接入新旭事务一致性
         String batchNo = IntactUtils.getUUID();
-        intactUtil.sendIntact(batchNo,"loginRegister",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"entity:"+ JSON.toJSONString(entity));
+        intactUtil.sendIntact(batchNo,"h5-loginRegister",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"entity:"+ JSON.toJSONString(entity));
         AccountReq req = new AccountReq();
         req.setMobilePhone(request.getMobile());
         //  登录或注册，只能使用验证码
@@ -237,19 +237,35 @@ public class AccountController extends AccountBaseController {
         Account account = accountService.getByMobilePhone(req.getMobilePhone());
         if (account != null) {
             //  登录
-            PicaResponse response = this.login(req);
+            PicaResponse response = null;
+            try {
+                response = this.login(req);
+            } catch (PicaException e) {
+                if(e.getCode().equals(PicaResultCode.PARAM_IS_INVALID.code()) || e.getCode().equals(PicaResultCode.RESULE_DATA_NONE.code())){
+                    intactUtil.sendIntact(batchNo,"h5-loginRegister",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"验证码错误或过期-不加入提醒，返回值:"+ JSON.toJSONString(response));
+                }
+                throw e;
+            }
             if (response.getData() != null) {
                 LoginResult result = new LoginResult();
                 result.setToken(response.getData().toString());
-                intactUtil.sendIntact(batchNo,"loginRegister",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"登录成功，返回值:"+ JSON.toJSONString(response.getData()));
+                intactUtil.sendIntact(batchNo,"h5-loginRegister",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"登录成功，返回值:"+ JSON.toJSONString(response.getData()));
 
                 return PicaResponse.toResponse(result);
             }
             return response;
         } else {
             //  注册
-            PicaResponse<LoginResult> result = this.register(req);
-            intactUtil.sendIntact(batchNo,"loginRegister",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"注册成功，返回值:"+ JSON.toJSONString(result));
+            PicaResponse<LoginResult> result = null;
+            try {
+                result = this.register(req);
+            } catch (PicaException e) {
+                if(e.getCode().equals(PicaResultCode.PARAM_IS_INVALID.code()) || e.getCode().equals(PicaResultCode.RESULE_DATA_NONE.code())){
+                    intactUtil.sendIntact(batchNo,"h5-loginRegister",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"验证码错误或过期-不加入提醒，返回值:"+ JSON.toJSONString(result));
+                }
+                throw e;
+            }
+            intactUtil.sendIntact(batchNo,"h5-loginRegister",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"注册成功，返回值:"+ JSON.toJSONString(result));
             return result;
         }
     }