xie.kaifeng пре 11 месеци
родитељ
комит
c1b4b9b904
25 измењених фајлова са 113 додато и 120 уклоњено
  1. 2 1
      mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/BankAccountController.java
  2. 2 1
      mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/CommonController.java
  3. 3 2
      mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/FuncmenulistController.java
  4. 3 2
      mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/InvestorController.java
  5. 3 2
      mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/OrganController.java
  6. 4 4
      mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/OrganSonController.java
  7. 4 3
      mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/ProfitSharController.java
  8. 6 5
      mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/SystemmanagerController.java
  9. 3 2
      mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/TradingAccountController.java
  10. 3 2
      mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/WskhUserinfoController.java
  11. 5 8
      mtp3-century/src/main/java/com/muchinfo/mtp3century/exception/GlobalExceptionHandler.java
  12. 4 7
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/BankAccountSignServiceImpl.java
  13. 1 1
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/CommonServiceImpl.java
  14. 4 4
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/MarketRunManageServiceImpl.java
  15. 6 5
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/OrderQueryServiceImpl.java
  16. 3 3
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/OrganServiceImpl.java
  17. 2 3
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/OrganSonServiceService.java
  18. 4 3
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/PresaleServiceImpl.java
  19. 8 8
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/QueryServiceImpl.java
  20. 6 6
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/ReportFormServiceImpl.java
  21. 9 16
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/SendMsgServiceImpl.java
  22. 16 19
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/UseraccountServiceImpl.java
  23. 1 1
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/WarehouseServiceImpl.java
  24. 10 11
      mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/WskhUserinfoServiceImpl.java
  25. 1 1
      mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/InvestorModifyAuditParam.java

+ 2 - 1
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/BankAccountController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 @RestController
 @RequestMapping("/accountSign")
