注释掉发邮件的代码

src/main/java/cn/quantgroup/customer/service/IUserService.java

@@ -44,6 +44,12 @@ public interface IUserService extends UserDetailsService {
      * @return
      */
     MoResult<String> passwordRest(String phoneNo);
+    /**
+     * 重置用户密码
+     * @param phoneNo
+     * @return
+     */
+    MoResult<String> passwordRestNew(String phoneNo);
 
     /**
      * 注销账户
@@ -64,6 +70,12 @@ public interface IUserService extends UserDetailsService {
      * @return
      */
     MoResult<Boolean> modifyAccountStatusActive(Long userId);
+    /**
+     * 激活账户新逻辑
+     * @param userId
+     * @return
+     */
+    MoResult<Boolean> modifyAccountStatusActiveNew(Long userId);
 
     /**
      * 修改用户姓名、身份证
@@ -74,6 +86,8 @@ public interface IUserService extends UserDetailsService {
      */
     MoResult<String> modifyUserDetail(Long userId, String realName, String idNO);
 
+    MoResult<String> modifyUserDetailNew(Long userId, String realName, String idNO);
+
     MoResult<String> getRewardPointsType();
 
     JsonResult<UserBasicInfo> findUserInfoByUserParam(UserQueryParam userQueryParam);

src/main/java/cn/quantgroup/customer/service/impl/TransactionReceiptRecordServiceImpl.java

@@ -435,14 +435,14 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
         sftpUtil.logout();
         log.info("uploadFile | 断开ftp");
         log.info("[TransactionReceiptRecordServiceImpl.kdspOperationUrl  调用kdsp-op 接口end]");
-        //将文件分批放入本地
-        log.info("下载签章完成的文件 begin");
         if(CollectionUtils.isEmpty(emailList)){
             log.info("没有签章成功的文件可以发送");
             deleteRedis("exportZipFile");
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new RuntimeException("没有签章成功的文件可以发送");
         }
+        //将文件分批放入本地
+       /* log.info("下载签章完成的文件 begin");
         int subListSize = 0;
         if(CollectionUtils.isNotEmpty(emailList)){
             List<List<Map<String,Object>>> subList= splitList(emailList,mailSize);
@@ -490,7 +490,7 @@ public class TransactionReceiptRecordServiceImpl implements ITransactionReceiptR
             deleteRedis("exportZipFile");
             log.info("分批发送邮件end");
         }
-        log.info("分批发送邮件成功end");
+        log.info("分批发送邮件成功end");*/
         //发送邮件通知已经处理完成
         log.info("[TransactionReceiptRecordServiceImpl.sendCustomerTransactionHtmlMail  发送邮件begin]");
         sendCustomerTransactionHtmlMail(transactionReceiptRecordList.size(),emailList.size(),transactionReceiptRecordList.size()-emailList.size());

src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java

@@ -699,7 +699,7 @@ public class UserServiceImpl implements IUserService {
         return JsonResult.buildErrorStateResult("参数全部为空", null);
     }
 
-
+    //旧逻辑，先调用sidecar系统，再调用用户中心
     @Override
     public MoResult<String> passwordRest(String phoneNo) {
         String url = sidecarUrl + "/middle_office/kefu/password/reset";
@@ -717,6 +717,34 @@ public class UserServiceImpl implements IUserService {
             throw new BusinessException(ErrorCodeEnum.NET_ERROR);
         }
     }
+    //新逻辑，直接调用用户中心，不经过sidecar系统
+    @Override
+    public MoResult<String> passwordRestNew(String phone) {
+        try {
+            MoResult moResult = null;
+            Map<String, String> header = Maps.newHashMap();
+            header.put("Content-type", "application/x-www-form-urlencoded");
+            Map param = Maps.newHashMap();
+            param.put("phone", phone);
+            String userUrl = userSysUrl + "/innerapi/user/password/reset";
+            String userResult = httpService.post(userUrl, header, param);
+            if(userResult != null){
+                JSONObject userJsonObject = JSONObject.parseObject(userResult);
+                String userBusinessCode = userJsonObject.getString("businessCode");
+                if("0000".equals(userBusinessCode)){
+                    moResult = GSON.fromJson(userResult, MoResult.class);
+                }else{
+                    moResult = GSON.fromJson("调用用户中心接口报错", MoResult.class);
+                }
+            }else{
+                moResult = GSON.fromJson("调用用户中心接口报错", MoResult.class);
+            }
+            return moResult;
+        } catch (Exception e) {
+            log.error("[user][passwordRestNew] 网络通讯异常,phone:{},ex:{}", phone, ExceptionUtils.getStackTrace(e));
+            throw new BusinessException(ErrorCodeEnum.NET_ERROR);
+        }
+    }
     //旧逻辑
     @Override
     public MoResult<Boolean> modifyAccountStatusDisable(Long userId) {
@@ -743,6 +771,7 @@ public class UserServiceImpl implements IUserService {
         //判断是否有在途业务
         MoResult moResult = null;
         try {
+            //调用天津自牧finance-gateway接口,将电商userid,转换为金融userid
             String url = talosHttp + "/api/inner/kdsp/hasBusiness";
             Map<String, String> header = Maps.newHashMap();
             header.put("Content-type", "application/x-www-form-urlencoded");
@@ -801,6 +830,72 @@ public class UserServiceImpl implements IUserService {
             throw new BusinessException(ErrorCodeEnum.NET_ERROR);
         }
     }
+    //新逻辑，不通过sidecar，直接调用用户中心
+    @Override
+    public MoResult<Boolean> modifyAccountStatusActiveNew(Long userId) {
+        try {
+            MoResult moResult = null;
+            if(userId == null || "0".equals(userId.toString())){
+                moResult = GSON.fromJson("userId非法", MoResult.class);
+                return moResult;
+            }
+            Map<String, String> header = Maps.newHashMap();
+            header.put("Content-type", "application/x-www-form-urlencoded");
+            Map param = Maps.newHashMap();
+            param.put("userId", userId);
+            String userUrl = userSysUrl + "/innerapi/user/active";
+            String userResult = httpService.post(userUrl, header, param);
+            if(userResult != null){
+                JSONObject userJsonObject = JSONObject.parseObject(userResult);
+                String userBusinessCode = userJsonObject.getString("businessCode");
+                if("0000".equals(userBusinessCode)){
+                    moResult = GSON.fromJson(userResult, MoResult.class);
+                }else{
+                    moResult = GSON.fromJson("调用用户中心接口报错", MoResult.class);
+                }
+            }else{
+                moResult = GSON.fromJson("调用用户中心接口报错", MoResult.class);
+            }
+            return moResult;
+        } catch (Exception e) {
+            log.error("[user][modifyAccountStatusActiveNew] 网络通讯异常,userId:{},ex:{}", userId, ExceptionUtils.getStackTrace(e));
+            throw new BusinessException(ErrorCodeEnum.NET_ERROR);
+        }
+    }
+
+    @Override
+    public MoResult<String> modifyUserDetailNew(Long userId, String realName, String idNO) {
+        try {
+            MoResult moResult = null;
+            if(userId == null || "0".equals(userId.toString())){
+                moResult = GSON.fromJson("userId非法", MoResult.class);
+                return moResult;
+            }
+            Map<String, String> header = Maps.newHashMap();
+            header.put("Content-type", "application/x-www-form-urlencoded");
+            Map param = Maps.newHashMap();
+            param.put("userId", userId);
+            param.put("name", realName);
+            param.put("idNo", idNO);
+            String userUrl = userSysUrl + "/innerapi/userDetail/reset/"+userId;
+            String userResult = httpService.post(userUrl, header, param);
+            if(userResult != null){
+                JSONObject userJsonObject = JSONObject.parseObject(userResult);
+                String userBusinessCode = userJsonObject.getString("businessCode");
+                if("0000".equals(userBusinessCode)){
+                    moResult = GSON.fromJson(userResult, MoResult.class);
+                }else{
+                    moResult = GSON.fromJson("调用用户中心接口报错", MoResult.class);
+                }
+            }else{
+                moResult = GSON.fromJson("调用用户中心接口报错", MoResult.class);
+            }
+            return moResult;
+        } catch (Exception e) {
+            log.error("[user][modifyUserDetailNew] 网络通讯异常,userId:{},ex:{}", userId, ExceptionUtils.getStackTrace(e));
+            throw new BusinessException(ErrorCodeEnum.NET_ERROR);
+        }
+    }
 
     @Override
     public MoResult<String> modifyUserDetail(Long userId, String realName, String idNO) {