@@ -41,7 +42,7 @@ public class BankAccountController {
             AccountSignParam insertParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), AccountSignParam.class);
             return iBankAccountSignService.dealAccountSign(request, insertParam);
         } catch (Exception e) {
-            log.error("银行签约新增签约失败,失败原因:" + e);
+            log.error("银行签约新增签约失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 2 - 1
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/CommonController.java

@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -127,7 +128,7 @@ public class CommonController {
             }
             return iCommonService.queryOrganSelect(vo, request);
         } catch (Exception e) {
-            log.error("机构下拉查询加载 会员、经纪人信息失败,失败原因:" + e);
+            log.error("机构下拉查询加载 会员、经纪人信息失败,失败原因:"  + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 3 - 2
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/FuncmenulistController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
@@ -67,7 +68,7 @@ public class FuncmenulistController {
             TreeNode currentVo = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(treeNode, request), TreeNode.class);
             return iFuncmenulistService.dealMenus(currentVo, request);
         } catch (Exception e) {
-            log.error("处理菜单列表信息失败,失败原因:" + e);
+            log.error("处理菜单列表信息失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -79,7 +80,7 @@ public class FuncmenulistController {
             TreeNode currentVo = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(treeNode, request), TreeNode.class);
             return iFuncmenulistService.deleteMenus(currentVo, request);
         } catch (Exception e) {
-            log.error("删除菜单列表信息失败,失败原因:" + e);
+            log.error("删除菜单列表信息失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 3 - 2
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/InvestorController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 /**
  * 子机构管理
@@ -86,7 +87,7 @@ public class InvestorController {
                 return iWskhUserinfoService.addWskhUserinfo(currentVo, systemmanager, request);
             }
         } catch (Exception e) {
-            log.error("交易商开户失败,失败原因:" + e);
+            log.error("交易商开户失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -98,7 +99,7 @@ public class InvestorController {
         try {
             return iWskhUserinfoService.investorProcess(param, request);
         } catch (Exception e) {
-            log.error("交易商初审/复审,失败原因:" + e);
+            log.error("交易商初审/复审,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 3 - 2
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/OrganController.java

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 @RestController
 @RequestMapping("/organDetail")
@@ -110,7 +111,7 @@ public class OrganController {
             InvestorTaAccountUpdateParam current = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), InvestorTaAccountUpdateParam.class);
             return iTaaccountService.edit(current, request);
         } catch (Exception e) {
-            log.error("机构资料管理-->资金账户修改失败,失败原因:" + e);
+            log.error("机构资料管理-->资金账户修改失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -295,7 +296,7 @@ public class OrganController {
             OrganAddSonOrganParam current = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), OrganAddSonOrganParam.class);
             return iOrganService.editorgan(current, request);
         } catch (Exception e) {
-            log.error("机构资料管理修改失败,失败原因:" + e);
+            log.error("机构资料管理修改失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 4 - 4
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/OrganSonController.java

@@ -10,7 +10,6 @@ import com.muchinfo.mtp3common.utils.JsonUtils;
 import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3pojos.vo.common.OrganSelectResult;
 import com.muchinfo.mtp3pojos.vo.investor.InvestorModifyAuditParam;
-import com.muchinfo.mtp3pojos.vo.organ.OrganRoleModifyParam;
 import com.muchinfo.mtp3pojos.vo.organ.UserAccountReqParam;
 import com.muchinfo.mtp3pojos.vo.organ.UserAccountRspResult;
 import com.muchinfo.mtp3pojos.vo.organ.son.*;
@@ -23,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 @RestController
 @RequestMapping("/organSon")
@@ -77,7 +77,7 @@ public class OrganSonController {
             OrganAddSonOrganParam current = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), OrganAddSonOrganParam.class);
             return iOrganSonService.addsonorgan(current, request);
         } catch (Exception e) {
-            log.error("子机构管理新增失败,失败原因:" + e);
+            log.error("子机构管理新增失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -90,7 +90,7 @@ public class OrganSonController {
             OrganAddSonOrganParam current = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), OrganAddSonOrganParam.class);
             return iOrganSonService.editsonorgan(current, request);
         } catch (Exception e) {
-            log.error("子机构管理修改失败,失败原因:" + e);
+            log.error("子机构管理修改失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -103,7 +103,7 @@ public class OrganSonController {
             OrganAddSonOrganParam current = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), OrganAddSonOrganParam.class);
             return iOrganSonService.edit(current, request);
         } catch (Exception e) {
-            log.error("子机构管理修改失败,失败原因:" + e);
+            log.error("子机构管理修改失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 4 - 3
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/ProfitSharController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 @RestController
 @RequestMapping("/profitShar")
@@ -47,7 +48,7 @@ public class ProfitSharController {
             ProfitSharParam insertParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), ProfitSharParam.class);
             return iProfitSharService.dealMessage(insertParam, request);
         } catch (Exception e) {
-            log.error("子机构分组管理新增或修改失败,失败原因:" + e);
+            log.error("子机构分组管理新增或修改失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -81,7 +82,7 @@ public class ProfitSharController {
             ProfitSharMemberParam insertParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), ProfitSharMemberParam.class);
             return iProfitSharService.memberAdd(insertParam,request);
         } catch (Exception e) {
-            log.error("子机构分组管理新增失败,失败原因:" + e);
+            log.error("子机构分组管理新增失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -108,7 +109,7 @@ public class ProfitSharController {
             ProfitSharSorgansecParam insertParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), ProfitSharSorgansecParam.class);
             return iProfitSharService.delSOrganSec(insertParam,request);
         } catch (Exception e) {
-            log.error("子机构分润配置新增或修改失败,失败原因:" + e);
+            log.error("子机构分润配置新增或修改失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 6 - 5
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/SystemmanagerController.java

@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 import java.util.Date;
 
 
@@ -75,7 +76,7 @@ public class SystemmanagerController {
             iUserloginflowMapper.insert(userloginflow);
             return ajaxResult;
         } catch (Exception e) {
-            log.error("登录失败,失败原因:" + e);
+            log.error("登录失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -100,7 +101,7 @@ public class SystemmanagerController {
         try {
             return iSystemmanagerService.queryUserMsg(request, systemUserReqParam);
         } catch (Exception e) {
-            log.error("管理员查询信息失败,失败原因:" + e);
+            log.error("管理员查询信息失败,失败原因:"  + Arrays.toString(e.getStackTrace()));
             PageResult<SystemUserResResult> pageResult = new PageResult<>();
             pageResult.setCode(Constants.Error_Code_Design);
             pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language")));
@@ -124,7 +125,7 @@ public class SystemmanagerController {
             SystemUserVo currentVo = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(systemUserVo, request), SystemUserVo.class);
             return iSystemmanagerService.dealUserMsg(currentVo, request);
         } catch (Exception e) {
-            log.error("处理管理员信息失败,失败原因:" + e);
+            log.error("处理管理员信息失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -137,7 +138,7 @@ public class SystemmanagerController {
             SystemUserVo currentVo = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(systemUserVo, request), SystemUserVo.class);
             return iSystemmanagerService.dealUserStatus(currentVo, request);
         } catch (Exception e) {
-            log.error("处理管理员状态失败,失败原因:" + e);
+            log.error("处理管理员状态失败,失败原因:"  + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -158,7 +159,7 @@ public class SystemmanagerController {
             SystemUserPwdParam currentVo = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(systemUserPwdParam, request), SystemUserPwdParam.class);
             return iSystemmanagerService.updatePwd(currentVo, request);
         } catch (Exception e) {
-            log.error("修改密码失败,失败原因:" + e);
+            log.error("修改密码失败,失败原因:"  + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 3 - 2
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/TradingAccountController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 @RestController
 @RequestMapping("/tradingAcc")
@@ -85,7 +86,7 @@ public class TradingAccountController {
             TradingAccountAddParam addParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), TradingAccountAddParam.class);
             return iTradingAccountService.add(request, addParam);
         } catch (Exception e) {
-            log.error("交易商修改失败,失败原因:" + e);
+            log.error("交易商修改失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -106,7 +107,7 @@ public class TradingAccountController {
             TradingAccountAddParam addParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), TradingAccountAddParam.class);
             return iTradingAccountService.edit(request, addParam);
         } catch (Exception e) {
-            log.error("交易商修改失败,失败原因:" + e);
+            log.error("交易商修改失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 3 - 2
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/WskhUserinfoController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -71,7 +72,7 @@ public class WskhUserinfoController {
                 return iWskhUserinfoService.addAreainfo(currentVo, systemmanager, request);
             }
         } catch (Exception e) {
-            log.error("处理开户信息新增、修改失败,失败原因:" + e);
+            log.error("处理开户信息新增、修改失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -102,7 +103,7 @@ public class WskhUserinfoController {
             }
             return iWskhUserinfoService.approved(currentVo, request);
         } catch (Exception e) {
-            log.error("审核通过操作失败,失败原因:" + e);
+            log.error("审核通过操作失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 5 - 8
mtp3-century/src/main/java/com/muchinfo/mtp3century/exception/GlobalExceptionHandler.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 import javax.validation.ConstraintViolationException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -33,8 +34,7 @@ public class GlobalExceptionHandler {
      */
     @ExceptionHandler(Exception.class)
     public AjaxResult exceptionHandler(Exception e){
-        e.printStackTrace();
-        log.error(e+"");
+        log.error(Arrays.toString(e.getStackTrace()));
         return AjaxResult.error(GlobalExceptionEnum.ERROR.getCode(), GlobalExceptionEnum.ERROR.getMessage(),"");
     }
 
@@ -49,8 +49,7 @@ public class GlobalExceptionHandler {
      */
     @ExceptionHandler(GlobalException.class)
     public AjaxResult globalExceptionHandler(GlobalException e){
-        e.printStackTrace();
-        log.error(e+"");
+        log.error(Arrays.toString(e.getStackTrace()));
         return AjaxResult.error(e.getCode(), e.getGlobalMessage(),e.getLanguages());
     }
 
@@ -62,9 +61,8 @@ public class GlobalExceptionHandler {
      */
     @ExceptionHandler(MethodArgumentNotValidException.class)
     public AjaxResult globalExceptionHandler(MethodArgumentNotValidException e){
-        e.printStackTrace();
         // ((BeanPropertyBindingResult) e.bindingResult).errors.get(0).defaultMessage
-        log.error(e+"");
+        log.error(Arrays.toString(e.getStackTrace()));
         List<ObjectError> errors = e.getBindingResult().getAllErrors();
         // map():对于流的一些中间业务操作就用此方法
         // ObjectError::getDefaultMessage:我只要流中对象的defaultMessage
@@ -82,8 +80,7 @@ public class GlobalExceptionHandler {
      */
     @ExceptionHandler(ConstraintViolationException.class)
     public AjaxResult globalExceptionHandler(ConstraintViolationException e){
-        e.printStackTrace();
-        log.error(e+"");
+        log.error(Arrays.toString(e.getStackTrace()));
         return AjaxResult.error(GlobalExceptionEnum.PARAM_ERROR.getCode(), e.getMessage(),"");
     }
 }

+ 4 - 7
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/BankAccountSignServiceImpl.java

@@ -31,10 +31,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class BankAccountSignServiceImpl implements IBankAccountSignService {
@@ -132,7 +129,7 @@ public class BankAccountSignServiceImpl implements IBankAccountSignService {
             ExportResult exportResult = ExportUtil.write(fileName, PutOrInAmountQueryResult.class, results);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("出入金查询导出失败,失败原因:" + e);
+            log.error("出入金查询导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -334,7 +331,7 @@ public class BankAccountSignServiceImpl implements IBankAccountSignService {
                     return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM005.getCode(), request.getHeader("Accept-Language"));
                 }
             } catch (InterruptedException e) {
-                log.error("处理银行签约信息失败,失败信息:" + e);
+                log.error("处理银行签约信息失败,失败信息:" + Arrays.toString(e.getStackTrace()));
             } finally {
                 SerialNumberUtils.lockMap.remove(uuid);
             }
@@ -364,7 +361,7 @@ public class BankAccountSignServiceImpl implements IBankAccountSignService {
             syslog.setRemark("");
             iSystemmanagerlogMapper.insert(syslog);
         } catch (Exception ex) {
-            log.error("资金账户管理--> 银行签约模块报错。失败原因:" + ex.getMessage());
+            log.error("资金账户管理--> 银行签约模块报错。失败原因:" + Arrays.toString(ex.getStackTrace()));
         }
     }
 }

+ 1 - 1
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/CommonServiceImpl.java

@@ -403,7 +403,7 @@ public class CommonServiceImpl implements ICommonService {
                     .eq(userid != null, "userid", userid));
         }
 
-        return wskhUserinfoList.size() + userinfoList.size() > 0;
+        return wskhUserinfoList.size() + userinfoList.size() == 0;
     }
 
     @Override

+ 4 - 4
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/MarketRunManageServiceImpl.java

@@ -135,7 +135,7 @@ public class MarketRunManageServiceImpl implements IMarketRunManageService {
                     return AjaxResult.success(Constants.Success_Code_Design, MessageType.MARKET_RUN_MESSAGE_001.getCode(), request.getHeader("Accept-Language"));
                 }
             } catch (InterruptedException e) {
-                log.error("强制下线/强制所有用户下线,失败原因:" + e.getMessage());
+                log.error("强制下线/强制所有用户下线,失败原因:" + Arrays.toString(e.getStackTrace()));
             } finally {
                 SerialNumberUtils.lockMap.remove(uuid);
             }
@@ -191,7 +191,7 @@ public class MarketRunManageServiceImpl implements IMarketRunManageService {
             List<MarketRunInvestorResult> result = getAccountRisk(param, 1, user);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), result);
         } catch (Exception e) {
-            log.error("账户风险监控信息加载失败,失败原因:" + e);
+            log.error("账户风险监控信息加载失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -204,7 +204,7 @@ public class MarketRunManageServiceImpl implements IMarketRunManageService {
             List<MarketRunInvestorResult> result = getAccountRisk(param, 2, user);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), result);
         } catch (Exception e) {
-            log.error("做市会员监控信息加载失败,失败原因:" + e);
+            log.error("做市会员监控信息加载失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -224,7 +224,7 @@ public class MarketRunManageServiceImpl implements IMarketRunManageService {
             }
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), results);
         } catch (Exception e) {
-            log.error("设置风险率失败,请检查!失败原因:" + e);
+            log.error("设置风险率失败,请检查!失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 6 - 5
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/OrderQueryServiceImpl.java

@@ -38,6 +38,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -158,7 +159,7 @@ public class OrderQueryServiceImpl implements IOrderQueryService {
             ExportResult exportResult = ExportUtil.write(fileName, OrderQueryResult.class, resultIPage);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("订单查询导出失败,失败原因:" + e);
+            log.error("订单查询导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -230,7 +231,7 @@ public class OrderQueryServiceImpl implements IOrderQueryService {
             ExportResult exportResult = ExportUtil.write(fileName, TerOrderQueryResult.class, resultIPage);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("终止单查询导出失败,失败原因:" + e);
+            log.error("终止单查询导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -277,7 +278,7 @@ public class OrderQueryServiceImpl implements IOrderQueryService {
             ExportResult exportResult = ExportUtil.write(fileName, OrderQueryResult.class, resultIPage);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("线下交收单导出失败,失败原因:" + e);
+            log.error("线下交收单导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -316,7 +317,7 @@ public class OrderQueryServiceImpl implements IOrderQueryService {
             ExportResult exportResult = ExportUtil.write(fileName, OrderDateQueryResult.class, resultIPage);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("线下交收单导出失败,失败原因:" + e);
+            log.error("线下交收单导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -360,7 +361,7 @@ public class OrderQueryServiceImpl implements IOrderQueryService {
             ExportResult exportResult = ExportUtil.write(fileName, ForcedOrderResult.class, resultIPage);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("线下交收单导出失败,失败原因:" + e);
+            log.error("线下交收单导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 3 - 3
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/OrganServiceImpl.java

@@ -906,7 +906,7 @@ public class OrganServiceImpl implements IOrganService {
                 Set<Long> set_msg = new HashSet<>(loginids);
                 iSendMsgService.sendLoginMsg(set_msg, 1, 0);
             } catch (Exception e) {
-                log.error("机构注销发送失败,失败原因:" + e);
+                log.error("机构注销发送失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             }
         }
 
@@ -2533,7 +2533,7 @@ public class OrganServiceImpl implements IOrganService {
                         sendLoginAccChangeNtf(la.getLoginid(), 4);
                     }
                 } catch (Exception ex) {
-                    log.error("发送登录账号变更通知失败,失败原因:" + ex);
+                    log.error("发送登录账号变更通知失败,失败原因:" + Arrays.toString(ex.getStackTrace()));
                 }
             }
         });
@@ -2817,7 +2817,7 @@ public class OrganServiceImpl implements IOrganService {
                 }
             }
         } catch (Exception e) {
-            log.error("设置风险率失败,请检查!");
+            log.error("设置风险率失败,请检查!" + Arrays.toString(e.getStackTrace()));
         }
     }
 

+ 2 - 3
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/OrganSonServiceService.java

@@ -644,7 +644,6 @@ public class OrganSonServiceService implements IOrganSonService {
 
         Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", param.getUserid()));
         if (ui.getCardnum() != null && !ui.getCardnum().equals(EncryptionUtils.encryptByAES(param.getCardnum()))) {
-            Map<String, Object> map = new HashMap<String, Object>();
             String card = param.getCardnum();
             if (StringUtils.isNotBlank(card)) {
                 card = EncryptionUtils.encryptByAES(param.getCardnum());
@@ -719,7 +718,7 @@ public class OrganSonServiceService implements IOrganSonService {
                     });
                 }
             } catch (Exception e) {
-                log.error("保存子机构修改信息发送消息失败,失败原因:" + e);
+                log.error("保存子机构修改信息发送消息失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             }
         }
 
@@ -1249,7 +1248,7 @@ public class OrganSonServiceService implements IOrganSonService {
                         SysEnums.NotifyModeEnum.UNICAST.getType());
             }
         } catch (Exception e) {
-            log.error("新增子机构发送消息失败;失败原因:" + e);
+            log.error("新增子机构发送消息失败;失败原因:" + Arrays.toString(e.getStackTrace()));
         }
     }
 

+ 4 - 3
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/PresaleServiceImpl.java

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -132,7 +133,7 @@ public class PresaleServiceImpl implements IPresaleService {
                     return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM006.getCode(), request.getHeader("Accept-Language"));
                 }
             } catch (InterruptedException e) {
-                log.error("预售摇号失败,失败信息:" + e);
+                log.error("预售摇号失败,失败信息:" + Arrays.toString(e.getStackTrace()));
             } finally {
                 SerialNumberUtils.lockMap.remove(uuid);
             }
@@ -222,7 +223,7 @@ public class PresaleServiceImpl implements IPresaleService {
                     return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM006.getCode(), request.getHeader("Accept-Language"));
                 }
             } catch (InterruptedException e) {
-                log.error("预售完成失败,失败信息:" + e);
+                log.error("预售完成失败,失败信息:" + Arrays.toString(e.getStackTrace()));
             } finally {
                 SerialNumberUtils.lockMap.remove(uuid);
             }
@@ -354,7 +355,7 @@ public class PresaleServiceImpl implements IPresaleService {
                     return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM006.getCode(), request.getHeader("Accept-Language"));
                 }
             } catch (InterruptedException e) {
-                log.error("预售申请失败,失败信息:" + e);
+                log.error("预售申请失败,失败信息:" + Arrays.toString(e.getStackTrace()));
             } finally {
                 SerialNumberUtils.lockMap.remove(uuid);
             }

+ 8 - 8
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/QueryServiceImpl.java

@@ -133,7 +133,7 @@ public class QueryServiceImpl implements IQueryService {
                 Date date = DateTimeUtils.parseDate(commissionSheetParam.getTradeDate());
                 commissionSheetParam.setTradeDate(DateTimeUtils.format(date, DateTimeUtils.DATE_CHAR_PATTERN));
             } catch (ParseException e) {
-                log.error("日期转换失败,失败原因" + e);
+                log.error("日期转换失败,失败原因" + Arrays.toString(e.getStackTrace()));
             }
         }
         if (CollectionUtils.isEmpty(commissionSheetParam.getFilterTrademodeList())) {
@@ -188,7 +188,7 @@ public class QueryServiceImpl implements IQueryService {
                     Date date = DateTimeUtils.parseDate(commissionSheetParam.getTradeDate());
                     commissionSheetParam.setTradeDate(DateTimeUtils.format(date, DateTimeUtils.DATE_CHAR_PATTERN));
                 } catch (ParseException e) {
-                    log.error("日期转换失败,失败原因" + e);
+                    log.error("日期转换失败,失败原因" + Arrays.toString(e.getStackTrace()));
                 }
             }
             if (CollectionUtils.isEmpty(commissionSheetParam.getFilterTrademodeList())) {
@@ -257,7 +257,7 @@ public class QueryServiceImpl implements IQueryService {
             }
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("委托单或斩仓记录导出失败,失败原因:" + e);
+            log.error("委托单或斩仓记录导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -318,7 +318,7 @@ public class QueryServiceImpl implements IQueryService {
                 Date date = DateTimeUtils.parseDate(contractSheetParam.getTradeDate());
                 contractSheetParam.setTradeDate(DateTimeUtils.format(date, DateTimeUtils.DATE_CHAR_PATTERN));
             } catch (ParseException e) {
-                log.error("日期转换失败,失败原因" + e);
+                log.error("日期转换失败,失败原因" + Arrays.toString(e.getStackTrace()));
             }
         }
         if (CollectionUtils.isEmpty(contractSheetParam.getFilterTrademodeList())) {
@@ -371,7 +371,7 @@ public class QueryServiceImpl implements IQueryService {
                     Date date = DateTimeUtils.parseDate(contractSheetParam.getTradeDate());
                     contractSheetParam.setTradeDate(DateTimeUtils.format(date, DateTimeUtils.DATE_CHAR_PATTERN));
                 } catch (ParseException e) {
-                    log.error("日期转换失败,失败原因" + e);
+                    log.error("日期转换失败,失败原因" + Arrays.toString(e.getStackTrace()));
                 }
             }
             Market market = iMarketMapper.selectOne(new QueryWrapper<Market>().eq("marketid", contractSheetParam.getMarketId()));
@@ -406,7 +406,7 @@ public class QueryServiceImpl implements IQueryService {
             }
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("成交单导出失败,失败原因:" + e);
+            log.error("成交单导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -605,7 +605,7 @@ public class QueryServiceImpl implements IQueryService {
                 }
                 return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
             } catch (Exception e) {
-                log.error("持仓单查询导出失败,失败原因:" + e);
+                log.error("持仓单查询导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
                 return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
             }
         } else {
@@ -665,7 +665,7 @@ public class QueryServiceImpl implements IQueryService {
             ExportResult exportResult = ExportUtil.write(fileName, PositionSumSheetResult.class, resultIPage);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("持仓汇总查询导出失败,失败原因:" + e);
+            log.error("持仓汇总查询导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 6 - 6
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/ReportFormServiceImpl.java

@@ -208,7 +208,7 @@ public class ReportFormServiceImpl implements IReportFormService {
             ExportResult exportResult = ExportUtil.write(fileName, OrgReportQueryResult.class, resultIPage);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("经纪会员报表导出失败,失败原因:" + e);
+            log.error("经纪会员报表导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -416,7 +416,7 @@ public class ReportFormServiceImpl implements IReportFormService {
             ExportResult exportResult = ExportUtil.write(fileName, CusBankReportResult.class, resultIPage);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("银行资金报表导出失败,失败原因:" + e);
+            log.error("银行资金报表导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -447,7 +447,7 @@ public class ReportFormServiceImpl implements IReportFormService {
             ExportResult exportResult = ExportUtil.write(fileName, ManageDivReportResult.class, resultIPage);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("银行资金报表导出失败,失败原因:" + e);
+            log.error("银行资金报表导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -481,7 +481,7 @@ public class ReportFormServiceImpl implements IReportFormService {
             ExportResult exportResult = ExportUtil.write(fileName, InvestorReportQueryResult.class, resultIPage);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("交易商资金报表导出失败,失败原因:" + e);
+            log.error("交易商资金报表导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -521,7 +521,7 @@ public class ReportFormServiceImpl implements IReportFormService {
             ExportResult exportResult = ExportUtil.write(fileName, InvestorReportOrgResult.class, results);
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), exportResult);
         } catch (Exception e) {
-            log.error("机构资金报表导出失败,失败原因:" + e);
+            log.error("机构资金报表导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }
@@ -615,7 +615,7 @@ public class ReportFormServiceImpl implements IReportFormService {
             ExportResult result = ExportResult.builder().fileName(fileName).base64(Base64.getEncoder().encodeToString(bytes)).build();
             return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), result);
         } catch (Exception e) {
-            log.error("银行资金报表导出失败,失败原因:" + e);
+            log.error("银行资金报表导出失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.QUERY_ERROR_CODE_006.getCode(), request.getHeader("Accept-Language"));
         }
     }

+ 9 - 16
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/SendMsgServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -98,8 +99,7 @@ public class SendMsgServiceImpl implements ISendMsgService {
             log.info("[sendCustomerInfo]发送客户信息上传请求");
             log.info(uBuilder.build().toString());
         } catch (Exception e) {
-            e.printStackTrace();
-            log.error("sendCustomerInfo failed,error message: "+e);
+            log.error("sendCustomerInfo failed,error message: " + Arrays.toString(e.getStackTrace()));
         }
     }
 
@@ -109,8 +109,7 @@ public class SendMsgServiceImpl implements ISendMsgService {
             byte[] body = ProtoHelper.getNTAS(byteArray, funcode);
             rabbitTemplate.send(topic, new Message(body, new MessageProperties()));
         } catch (Exception e) {
-            e.printStackTrace();
-            log.error("sendMsg failed,error message: "+e);
+            log.error("sendMsg failed,error message: " + Arrays.toString(e.getStackTrace()));
         }
     }
 
@@ -137,8 +136,7 @@ public class SendMsgServiceImpl implements ISendMsgService {
             msgProperties.setHeader("messageType", "protoBuf");
             rabbitTemplate.send(SysConstants.RabbitShortMessage, new Message(body, msgProperties));
         } catch (Exception e) {
-            e.printStackTrace();
-            log.error("sendSMSConnetion failed,error message: "+e);
+            log.error("sendSMSConnetion failed,error message: " + Arrays.toString(e.getStackTrace()));
         }
     }
 
@@ -166,8 +164,7 @@ public class SendMsgServiceImpl implements ISendMsgService {
             sendMsg(builder.build().toByteArray(), SysConstants.RabbitNtfKey, FunCodeConstants.FunCode_Trade_LoginAccChangeNtf);
             log.info(builder.build().toString());
         } catch (Exception e) {
-            e.printStackTrace();
-            log.error("sendLoginMsg failed,error message: "+e);
+            log.error("sendLoginMsg failed,error message: " + Arrays.toString(e.getStackTrace()));
         }
     }
 
@@ -199,8 +196,7 @@ public class SendMsgServiceImpl implements ISendMsgService {
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            log.error("sendM2BUnregistCustomerInfo failed,error message: "+e);
+            log.error("sendM2BUnregistCustomerInfo failed,error message: " + Arrays.toString(e.getStackTrace()));
         }
     }
 
@@ -236,8 +232,7 @@ public class SendMsgServiceImpl implements ISendMsgService {
 
             log.info(builder.build().toString());
         } catch (Exception e) {
-            e.printStackTrace();
-            log.error("sendUserChangeMsg failed,error message: "+e);
+            log.error("sendUserChangeMsg failed,error message: " + Arrays.toString(e.getStackTrace()));
         }
     }
 
@@ -277,8 +272,7 @@ public class SendMsgServiceImpl implements ISendMsgService {
 
             log.info(builder.build().toString());
         } catch (Exception e) {
-            e.printStackTrace();
-            log.error("sendUserChangeMsg failed,error message: "+e);
+            log.error("sendUserChangeMsg failed,error message: " + Arrays.toString(e.getStackTrace()));
         }
     }
 
@@ -322,8 +316,7 @@ public class SendMsgServiceImpl implements ISendMsgService {
             byte[] body = ProtoHelper.getNTAS(builder.build().toByteArray(), FunCodeConstants.FunCode_Trade_AccountConfigChangeNtf, 0);
             rabbitTemplate.send(SysConstants.RabbitNtfKey, new Message(body, new MessageProperties()));
         } catch (Exception e) {
-            e.printStackTrace();
-            log.error("sendAccountConfigChangeNtf failed,error message: "+e);
+            log.error("sendAccountConfigChangeNtf failed,error message: " + Arrays.toString(e.getStackTrace()));
         }
     }
 }

+ 16 - 19
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/UseraccountServiceImpl.java

@@ -398,11 +398,11 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult modifyAudit(InvestorModifyAuditParam param, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
-        if (!iCommonService.checkUserAccountRole(systemmanager, param.getAuditid())) {
+        if (!iCommonService.checkUserAccountRole(systemmanager, param.getUserid())) {
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM003.getCode(), request.getHeader("Accept-Language"));
         }
 
-        DraftUseraccountNew dua = iDraftUseraccountNewMapper.selectOne(new QueryWrapper<DraftUseraccountNew>().eq("userid", param.getAuditid()));
+        DraftUseraccountNew dua = iDraftUseraccountNewMapper.selectOne(new QueryWrapper<DraftUseraccountNew>().eq("userid", param.getUserid()));
         if (dua == null) {
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_018.getCode(), request.getHeader("Accept-Language"));
         }
@@ -413,12 +413,12 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
             if (dua.getModifystatus() != 3 && dua.getModifystatus() != 4) {
                 return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_018.getCode(), request.getHeader("Accept-Language"));
             }
-            Useraccount ua = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", param.getAuditid()));
+            Useraccount ua = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", param.getUserid()));
             boolean flag = 1 == ua.getHasauth();
             usertype = ua.getUsertype();
             if (param.getAuditflag() == 1) {
                 //交易所审核通过
-                DraftUserinfo dui = iDraftUserinfoMapper.selectOne(new QueryWrapper<DraftUserinfo>().eq("userid", param.getAuditid()));
+                DraftUserinfo dui = iDraftUserinfoMapper.selectOne(new QueryWrapper<DraftUserinfo>().eq("userid", param.getUserid()));
                 // 机构或子机构
                 if (dua.getUsertype().equals(2) || dua.getUsertype().equals(3)) {
                     // 机构开户证件号码是否唯一
@@ -459,19 +459,19 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                 iUseraccountMapper.update(ua, new QueryWrapper<Useraccount>().eq("userid", ua.getUserid()));
                 iDraftUseraccountNewMapper.deleteById(dua);
 
-                Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", param.getAuditid()));
+                Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", param.getUserid()));
                 Integer needinvoice = ui.getNeedinvoice();
                 String oldMobile = ui.getMobile();
 
                 BeanUtils.copyProperties(dui, ui, new String[]{"userid", "halfbodyphotourl",
                         "cardfrontphotourl", "cardbackphotourl", "mobile", "bankid", "bankaccount", "bankcardfrontphotourl"});
-                if (dui.getHalfbodyphotourl() != null && !"".equals(dui.getHalfbodyphotourl().trim())) {
+                if (dui.getHalfbodyphotourl() != null && !dui.getHalfbodyphotourl().trim().isEmpty()) {
                     ui.setHalfbodyphotourl(dui.getHalfbodyphotourl());
                 }
-                if (dui.getCardfrontphotourl() != null && !"".equals(dui.getCardfrontphotourl().trim())) {
+                if (dui.getCardfrontphotourl() != null && !dui.getCardfrontphotourl().trim().isEmpty()) {
                     ui.setCardfrontphotourl(dui.getCardfrontphotourl());
                 }
-                if (dui.getCardbackphotourl() != null && !"".equals(dui.getCardbackphotourl().trim())) {
+                if (dui.getCardbackphotourl() != null && !dui.getCardbackphotourl().trim().isEmpty()) {
                     ui.setCardbackphotourl(dui.getCardbackphotourl());
                 }
                 if (dui.getMobile() != null && StringUtils.isNotBlank(dui.getMobile())) {
@@ -584,14 +584,13 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                         Userinfo ui = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", ua.getUserid()));
                         try {
                             List<String> params = new ArrayList<>();
-                            String p[] = o.toString().split(",");
+                            String[] p = o.toString().split(",");
                             params.add(ua.getAccountname().replaceAll("\\*", ""));
                             params.add(param.getMsg().replaceAll("\\*", ""));
                             params.add(p[1]);
                             iSendMsgService.sendSMSConnetion(31, EncryptionUtils.decryptForAES(ui.getMobile()), params);
                         } catch (Exception e) {
-                            e.printStackTrace();
-                            log.error("error  systemparam----------------------");
+                            log.error("error  systemparam----------------------" + Arrays.toString(e.getStackTrace()));
                         }
                     }
                 }
@@ -601,16 +600,15 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
             if (dua.getModifystatus() != 3) {
                 return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_018.getCode(), request.getHeader("Accept-Language"));
             }
-            Useraccount ua = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", param.getAuditid()));
+            Useraccount ua = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", param.getUserid()));
             usertype = ua.getUsertype();
             if (param.getAuditflag() == 1) {
-                DraftUserinfo dui = iDraftUserinfoMapper.selectOne(new QueryWrapper<DraftUserinfo>().eq("userid", param.getAuditid()));
+                DraftUserinfo dui = iDraftUserinfoMapper.selectOne(new QueryWrapper<DraftUserinfo>().eq("userid", param.getUserid()));
                 // 机构或子机构
                 if (dua.getUsertype().equals(2) || dua.getUsertype().equals(3)) {
                     // 机构开户证件号码是否唯一
                     String areacardflag = iCommonService.getSystemParam(Constants.REDIS_HEADER_SYSPARAM, Constants.SYSPARAM_CARD_NO);
                     //验证证件号码是否存在
-                    //验证证件号码是否存在
                     if (areacardflag != null && areacardflag.equals("1") && !iCommonService.checkOranCardNumOrMobile(1, dui.getCardnum(), dui.getUserid())) {
                         return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_011.getCode(), request.getHeader("Accept-Language"));
                     }
@@ -650,8 +648,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                             params.add(p[1]);
                             iSendMsgService.sendSMSConnetion(31, EncryptionUtils.decryptForAES(ui.getMobile()), params);
                         } catch (Exception e) {
-                            e.printStackTrace();
-                            log.error("error  systemparam----------------------");
+                            log.error("error  systemparam----------------------%s" + Arrays.toString(e.getStackTrace()));
                         }
                     }
                 }
@@ -659,9 +656,9 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
         }
 
         if (usertype == 3 || usertype == 4)
-            systemmanagerService.writeOperateLog(SysConstants.PART_CODE_ORGZ_ZJG, "审核确认id={\"auditid\":" + param.getAuditid() + "}", systemmanager, null, null, null);
+            systemmanagerService.writeOperateLog(SysConstants.PART_CODE_ORGZ_ZJG, "审核确认id={\"auditid\":" + param.getUserid() + "}", systemmanager, null, null, null);
         else
-            systemmanagerService.writeOperateLog(SysConstants.PART_INVESTOR_MODIFY, "审核确认id={\"auditid\":" + param.getAuditid() + "}", systemmanager, null, null, null);
+            systemmanagerService.writeOperateLog(SysConstants.PART_INVESTOR_MODIFY, "审核确认id={\"auditid\":" + param.getUserid() + "}", systemmanager, null, null, null);
 
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
@@ -1469,7 +1466,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
         Map<Integer, List<Accounttradeconfig>> type = new HashMap<>();
         for (Accounttradeconfig fig : list) {
             fig.setAccountname(iUseraccountMapper.selectOrganName(fig.getUserid()));
-            fig.setGoodsname(iGoodsMapper.selectOne(new QueryWrapper<Goods>().eq("goodsid",fig.getGoodsid())).getGoodsname());
+            fig.setGoodsname(iGoodsMapper.selectOne(new QueryWrapper<Goods>().eq("goodsid", fig.getGoodsid())).getGoodsname());
             Integer key = fig.getTradetype();
             if (type.containsKey(key)) {
                 type.get(key).add(fig);

+ 1 - 1
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/WarehouseServiceImpl.java

@@ -686,7 +686,7 @@ public class WarehouseServiceImpl implements IWarehouseService {
                     }
                 }
             } catch (InterruptedException e) {
-                log.error("消息发送失败,失败原因:" + e.getMessage());
+                log.error("消息发送失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             } finally {
                 SerialNumberUtils.lockMap.remove(uuid);
             }

+ 10 - 11
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/WskhUserinfoServiceImpl.java

@@ -162,11 +162,11 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
         // 机构开户证件号码是否唯一
         String areaCardFlag = iCommonService.getSystemParam(Constants.REDIS_HEADER_SYSPARAM, Constants.SYSPARAM_CARD_NO);
         // 验证证件号码是否存在
-        if (areaCardFlag != null && areaCardFlag.equals("1") && iCommonService.checkOranCardNumOrMobile(1, vo.getCardnum(), null)) {
+        if (areaCardFlag != null && areaCardFlag.equals("1") && !iCommonService.checkOranCardNumOrMobile(1, vo.getCardnum(), null)) {
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_011.getCode(), request.getHeader("Accept-Language"));
         }
         // 验证手机号是否存在
-        if (StringUtils.isNotBlank(vo.getMobilephone()) && iCommonService.checkOranCardNumOrMobile(2, vo.getMobilephone(), null)) {
+        if (StringUtils.isNotBlank(vo.getMobilephone()) && !iCommonService.checkOranCardNumOrMobile(2, vo.getMobilephone(), null)) {
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_016.getCode(), request.getHeader("Accept-Language"));
         }
         //入库重新加密
@@ -187,7 +187,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
             vo.setModifiedtime(new Date());
             iWskhUserinfoMapper.insert(vo);
         } catch (Exception e) {
-            log.error("添加开户信息失败,请检查!失败原因:" + e);
+            log.error("添加开户信息失败,请检查!失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
@@ -217,7 +217,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
             base = (WskhUserinfo) SensitiveEncryptUtil.sensitiveEncrypt(base, null);
             iWskhUserinfoMapper.update(base, new QueryWrapper<WskhUserinfo>().eq("USERID", vo.getUserid()));
         } catch (Exception e) {
-            log.error("修改开户信息失败,请检查!失败原因:" + e);
+            log.error("修改开户信息失败,请检查!失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
@@ -307,12 +307,11 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
                         }
                     }
                 } catch (Exception e) {
-                    e.printStackTrace();
-                    log.error("网上开户审核发送消息失败,失败原因:" + e);
+                    log.error("网上开户审核发送消息失败,失败原因:" + Arrays.toString(e.getStackTrace()));
                 }
             }
         } catch (Exception e) {
-            log.error("审核提交失败,失败原因:" + e);
+            log.error("审核提交失败,失败原因:" + Arrays.toString(e.getStackTrace()));
             throw new GlobalException(Constants.Error_Code_Design,MessageType.ORGAN_ERROR_CODE_015.getCode(), request.getHeader("Accept-Language"));
         }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
@@ -358,13 +357,13 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
         Systemparam sysParam = iSystemparamMapper.selectOne(new QueryWrapper<Systemparam>().eq("PARAMCODE", Constants.SYSPARAM_CARD_NOTWO));
         //验证证件号码是否唯一
         if (!base.getCardnum().equals(EncryptionUtils.encryptByAES(currentVo.getCardnum()))) {
-            if (iCommonService.checkOranCardNumOrMobile(1, EncryptionUtils.encryptByAES(currentVo.getCardnum()), currentVo.getUserid()) && (sysParam == null) || "1".equals(sysParam.getParamvalue())) {
+            if (!iCommonService.checkOranCardNumOrMobile(1, EncryptionUtils.encryptByAES(currentVo.getCardnum()), currentVo.getUserid()) && (sysParam == null) || "1".equals(sysParam.getParamvalue())) {
                 return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_011.getCode(), request.getHeader("Accept-Language"));
             }
         }
         // 验证手机号是否唯一
         if (!base.getMobilephone().equals(EncryptionUtils.encryptByAES(currentVo.getMobilephone()))) {
-            if (iCommonService.checkOranCardNumOrMobile(2, EncryptionUtils.encryptByAES(currentVo.getMobilephone()), currentVo.getUserid())) {
+            if (!iCommonService.checkOranCardNumOrMobile(2, EncryptionUtils.encryptByAES(currentVo.getMobilephone()), currentVo.getUserid())) {
                 return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_016.getCode(), request.getHeader("Accept-Language"));
             }
         }
@@ -375,7 +374,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
             base = (WskhUserinfo) SensitiveEncryptUtil.sensitiveEncrypt(base, null);
             iWskhUserinfoMapper.update(base, new QueryWrapper<WskhUserinfo>().eq("USERID", currentVo.getUserid()));
         } catch (Exception e) {
-            log.error("修改开户信息失败,请检查!失败原因:" + e);
+            log.error("修改开户信息失败,请检查!失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
@@ -459,7 +458,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
             currentVo = (WskhUserinfo) SensitiveEncryptUtil.sensitiveEncrypt(currentVo, null);
             iWskhUserinfoMapper.insert(currentVo);
         } catch (Exception e) {
-            log.error("新增开户信息失败,请检查!失败原因:" + e);
+            log.error("新增开户信息失败,请检查!失败原因:" + Arrays.toString(e.getStackTrace()));
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));

+ 1 - 1
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/InvestorModifyAuditParam.java

@@ -14,7 +14,7 @@ import lombok.NoArgsConstructor;
 @ApiModel(value="InvestorModifyAuditParam对象", description="交易商变更审核请求")
 public class InvestorModifyAuditParam {
 
-    private Long auditid;
+    private Long userid;
 
     @ApiModelProperty(value = "0不通过 1通过")
     private Integer auditflag;