多语言整理，以及监控运行管理新增菜单

mtp3-century/src/main/java/com/muchinfo/mtp3century/configuration/RabbitConfig.java

@@ -55,7 +55,4 @@ public class RabbitConfig {
     Binding bindingLoginStatusMsgQueue() {
         return BindingBuilder.bind(loginStatusMsgQueue()).to(exchange()).with("user_rsp");
     }
-
-
-
 }

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

@@ -207,7 +207,7 @@ public class CommonController {
     @ApiOperation("商品查询下拉框")
     @RequestMapping(method = RequestMethod.GET, value = "/queryGoodsSelect")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    private AjaxResult<GoodsSelectResult> queryGoodsSelect(String goodsStatusIds, String marketId, String searchCode, HttpServletRequest request) {
+    private AjaxResult<GoodsSelectResult> queryGoodsSelect(String goodsStatusIds, Long marketId, String searchCode, HttpServletRequest request) {
         return iCommonService.queryGoodsSelect(goodsStatusIds, marketId, searchCode, request);
     }
 

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

@@ -172,8 +172,8 @@ public class InvestorController {
     @ApiOperation("交易商管理-->交易商管理-->资金账户、资金账户详情（userid不传）")
     @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/showAccount")
-    public PageResult<Taaccount> showAccount(Long userid, String accountid, Integer pageNo, Integer pageSize, HttpServletRequest request) {
-        return iTaaccountService.showAccount(userid, accountid, pageNo, pageSize, request);
+    public PageResult<Taaccount> showAccount(Long userid, String accountid, Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        return iTaaccountService.showAccount(userid, accountid, pageNum, pageSize, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->资金账户-->修改")
@@ -199,8 +199,8 @@ public class InvestorController {
     @ApiOperation("交易商管理-->交易商管理-->登录账户列表查询-->查看登录流水")
     @ResponseBody
     @RequestMapping(method = RequestMethod.GET, value = "/queryLoginLog")
-    public PageResult<Userloginflow> queryLoginLog(Long loginid, Integer pageNo, Integer pageSize, HttpServletRequest request) {
-        return iDealLoginService.queryLoginLog(loginid, pageNo, pageSize, request);
+    public PageResult<Userloginflow> queryLoginLog(Long loginid, Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        return iDealLoginService.queryLoginLog(loginid, pageNum, pageSize, request);
     }
 
     @ApiOperation("交易商管理-->交易商管理-->登录账户列表查询-->重置密码")

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/MarketRunManagerController.java

@@ -3,7 +3,7 @@ package com.muchinfo.mtp3century.controller;
 import com.muchinfo.mtp3century.service.IMarketRunManageService;
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
-import com.muchinfo.mtp3pojos.vo.marketrun.MarketRunLoginUserResult;
+import com.muchinfo.mtp3pojos.vo.marketrun.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -36,4 +36,26 @@ public class MarketRunManagerController {
     private AjaxResult downonline(Long loginid, HttpServletRequest request) {
         return iMarketRunManageService.downonline(loginid, request);
     }
+
+    @ApiOperation("市场运行管理-->监控管理-->斩仓监控-->获取列表")
+    @RequestMapping(method = RequestMethod.GET, value = "/cutposition")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<MarketRunCutPositionResult> queryCutposition(Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        return iMarketRunManageService.queryCutposition(pageNum, pageSize, request);
+    }
+
+    @ApiOperation("市场运行管理-->监控管理-->账户风险监控-->初始化参数信息")
+    @RequestMapping(method = RequestMethod.GET, value = "/initInvestor")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<MarketRunInitInvestor> initInvestor(HttpServletRequest request) {
+        return iMarketRunManageService.initInvestor( request);
+    }
+
+    @ApiOperation("市场运行管理-->监控管理-->账户风险监控-->获取列表")
+    @RequestMapping(method = RequestMethod.GET, value = "/investor")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    private AjaxResult<MarketRunInvestorResult> investor(MarketRunInvestorParam param, HttpServletRequest request) {
+        return iMarketRunManageService.investor(param, request);
+    }
+
 }

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

@@ -2,12 +2,18 @@ package com.muchinfo.mtp3century.controller;
 
 
 import com.muchinfo.mtp3century.service.IProfitSharService;
+import com.muchinfo.mtp3century.utils.CenturyDecryptUtil;
+import com.muchinfo.mtp3common.enumtype.Constants;
+import com.muchinfo.mtp3common.enumtype.MessageType;
+import com.muchinfo.mtp3common.utils.JsonUtils;
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3pojos.vo.profitshar.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -21,6 +27,8 @@ import javax.servlet.http.HttpServletRequest;
 @Api(value = "分润API", description = "分润管理")
 public class ProfitSharController {
 
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
     @Resource
     private IProfitSharService iProfitSharService;
 
@@ -34,8 +42,14 @@ public class ProfitSharController {
     @ApiOperation("分润管理-->机构分润配置-->子机构分组管理-->新增、修改")
     @RequestMapping(method = RequestMethod.POST, value = "/deal")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    private AjaxResult dealMessage(@RequestBody ProfitSharParam param, HttpServletRequest request) {
-        return iProfitSharService.dealMessage(param, request);
+    private AjaxResult dealMessage(@RequestBody String param, HttpServletRequest request) {
+        try {
+            ProfitSharParam insertParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), ProfitSharParam.class);
+            return iProfitSharService.dealMessage(insertParam, request);
+        } catch (Exception e) {
+            log.error("子机构分组管理新增或修改失败，失败原因：" + e);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+        }
     }
 
     @ApiOperation("分润管理-->机构分润配置-->子机构分组管理-->删除")
@@ -48,8 +62,8 @@ public class ProfitSharController {
     @ApiOperation("分润管理-->机构分润配置-->子机构分组管理-->会员列表")
     @RequestMapping(method = RequestMethod.GET, value = "/memberQuery")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
-    private PageResult<ProfitSharMemberResult> memberQuery(Long subareagroupid, Integer pageNum, Integer pageSize) {
-        return iProfitSharService.memberQuery(subareagroupid, pageNum, pageSize);
+    private PageResult<ProfitSharMemberResult> memberQuery(Long subareagroupid, Integer pageNum, Integer pageSize,HttpServletRequest request) {
+        return iProfitSharService.memberQuery(subareagroupid, pageNum, pageSize,request);
     }
 
     @ApiOperation("分润管理-->机构分润配置-->子机构分组管理-->会员列表-->机构获取")
@@ -62,11 +76,16 @@ public class ProfitSharController {
     @ApiOperation("分润管理-->机构分润配置-->子机构分组管理-->会员列表-->新增")
     @RequestMapping(method = RequestMethod.POST, value = "/memberAdd")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    private AjaxResult memberAdd(@RequestBody ProfitSharMemberParam param, HttpServletRequest request) {
-        return iProfitSharService.memberAdd(param,request);
+    private AjaxResult memberAdd(@RequestBody String param, HttpServletRequest request) {
+        try {
+            ProfitSharMemberParam insertParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), ProfitSharMemberParam.class);
+            return iProfitSharService.memberAdd(insertParam,request);
+        } catch (Exception e) {
+            log.error("子机构分组管理新增失败，失败原因：" + e);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+        }
     }
 
-
     @ApiOperation("分润管理-->机构分润配置-->子机构分组管理-->会员列表-->删除")
     @RequestMapping(method = RequestMethod.GET, value = "/deleteMember")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
@@ -84,11 +103,17 @@ public class ProfitSharController {
     @ApiOperation("分润管理-->机构分润配置-->子机构分润配置-->新增、修改")
     @RequestMapping(method = RequestMethod.POST, value = "/delSOrganSec")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
-    private AjaxResult delSOrganSec(@RequestBody ProfitSharSorgansecParam param, HttpServletRequest request) {
-        return iProfitSharService.delSOrganSec(param,request);
+    private AjaxResult delSOrganSec(@RequestBody String param, HttpServletRequest request) {
+        try {
+            ProfitSharSorgansecParam insertParam = JsonUtils.toBean(CenturyDecryptUtil.decryptForJson(param, request), ProfitSharSorgansecParam.class);
+            return iProfitSharService.delSOrganSec(insertParam,request);
+        } catch (Exception e) {
+            log.error("子机构分润配置新增或修改失败，失败原因：" + e);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+        }
     }
 
-    @ApiOperation("分润管理-->机构分润配置-->子机构分组管理-->删除")
+    @ApiOperation("分润管理-->机构分润配置-->子机构分润配置-->删除")
     @RequestMapping(method = RequestMethod.GET, value = "/deleteSOrganSec")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     private AjaxResult deleteSOrganSec(Integer dividefeetype,Long marketid,Long subareagroupid,HttpServletRequest request) {

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

@@ -105,7 +105,7 @@ public class SystemmanagerController {
             log.error("管理员查询信息失败，失败原因：" + e);
             PageResult<SystemUserResResult> pageResult = new PageResult<>();
             pageResult.setCode(Constants.Error_Code_Design);
-            pageResult.setMessage(Constants.Error_Code_Message);
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language")));
             return pageResult;
         }
     }

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

@@ -31,7 +31,7 @@ public class GlobalExceptionHandler {
      *             return AjaxResult.me().setSuccess(false).setMessage("系统繁忙，请重试！");
      *         }
      */
-    @ExceptionHandler(Exception.class) //这句代码可以认为是trycatch中的catch
+    @ExceptionHandler(Exception.class)
     public AjaxResult exceptionHandler(Exception e){
         e.printStackTrace();
         log.error(e+"");
@@ -47,7 +47,7 @@ public class GlobalExceptionHandler {
      *             return AjaxResult.me().setSuccess(false).setMessage("系统繁忙，请重试！");
      *         }
      */
-    @ExceptionHandler(GlobalException.class) //这句代码可以认为是trycatch中的catch
+    @ExceptionHandler(GlobalException.class)
     public AjaxResult globalExceptionHandler(GlobalException e){
         e.printStackTrace();
         log.error(e+"");

mtp3-century/src/main/java/com/muchinfo/mtp3century/filter/JwtAuthorizationFilter.java

@@ -2,6 +2,7 @@ package com.muchinfo.mtp3century.filter;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.muchinfo.mtp3common.enumtype.Constants;
+import com.muchinfo.mtp3common.enumtype.MessageType;
 import com.muchinfo.mtp3common.utils.JwtUtil;
 import com.muchinfo.mtp3common.utils.ResponseUtils;
 import io.jsonwebtoken.Claims;
@@ -48,15 +49,15 @@ public class JwtAuthorizationFilter extends BasicAuthenticationFilter {
         // 解析token
         String token = headerToken.substring(JwtUtil.TOKEN_PREFIX.length());
         Claims claims = null;
-        try{
+        try {
             claims = JwtUtil.parseToken(token);
             // 校验token是否过期
             if (JwtUtil.isExpiration(claims)) {
                 chain.doFilter(request, response);
                 return;
             }
-        }catch (ExpiredJwtException e){
-            ResponseUtils.writeFiled(response, Constants.Token_failure_code, Constants.Token_failure_code_msg, false);
+        } catch (ExpiredJwtException e) {
+            ResponseUtils.writeFiled(response, Constants.Token_failure_code, MessageType.MESSAGE_ERROR_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
             return;
         }
         String username = JwtUtil.getUsername(claims);
@@ -84,7 +85,7 @@ public class JwtAuthorizationFilter extends BasicAuthenticationFilter {
     private void refreshToken(String token, HttpServletResponse response) {
         token = JwtUtil.refreshToken(token);
         // 将token添加到header中
-        response.setHeader("Access-Control-Expose-Headers","Authorization");
+        response.setHeader("Access-Control-Expose-Headers", "Authorization");
         response.setHeader(JwtUtil.TOKEN_HEADER, JwtUtil.TOKEN_PREFIX + token);
     }
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/filter/JwtLoginFilter.java

@@ -3,6 +3,7 @@ package com.muchinfo.mtp3century.filter;
 import com.muchinfo.mtp3century.utils.CenturyDecryptUtil;
 import com.muchinfo.mtp3century.utils.RedisServiceUtil;
 import com.muchinfo.mtp3common.enumtype.Constants;
+import com.muchinfo.mtp3common.enumtype.MessageType;
 import com.muchinfo.mtp3common.enumtype.SysConstants;
 import com.muchinfo.mtp3common.enumtype.SysEnums;
 import com.muchinfo.mtp3common.utils.*;
@@ -96,7 +97,7 @@ public class JwtLoginFilter extends AbstractAuthenticationProcessingFilter {
         String token = JwtUtil.TOKEN_PREFIX + JwtUtil.generateToken(authResult.getName(), sb.toString());
         // 将token添加到header中
         response.setHeader(JwtUtil.TOKEN_HEADER, token);
-        ResponseUtils.writeSucceed(response, HttpServletResponse.SC_OK, "用户认证通过！", true, token);
+        ResponseUtils.writeSucceed(response, HttpServletResponse.SC_OK, MessageType.MESSAGE_CODE_SYSTEM010.getCode(), request.getHeader("Accept-Language"), token);
         log.info("登录成功，username: {}, token: {}", authResult.getName(), token);
     }
 
@@ -144,17 +145,17 @@ public class JwtLoginFilter extends AbstractAuthenticationProcessingFilter {
 
         //判断异常类
         if (failed instanceof InternalAuthenticationServiceException) {
-            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "认证服务不正常！", false);
+            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, MessageType.MESSAGE_ERROR_CODE_SYSTEM009.getCode(), request.getHeader("Accept-Language"));
         } else if (failed instanceof UsernameNotFoundException) {
-            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "用户账户不存在！", false);
+            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, MessageType.MESSAGE_ERROR_CODE_SYSTEM010.getCode(), request.getHeader("Accept-Language"));
         } else if (failed instanceof BadCredentialsException) {
-            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, loginPWDFail_msg == null ? failed.getMessage() : loginPWDFail_msg, false);
+            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, loginPWDFail_msg == null ? MessageType.MESSAGE_ERROR_CODE_SYSTEM011.getCode() : loginPWDFail_msg, request.getHeader("Accept-Language"));
         } else if (failed instanceof LockedException) {
-            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "用户账户已被锁！", false);
+            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, MessageType.MESSAGE_ERROR_CODE_SYSTEM012.getCode(), request.getHeader("Accept-Language"));
         } else if (failed instanceof CredentialsExpiredException) {
-            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "用户密码已失效！", false);
+            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, MessageType.MESSAGE_ERROR_CODE_SYSTEM013.getCode(), request.getHeader("Accept-Language"));
         } else if (failed instanceof DisabledException) {
-            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "用户账户已被锁！", false);
+            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, MessageType.MESSAGE_ERROR_CODE_SYSTEM014.getCode(), request.getHeader("Accept-Language"));
         }
     }
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/interceptor/SignAuthInterceptor.java

@@ -2,6 +2,7 @@ package com.muchinfo.mtp3century.interceptor;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.muchinfo.mtp3century.utils.RedisServiceUtil;
+import com.muchinfo.mtp3common.enumtype.MessageType;
 import com.muchinfo.mtp3common.enumtype.RedisConstants;
 import com.muchinfo.mtp3common.utils.CommonUtil;
 import com.muchinfo.mtp3common.utils.EncryptionUtils;
@@ -28,7 +29,7 @@ public class SignAuthInterceptor implements HandlerInterceptor {
         String timestampStr = request.getHeader("timestamp");
         if (StringUtils.isBlank(timestampStr)) {
             log.debug("timestamp不能为空...........");
-            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "系统异常,请联系管理员！", false);
+            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, MessageType.MESSAGE_ERROR_CODE_SYSTEM008.getCode(), request.getHeader("Accept-Language"));
             return false;
         }
         //重复请求判断
@@ -46,14 +47,14 @@ public class SignAuthInterceptor implements HandlerInterceptor {
         String sign = request.getHeader("sign");
         if (StringUtils.isBlank(sign)) {
             log.debug("sign不能为空...........");
-            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "系统异常,请联系管理员！", false);
+            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, MessageType.MESSAGE_ERROR_CODE_SYSTEM008.getCode(), request.getHeader("Accept-Language"));
             return false;
         }
         //获取redis存入的sign
         Object cacheObject = redisUtils.getCacheObject(request.getHeader("Sign-Id"));
         if (Objects.isNull(cacheObject)) {
             log.debug("sign签名失效...........");
-            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "系统异常,请联系管理员！", false);
+            ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, MessageType.MESSAGE_ERROR_CODE_SYSTEM008.getCode(), request.getHeader("Accept-Language"));
             return false;
         }
         char[] encryptedChars = String.valueOf(cacheObject).toCharArray();
@@ -64,7 +65,7 @@ public class SignAuthInterceptor implements HandlerInterceptor {
         //通过后台重新签名校验与前端签名sign值比对，确认当前请求数据是否被篡改
         if (!(sign.equalsIgnoreCase(EncryptionUtils.encryptSHA(sortedText + timestampStr)))) {
             log.debug("sign签名校验失败...........");
-            ResponseUtils.writeFiled(response, HttpServletResponse.SC_BAD_GATEWAY, "系统异常,请联系管理员！", false);
+            ResponseUtils.writeFiled(response, HttpServletResponse.SC_BAD_GATEWAY, MessageType.MESSAGE_ERROR_CODE_SYSTEM008.getCode(), request.getHeader("Accept-Language"));
             return false;
         }
         log.debug("签名校验通过，放行...........");

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/ICommonService.java

@@ -29,7 +29,7 @@ public interface ICommonService {
 
     AjaxResult<TAAccountChildrenResult> queryTAAccountChildren(String accountName, Long areaUserId, HttpServletRequest request);
 
-    AjaxResult<GoodsSelectResult> queryGoodsSelect(String goodsStatusIds, String marketId, String searchCode, HttpServletRequest request);
+    AjaxResult<GoodsSelectResult> queryGoodsSelect(String goodsStatusIds, Long marketId, String searchCode, HttpServletRequest request);
 
     AjaxResult<Market> getOrderListAll(List<Long> markets, HttpServletRequest request);
 

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/IMarketRunManageService.java

@@ -2,7 +2,7 @@ package com.muchinfo.mtp3century.service;
 
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
-import com.muchinfo.mtp3pojos.vo.marketrun.MarketRunLoginUserResult;
+import com.muchinfo.mtp3pojos.vo.marketrun.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -10,4 +10,10 @@ public interface IMarketRunManageService {
     PageResult<MarketRunLoginUserResult> queryUserLogin(String loginid, Integer pageNum, Integer pageSize, HttpServletRequest request);
 
     AjaxResult downonline(Long loginid, HttpServletRequest request);
+
+    PageResult<MarketRunCutPositionResult> queryCutposition(Integer pageNum, Integer pageSize, HttpServletRequest request);
+
+    AjaxResult<MarketRunInitInvestor> initInvestor(HttpServletRequest request);
+
+    AjaxResult<MarketRunInvestorResult> investor(MarketRunInvestorParam param, HttpServletRequest request);
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/IProfitSharService.java

@@ -13,7 +13,7 @@ public interface IProfitSharService {
 
     AjaxResult delete(Long groupId, HttpServletRequest request);
 
-    PageResult<ProfitSharMemberResult> memberQuery(Long subareagroupid, Integer pageNum, Integer pageSize);
+    PageResult<ProfitSharMemberResult> memberQuery(Long subareagroupid, Integer pageNum, Integer pageSize,HttpServletRequest request);
 
     AjaxResult<ProfitSharGroupOrganResult> groupOrgan(HttpServletRequest request);
 

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

@@ -200,8 +200,12 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public AjaxResult<GoodsSelectResult> queryGoodsSelect(String goodsStatusIds, String marketId, String searchCode, HttpServletRequest request) {
-        List<GoodsSelectResult> goodsSelectResults = iGoodsMapper.queryGoodsSelect(goodsStatusIds, marketId, searchCode);
+    public AjaxResult<GoodsSelectResult> queryGoodsSelect(String goodsStatusIds, Long marketId, String searchCode, HttpServletRequest request) {
+        String[] split = new String[0];
+        if (StringUtils.isNotBlank(goodsStatusIds)) {
+            split = goodsStatusIds.split(",");
+        }
+        List<GoodsSelectResult> goodsSelectResults = iGoodsMapper.queryGoodsSelect(split, marketId, searchCode);
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), goodsSelectResults);
     }
 

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/DealLoginServiceImpl.java

@@ -69,7 +69,7 @@ public class DealLoginServiceImpl implements IDealLoginService {
     @Override
     public PageResult<InvestorLoginQueryResult> queryInvestor(InvestorLoginQueryParam param, HttpServletRequest request) {
         param.setLoginusertype(1);
-        IPage<InvestorLoginQueryResult> page = new Page<>(param.getPageNo(), param.getPageSize());
+        IPage<InvestorLoginQueryResult> page = new Page<>(param.getPageNum(), param.getPageSize());
         IPage<InvestorLoginQueryResult> resultIPage = iLoginaccountMapper.queryLoginAccountPage(page, param);
         //返回列表
         PageResult<InvestorLoginQueryResult> pageResult = new PageResult<>();

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

@@ -3,11 +3,15 @@ package com.muchinfo.mtp3century.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.protobuf.InvalidProtocolBufferException;
 import com.muchinfo.mtp.proto.Common;
 import com.muchinfo.mtp.proto.SystemMI1;
 import com.muchinfo.mtp3century.service.ICommonService;
 import com.muchinfo.mtp3century.service.IMarketRunManageService;
+import com.muchinfo.mtp3century.utils.RedisServiceUtil;
 import com.muchinfo.mtp3common.enumtype.Constants;
 import com.muchinfo.mtp3common.enumtype.FunCodeConstants;
 import com.muchinfo.mtp3common.enumtype.MessageType;
@@ -18,18 +22,29 @@ import com.muchinfo.mtp3common.vo.Calculator;
 import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3common.vo.ProtoHelper;
 import com.muchinfo.mtp3interface.mapper.ISystemmanagerMapper;
+import com.muchinfo.mtp3interface.mapper.ITaaccountMapper;
+import com.muchinfo.mtp3interface.mapper.ITradeOrderdetailMapper;
+import com.muchinfo.mtp3interface.mapper.IUseraccountMapper;
 import com.muchinfo.mtp3pojos.entity.Systemmanager;
+import com.muchinfo.mtp3pojos.entity.Useraccount;
 import com.muchinfo.mtp3pojos.vo.ProtoErrorCodes;
-import com.muchinfo.mtp3pojos.vo.marketrun.MarketRunLoginUserResult;
+import com.muchinfo.mtp3pojos.vo.marketrun.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import com.muchinfo.mtp.proto.AccountRedis.AccRiskInfo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 
 @Service
 public class MarketRunManageServiceImpl implements IMarketRunManageService {
@@ -42,6 +57,14 @@ public class MarketRunManageServiceImpl implements IMarketRunManageService {
     private SystemmanagerServiceImpl systemmanagerService;
     @Resource
     private RabbitTemplate rabbitTemplate;
+    @Resource
+    private ITradeOrderdetailMapper iTradeOrderdetailMapper;
+    @Resource
+    private RedisServiceUtil redisServiceUtil;
+    @Resource
+    private ITaaccountMapper taaccountMapper;
+    @Resource
+    private IUseraccountMapper iUseraccountMapper;
 
     @Override
     public PageResult<MarketRunLoginUserResult> queryUserLogin(String loginid, Integer pageNum, Integer pageSize, HttpServletRequest request) {
@@ -57,7 +80,7 @@ public class MarketRunManageServiceImpl implements IMarketRunManageService {
         IPage<MarketRunLoginUserResult> queryResultIPage = iSystemmanagerMapper.queryUserOnlineByPage(page, loginid, memberuserid, parentuserid);
         PageResult<MarketRunLoginUserResult> result = new PageResult<>();
         result.setCode(Constants.Success_Code_Design);
-        result.setMessage(Constants.Deal_Success_Message);
+        result.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
         result.setPages(queryResultIPage.getPages());
         result.setCurrent(queryResultIPage.getCurrent());
         result.setTotal(queryResultIPage.getTotal());
@@ -114,4 +137,186 @@ public class MarketRunManageServiceImpl implements IMarketRunManageService {
         }
         return null;
     }
+
+    @Override
+    public PageResult<MarketRunCutPositionResult> queryCutposition(Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        IPage<MarketRunCutPositionResult> page = new Page<>(pageNum, pageSize);
+        IPage<MarketRunCutPositionResult> queryResultIPage = iTradeOrderdetailMapper.queryCutListFromOrderDetail(page);
+        PageResult<MarketRunCutPositionResult> result = new PageResult<>();
+        result.setCode(Constants.Success_Code_Design);
+        result.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        result.setPages(queryResultIPage.getPages());
+        result.setCurrent(queryResultIPage.getCurrent());
+        result.setTotal(queryResultIPage.getTotal());
+        result.setPageSize(queryResultIPage.getSize());
+        result.setData(queryResultIPage.getRecords());
+        return result;
+    }
+
+    @Override
+    public AjaxResult<MarketRunInitInvestor> initInvestor(HttpServletRequest request) {
+        MarketRunInitInvestor marketRunInitInvestor = new MarketRunInitInvestor();
+        //是否按风险率风控
+        String sp = iCommonService.getSysparmById(SysConstants.SYSPARAM_CODE_ISSHOWRATE);
+        if (StringUtils.isNotBlank(sp))
+            marketRunInitInvestor.setIsshowrate(sp);
+        else
+            marketRunInitInvestor.setIsshowrate("1");
+
+        //是否按安全度风控
+        String sp1 = iCommonService.getSysparmById(SysConstants.SYSPARAM_CODE_ISSHOWSAFE);
+        if (StringUtils.isNotBlank(sp1))
+            marketRunInitInvestor.setIsshowsafe(sp);
+        else
+            marketRunInitInvestor.setIsshowrate("1");
+
+        //是否显示授信金额
+        String sp2 = iCommonService.getSysparmById(SysConstants.SYSPAMA_CODE_SHOUXIN);
+        if (StringUtils.isNotBlank(sp2))
+            marketRunInitInvestor.setIsshowshouxin(sp);
+        else
+            marketRunInitInvestor.setIsshowrate("1");
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), marketRunInitInvestor);
+    }
+
+    @Override
+    public AjaxResult<MarketRunInvestorResult> investor(MarketRunInvestorParam param, HttpServletRequest request) {
+        try {
+            Systemmanager user = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+            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);
+            return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
+        }
+    }
+
+    private List<MarketRunInvestorResult> getAccountRisk(MarketRunInvestorParam param, int type, Systemmanager user) throws InvalidProtocolBufferException {
+        List<MarketRunInvestorResult> resultList = new ArrayList<>();
+        Double risk = param.getRisk() == null ? 50.0 : param.getRisk();
+        String key;
+        if (param.getOrderbytype() == 1) {
+            //安全度
+            key = type == 1 ? "sort_by_saferate_investor" : "sort_by_saferate_member";
+        } else {
+            //风险率
+            key = type == 1 ? "sort_by_rate_investor" : "sort_by_rate_member";
+        }
+        Set<String> set = null;
+        if (key.equals("sort_by_rate_investor") || key.equals("sort_by_rate_member")) {
+            //风险率
+            if (risk.compareTo(0.0) == 0) {
+                set = redisServiceUtil.getCacheSet(key, -10000, 10000000.0);
+            } else {
+                set = redisServiceUtil.getCacheSet(key, risk / 100, 10000000.0);
+            }
+        } else {
+            //安全度
+            if (risk.compareTo(0.0) == 0) {
+                set = redisServiceUtil.getCacheSet(key, -100000, 100.0);
+            } else {
+                set = redisServiceUtil.getCacheSet(key, -100000.0, risk / 100);
+            }
+        }
+
+        if (CollectionUtils.isNotEmpty(set)) {
+            TaaccountMonitorVo vo;
+            for (Object p : set) {
+                String str_accountid = p.toString();
+                if (param.getPuserid() == null) {
+                    vo = taaccountMapper.getMonitorInvestor(Long.valueOf(str_accountid), null);
+                } else {
+                    vo = taaccountMapper.getMonitorInvestor(Long.valueOf(str_accountid), param.getPuserid());
+                }
+                if (Objects.isNull(vo)) {
+                    continue;
+                }
+
+                if (param.getSearchtype() == 5 && vo.getUsertype() != 5) {
+                    continue;
+                } else if (param.getSearchtype() == 2) {
+                    if (vo.getUsertype() != 2 && vo.getUsertype() != 3)
+                        continue;
+                }
+
+                if (user.getReletype() != 1) {
+                    if (user.getReletype() == 2) {
+                        String[] roletyes = param.getOrgztypes().split(",");
+                        String role = "";
+                        //如果其中一个有权限
+                        for (String roletype : roletyes) {
+                            if (roletype.equals("3")) {
+                                role = roletype;
+                                break;
+                            }
+                        }
+                        if (role.equals("3")) {
+                            if (vo.getParentuserid().compareTo(user.getAreauserid()) == 0
+                                    || vo.getUserid().compareTo(user.getAreauserid()) == 0) {
+
+                            } else {
+                                Useraccount broker = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", vo.getMemberuserid()));
+                                if (!broker.getMemberuserid().equals(user.getAreauserid())
+                                        && !broker.getParentuserid().equals(user.getAreauserid())) {
+                                    continue;
+                                }
+                            }
+                        } else {
+                            if ((type == 1 && vo.getMemberuserid().compareTo(user.getAreauserid()) != 0) ||
+                                    (type == 2 && vo.getUserid().compareTo(user.getAreauserid()) != 0)) {
+                                continue;
+                            }
+                        }
+                    } else {
+                        if (!vo.getSubarealevelpath().contains("," + user.getAreauserid() + ",")) {
+                            continue;
+                        }
+                    }
+                }
+
+                MarketRunInvestorResult mvo = new MarketRunInvestorResult();
+                if (2 != vo.getUsertype()) {
+                    mvo.setParentusername(vo.getParentusername());
+                } else {
+                    mvo.setParentusername("");
+                }
+                mvo.setMemberusername(vo.getMemberusername());
+                mvo.setAccountname(vo.getAccountname());
+                if (StringUtils.isBlank(mvo.getAccountname())) {
+                    mvo.setAccountname(vo.getUseraccountname());
+                }
+                byte[] valuebts = redisServiceUtil.getBytes("risk:" + str_accountid);
+                if (valuebts == null) {
+                    continue;
+                }
+                AccRiskInfo accRiskInfo = AccRiskInfo.newBuilder().mergeFrom(valuebts).build();
+
+                log.debug(accRiskInfo.getACCID() + "accRiskInfo={}", accRiskInfo.toString());
+
+                mvo.setAccountid(accRiskInfo.getACCID());
+                mvo.setBalance(BigDecimal.valueOf(accRiskInfo.getBALANCE()));
+                mvo.setCurriskrate(BigDecimal.valueOf(accRiskInfo.getCURRISKRATE()).multiply(BigDecimal.valueOf(100d)).setScale(2, RoundingMode.DOWN));
+                mvo.setCurrisklv(accRiskInfo.getCURRISKLV());
+                mvo.setNetbalance(BigDecimal.valueOf(accRiskInfo.getNetBALANCE()));
+                mvo.setCurrisksaferate(BigDecimal.valueOf(accRiskInfo.getCURRISKSAFERATE() * 100));
+                mvo.setCurrisksafelv(accRiskInfo.getCURRISKSAFELV());
+                mvo.setCredit(BigDecimal.valueOf(accRiskInfo.getCredit()).setScale(0, RoundingMode.HALF_UP));
+                mvo.setAvailmargin(BigDecimal.valueOf(accRiskInfo.getAVAILMARGIN()).setScale(2, RoundingMode.HALF_UP));
+                mvo.setTotalfloatpl(BigDecimal.valueOf(accRiskInfo.getTOTALFLOATPL()).setScale(2, RoundingMode.HALF_UP));
+
+                double totalfrozen = accRiskInfo.getTOTALFREEZEMARGIN() + accRiskInfo.getTOTALFREEZEFEE()
+                        + accRiskInfo.getTOTALOUTAMOUNTFREEZE() + accRiskInfo.getTOTALOTHERMONEYFREEZE();
+                mvo.setTotalfrozen(new BigDecimal(totalfrozen).setScale(2, BigDecimal.ROUND_HALF_UP));
+
+                BigDecimal freezemargin = vo.getFreezemargin();
+                mvo.setFreezemargin(freezemargin);
+
+                //占用
+                mvo.setUsedmargin(new BigDecimal(accRiskInfo.getSumMargin()));
+                resultList.add(mvo);
+            }
+        }
+
+        return resultList;
+    }
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/ProfitSharServiceImpl.java

@@ -47,16 +47,31 @@ public class ProfitSharServiceImpl implements IProfitSharService {
     @Override
     public PageResult<ProfitSharGroupResult> queryPage(String subareagroupname, Integer pageNum, Integer pageSize, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
-        IPage<ProfitSharGroupResult> page = new Page<>(pageNum, pageSize);
-        IPage<ProfitSharGroupResult> resultIPage = iSubareagroupMapper.getSubGroupPage(page, subareagroupname, systemmanager.getAreauserid());
         PageResult<ProfitSharGroupResult> result = new PageResult<>();
-        result.setCode(Constants.Success_Code_Design);
-        result.setMessage(Constants.Deal_Success_Message);
-        result.setPages(resultIPage.getPages());
-        result.setCurrent(resultIPage.getCurrent());
-        result.setTotal(resultIPage.getTotal());
-        result.setPageSize(resultIPage.getSize());
-        result.setData(resultIPage.getRecords());
+        List<ProfitSharGroupResult> resultList = new ArrayList<>();
+        if (pageNum == null && pageSize == null) {
+            //用于分润配置新增获取分组列表
+            List<Subareagroup> lg = iSubareagroupMapper.selectList(new QueryWrapper<Subareagroup>().eq("areauserid", systemmanager.getAreauserid()));
+            for (Subareagroup subareagroup : lg) {
+                ProfitSharGroupResult profitSharGroupResult = new ProfitSharGroupResult();
+                profitSharGroupResult.setSubareagroupid(subareagroup.getSubareagroupid());
+                profitSharGroupResult.setSubareagroupname(subareagroup.getSubareagroupname());
+                resultList.add(profitSharGroupResult);
+                result.setData(resultList);
+            }
+            result.setCode(Constants.Success_Code_Design);
+            result.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        } else {
+            IPage<ProfitSharGroupResult> page = new Page<>(pageNum, pageSize);
+            IPage<ProfitSharGroupResult> resultIPage = iSubareagroupMapper.getSubGroupPage(page, subareagroupname, systemmanager.getAreauserid());
+            result.setCode(Constants.Success_Code_Design);
+            result.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+            result.setPages(resultIPage.getPages());
+            result.setCurrent(resultIPage.getCurrent());
+            result.setTotal(resultIPage.getTotal());
+            result.setPageSize(resultIPage.getSize());
+            result.setData(resultIPage.getRecords());
+        }
         return result;
     }
 
@@ -99,12 +114,12 @@ public class ProfitSharServiceImpl implements IProfitSharService {
     }
 
     @Override
-    public PageResult<ProfitSharMemberResult> memberQuery(Long subareagroupid, Integer pageNum, Integer pageSize) {
+    public PageResult<ProfitSharMemberResult> memberQuery(Long subareagroupid, Integer pageNum, Integer pageSize, HttpServletRequest request) {
         IPage<ProfitSharMemberResult> page = new Page<>(pageNum, pageSize);
         IPage<ProfitSharMemberResult> resultIPage = iSubareagroupMapper.getMemberPage(page, subareagroupid);
         PageResult<ProfitSharMemberResult> result = new PageResult<>();
         result.setCode(Constants.Success_Code_Design);
-        result.setMessage(Constants.Deal_Success_Message);
+        result.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
         result.setPages(resultIPage.getPages());
         result.setCurrent(resultIPage.getCurrent());
         result.setTotal(resultIPage.getTotal());
@@ -134,7 +149,7 @@ public class ProfitSharServiceImpl implements IProfitSharService {
 
     @Override
     public AjaxResult deleteMember(Long userid, HttpServletRequest request) {
-        iSubareagroupdetailMapper.deleteById(new QueryWrapper<Subareagroupdetail>().eq("userid", userid));
+        iSubareagroupdetailMapper.delete(new QueryWrapper<Subareagroupdetail>().eq("userid", userid));
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
 
@@ -149,6 +164,12 @@ public class ProfitSharServiceImpl implements IProfitSharService {
         } else {
             uid = systemmanager.getAreauserid();
         }
+
+        Map<String, Object> map = redisServiceUtil.getCacheMap(Constants.REDIS_HEADER_DICT + "dividefeetype");
+        profitSharInitResult.setDividefeetype1name(map.get("1") == null ? "" : String.valueOf(map.get("1")));
+        profitSharInitResult.setDividefeetype6name(map.get("6") == null ? "" : String.valueOf(map.get("6")));
+        profitSharInitResult.setDividefeetype9name(map.get("9") == null ? "" : String.valueOf(map.get("9")));
+
         //获取经纪会员的市场
         List<Enumdicitem> enumDicItemList = iEnumdicitemMapper.selectList(new QueryWrapper<Enumdicitem>()
                 .eq("enumitemstatus", 1)
@@ -161,7 +182,7 @@ public class ProfitSharServiceImpl implements IProfitSharService {
                 }
             }
         }
-        List<Market> mks = iMarketMapper.selectList(new QueryWrapper<Market>().eq("userid", uid).eq("roletype", 7));
+        List<Marketvo> mks = iMarketMapper.getMarketsNameByUseridAndrole(uid, 7);
         for (int i = 0; i < mks.size(); i++) {
             if (mks.get(i).getMarketid() < 1000 || !trademodeMap.containsKey(mks.get(i).getTrademode())) {
                 mks.remove(i);
@@ -248,7 +269,7 @@ public class ProfitSharServiceImpl implements IProfitSharService {
             } else {
                 sd.setDividevalue(param.getDividevalue());
             }
-            iSubdivideconfigMapper.update(new QueryWrapper<Subdivideconfig>().eq("subareagroupid", sd.getSubareagroupid()));
+            iSubdivideconfigMapper.update(sd, new QueryWrapper<Subdivideconfig>().eq("subareagroupid", sd.getSubareagroupid()));
         }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }

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

@@ -93,17 +93,17 @@ public class QueryServiceImpl implements IQueryService {
         //校验
         if (commissionSheetParam.getMarketId() == -1) {
             pageResult.setCode(Constants.Error_Code_Design);
-            pageResult.setMessage("请选择市场查询");
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_001.getCode(), request.getHeader("Accept-Language")));
             return pageResult;
         }
         if (commissionSheetParam.getIsHis() == 1 && Strings.isNullOrEmpty(String.valueOf(commissionSheetParam.getStartDateHis()))) {
             pageResult.setCode(Constants.Error_Code_Design);
-            pageResult.setMessage("历史查询请选择开始日期");
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_002.getCode(), request.getHeader("Accept-Language")));
             return pageResult;
         }
         if (commissionSheetParam.getIsHis() == 1 && Strings.isNullOrEmpty(String.valueOf(commissionSheetParam.getEndDateHis()))) {
             pageResult.setCode(Constants.Error_Code_Design);
-            pageResult.setMessage("历史查询请选择结束日期");
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_003.getCode(), request.getHeader("Accept-Language")));
             return pageResult;
         }
         boolean marketFlag = checkMarketAuth(systemmanager, commissionSheetParam.getMarketId(), commissionSheetParam.getOrgztypes());
@@ -111,7 +111,7 @@ public class QueryServiceImpl implements IQueryService {
             commissionSheetParam.setAreaUserid(systemmanager.getAreauserid());
         } else {
             pageResult.setCode(Constants.Error_Code_Design);
-            pageResult.setMessage("没有此权限");
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_004.getCode(), request.getHeader("Accept-Language")));
             return pageResult;
         }
         if (StringUtils.isNotBlank(commissionSheetParam.getTradeDate())) {
@@ -267,17 +267,17 @@ public class QueryServiceImpl implements IQueryService {
         //校验
         if (contractSheetParam.getMarketId() == -1) {
             pageResult.setCode(Constants.Error_Code_Design);
-            pageResult.setMessage("请选择市场查询");
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_001.getCode(), request.getHeader("Accept-Language")));
             return pageResult;
         }
         if (contractSheetParam.getIsHis() == 1 && Strings.isNullOrEmpty(String.valueOf(contractSheetParam.getStartDateHis()))) {
             pageResult.setCode(Constants.Error_Code_Design);
-            pageResult.setMessage("历史查询请选择开始日期");
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_002.getCode(), request.getHeader("Accept-Language")));
             return pageResult;
         }
         if (contractSheetParam.getIsHis() == 1 && Strings.isNullOrEmpty(String.valueOf(contractSheetParam.getEndDateHis()))) {
             pageResult.setCode(Constants.Error_Code_Design);
-            pageResult.setMessage("历史查询请选择结束日期");
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_003.getCode(), request.getHeader("Accept-Language")));
             return pageResult;
         }
         Market market = iMarketMapper.selectOne(new QueryWrapper<Market>().eq("marketid", contractSheetParam.getMarketId()));
@@ -296,7 +296,7 @@ public class QueryServiceImpl implements IQueryService {
             contractSheetParam.setAreaUserid(systemmanager.getAreauserid());
         } else {
             pageResult.setCode(Constants.Error_Code_Design);
-            pageResult.setMessage("没有此权限");
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_004.getCode(), request.getHeader("Accept-Language")));
             return pageResult;
         }
         if (StringUtils.isNotBlank(contractSheetParam.getTradeDate())) {
@@ -436,7 +436,7 @@ public class QueryServiceImpl implements IQueryService {
         }
         if (param.getMarketId() == -1) {
             pageResult.setCode(Constants.Error_Code_Design);
-            pageResult.setMessage("请选择市场查询");
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_001.getCode(), request.getHeader("Accept-Language")));
             return pageResult;
         }
         if (param.getFilterTrademodeList() == null || param.getFilterTrademodeList().size() <= 0) {
@@ -485,7 +485,7 @@ public class QueryServiceImpl implements IQueryService {
             return pageResult;
         } else {
             pageResult.setCode(Constants.Error_Code_Design);
-            pageResult.setMessage("没有此权限");
+            pageResult.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_004.getCode(), request.getHeader("Accept-Language")));
             return pageResult;
         }
     }
@@ -662,7 +662,7 @@ public class QueryServiceImpl implements IQueryService {
         if (systemmanager.getReletype() != 1) {
             param.setUserid(systemmanager.getAreauserid());
         }
-        IPage<WarehouseCommissionResult> page = new Page<>(param.getPagenum(), param.getPagesize());
+        IPage<WarehouseCommissionResult> page = new Page<>(param.getPageNum(), param.getPageSize());
         IPage<WarehouseCommissionResult> resultIPage = iWrtradeOrderdetailMapper.getAllWrTradeOrderMap(page, param);
         PageResult<WarehouseCommissionResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
@@ -726,7 +726,7 @@ public class QueryServiceImpl implements IQueryService {
         if (systemmanager.getReletype() != 1) {
             param.setUserid(systemmanager.getAreauserid());
         }
-        IPage<WarehouseContractResult> page = new Page<>(param.getPagenum(), param.getPagesize());
+        IPage<WarehouseContractResult> page = new Page<>(param.getPageNum(), param.getPageSize());
         IPage<WarehouseContractResult> resultIPage = iWrtradeOrderdetailMapper.queryTradeDetail(page, param);
         PageResult<WarehouseContractResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
@@ -845,7 +845,7 @@ public class QueryServiceImpl implements IQueryService {
         if (systemmanager.getReletype() != 1) {
             param.setMemberuserid(systemmanager.getAreauserid());
         }
-        IPage<WarehouseSumResult> page = new Page<>(param.getPagenum(), param.getPagesize());
+        IPage<WarehouseSumResult> page = new Page<>(param.getPageNum(), param.getPageSize());
         IPage<WarehouseSumResult> resultIPage = iWrtradeOrderdetailMapper.querySum(page, param);
         PageResult<WarehouseSumResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
@@ -864,7 +864,7 @@ public class QueryServiceImpl implements IQueryService {
         if (systemmanager.getReletype() != 1) {
             param.setMemberuserid(systemmanager.getAreauserid());
         }
-        IPage<WarehouseSumDetailResult> page = new Page<>(param.getPagenum(), param.getPagesize());
+        IPage<WarehouseSumDetailResult> page = new Page<>(param.getPageNum(), param.getPageSize());
         IPage<WarehouseSumDetailResult> resultIPage = iWrtradeOrderdetailMapper.summaryQueryDetail(page, param);
         PageResult<WarehouseSumDetailResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/SettlementServiceImpl.java

@@ -67,7 +67,7 @@ public class SettlementServiceImpl implements ISettlementService {
         IPage<SecondProfitSharResult> resultIPage = iReckonDaydividecountMapper.queryShareDayList(page, parentuserid, areatype, tradedate);
         PageResult<SecondProfitSharResult> result = new PageResult<>();
         result.setCode(Constants.Success_Code_Design);
-        result.setMessage(Constants.Deal_Success_Message);
+        result.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
         result.setPages(resultIPage.getPages());
         result.setCurrent(resultIPage.getCurrent());
         result.setTotal(resultIPage.getTotal());
@@ -86,7 +86,7 @@ public class SettlementServiceImpl implements ISettlementService {
         IPage<SecondProfitSharDetailResult> resultIPage = iReckonDaydividecountMapper.queryOrgShareDayList(page, param);
         PageResult<SecondProfitSharDetailResult> result = new PageResult<>();
         result.setCode(Constants.Success_Code_Design);
-        result.setMessage(Constants.Deal_Success_Message);
+        result.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
         result.setPages(resultIPage.getPages());
         result.setCurrent(resultIPage.getCurrent());
         result.setTotal(resultIPage.getTotal());

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/SysUserDetailsServiceImpl.java

@@ -10,11 +10,11 @@ import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class SysUserDetailsServiceImpl implements ISysUserDetailsService {
@@ -26,7 +26,7 @@ public class SysUserDetailsServiceImpl implements ISysUserDetailsService {
     @Override
     public UserDetails loadUserByUsername(String userName) throws UsernameNotFoundException {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", userName));
-        if (systemmanager == null) {
+        if (Objects.isNull(systemmanager)) {
             throw new UsernameNotFoundException("账号或密码错误！");
         }
 

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/SystemSetUpServiceImpl.java

@@ -66,7 +66,7 @@ public class SystemSetUpServiceImpl implements ISystemSetUpService {
                                 .eq("parentuserid", Long.parseLong(aid)));
                         if (CollectionUtils.isEmpty(l)) {
                             pageResult.setCode(Constants.Error_Code_Design);
-                            pageResult.setMessage("无查询权限");
+                            pageResult.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_004.getCode(), request.getHeader("Accept-Language")));
                             return pageResult;
                         }
                     }
@@ -88,7 +88,7 @@ public class SystemSetUpServiceImpl implements ISystemSetUpService {
         IPage<SystemUserLogResult> queryResultIPage = iSystemmanagerMapper.selectLogByParam(page, param);
         PageResult<SystemUserLogResult> result = new PageResult<>();
         result.setCode(Constants.Success_Code_Design);
-        result.setMessage(Constants.Deal_Success_Message);
+        result.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
         result.setPages(queryResultIPage.getPages());
         result.setCurrent(queryResultIPage.getCurrent());
         result.setTotal(queryResultIPage.getTotal());
@@ -108,7 +108,7 @@ public class SystemSetUpServiceImpl implements ISystemSetUpService {
         IPage<SystemLoginErrorResult> queryResultIPage = iSystemmanagerMapper.queryUserLoginFlow(page, param);
         PageResult<SystemLoginErrorResult> result = new PageResult<>();
         result.setCode(Constants.Success_Code_Design);
-        result.setMessage(Constants.Deal_Success_Message);
+        result.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
         result.setPages(queryResultIPage.getPages());
         result.setCurrent(queryResultIPage.getCurrent());
         result.setTotal(queryResultIPage.getTotal());

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/TaaccountServiceImpl.java

@@ -182,18 +182,18 @@ public class TaaccountServiceImpl extends ServiceImpl<ITaaccountMapper, Taaccoun
         PageResult<TaAccountAmountStreamResult> result = new PageResult<>();
         if (StringUtils.isBlank(param.getAccountId())) {
             result.setCode(Constants.Error_Code_Design);
-            result.setMessage("请输入资金账户");
+            result.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_007.getCode(), request.getHeader("Accept-Language")));
             return result;
         }
         if (param.getLogType() == 2) {
             if (Strings.isNullOrEmpty(param.getStartTime())) {
                 result.setCode(Constants.Error_Code_Design);
-                result.setMessage("历史查询请选择开始日期");
+                result.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_002.getCode(), request.getHeader("Accept-Language")));
                 return result;
             }
             if (Strings.isNullOrEmpty(param.getEndTime())) {
                 result.setCode(Constants.Error_Code_Design);
-                result.setMessage("历史查询请选择结束日期");
+                result.setMessage(AjaxResult.dealMsg(MessageType.QUERY_ERROR_CODE_003.getCode(), request.getHeader("Accept-Language")));
                 return result;
             }
         }

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

@@ -254,7 +254,7 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
         if (systemmanager.getReletype().intValue() != SysConstants.SYS_TYPE_MANAGE.intValue()) {
             param.setMemberuserid(systemmanager.getAreauserid());
         }
-        IPage<InvestorModifyResult> page = new Page<>(param.getPageNo(), param.getPageSize());
+        IPage<InvestorModifyResult> page = new Page<>(param.getPageNum(), param.getPageSize());
         IPage<InvestorModifyResult> modifyPage = iUseraccountMapper.queryModifyPage(page, param);
         PageResult<InvestorModifyResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
@@ -353,8 +353,8 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                     extendFee.setFeeid(p.getTradefeeid());
                     extendFee.setFeename(p.getTradefeename());
                     extendFee.setFeealgorithm(ftemp.get(p.getTradefeeid()).getFeeAlgorithm());
-                    extendFee.setExchangevalue(ftemp.get(p.getTradefeeid().intValue()).getExchangeValue());
-                    extendFee.setMemberdefaultvalue(ftemp.get(p.getTradefeeid().intValue()).getMemberDefaultValue());
+                    extendFee.setExchangevalue(ftemp.get(p.getTradefeeid()).getExchangeValue());
+                    extendFee.setMemberdefaultvalue(ftemp.get(p.getTradefeeid()).getMemberDefaultValue());
                     feeStruct.add(extendFee);
                 });
                 result.setExtendFee(feeStruct);

mtp3-century/src/main/java/com/muchinfo/mtp3century/utils/RedisServiceUtil.java

@@ -180,6 +180,16 @@ public class RedisServiceUtil {
     }
 
     /**
+     * 获得缓存的set
+     *
+     * @param key
+     * @return
+     */
+    public <T> Set<T> getCacheSet(final String key,double var1,double var2) {
+        return redisTemplate.opsForZSet().rangeByScore(key, var1, var2);
+    }
+
+    /**
      * 缓存Map
      *
      * @param key

mtp3-century/src/main/resources/mapper/GoodsMapper.xml

@@ -73,17 +73,21 @@
         left join market m on g.marketid = m.marketid
         <where>
             1 = 1
-            <if test="goodsStatusIds!=null and goodsStatusIds!=''">
-                and g.goodsstatus in (#{goodsStatusIds})
+            <if test="split!=null and split.length>0">
+                <foreach collection="split" item="item" open="and g.goodsstatus in (" close=")"
+                         separator=",">
+                    ${item}
+                </foreach>
             </if>
-            <if test="goodsCode != null and goodsCode != '' ">
+            <if test="searchCode != null and searchCode != '' ">
                 and g.goodscode like
-                '%'||#{goodsCode}||'%'
+                '%'||#{searchCode}||'%'
             </if>
             <if test="marketId != null and marketId != '' ">
                 and g.marketid = #{marketId}
             </if>
         </where>
+        and rownum &lt;= 10
         order by g.goodscode
     </select>
 

mtp3-century/src/main/resources/mapper/MarketMapper.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.muchinfo.mtp3interface.mapper.IMarketMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.muchinfo.mtp3pojos.entity.Market">
+        <id column="MARKETID" property="marketid" />
+        <result column="MARKETNAME" property="marketname" />
+        <result column="EXCHAREAID" property="exchareaid" />
+        <result column="MARKETTYPE" property="markettype" />
+        <result column="TRADEMODE" property="trademode" />
+        <result column="TRADEPROPERTY" property="tradeproperty" />
+        <result column="OPENMETHOD" property="openmethod" />
+        <result column="RECKONPRICEALGORITHM" property="reckonpricealgorithm" />
+        <result column="RECKONPRICEPARAM" property="reckonpriceparam" />
+        <result column="MARKETSTATUS" property="marketstatus" />
+        <result column="MARKETSERVICEID" property="marketserviceid" />
+        <result column="MARGINFORMULA" property="marginformula" />
+        <result column="PERFORMANCETEMPID" property="performancetempid" />
+        <result column="CLEARINTERVAL" property="clearinterval" />
+        <result column="MATCHERMODE" property="matchermode" />
+        <result column="RECKONORDER" property="reckonorder" />
+        <result column="CANPREEXERCISE" property="canpreexercise" />
+        <result column="CANGOODSEXERCISE" property="cangoodsexercise" />
+        <result column="GOODSTYPE" property="goodstype" />
+        <result column="ROLEPRIORITYTYPE" property="roleprioritytype" />
+        <result column="ISRECORDSOURCE" property="isrecordsource" />
+        <result column="MARGINFORMULA2" property="marginformula2" />
+        <result column="HASWR" property="haswr" />
+        <result column="PREMIUMQUOTEMODE" property="premiumquotemode" />
+        <result column="CANGOODSEXERCISETYPE" property="cangoodsexercisetype" />
+        <result column="CANACCEPTQUOTE" property="canacceptquote" />
+        <result column="CANMUTISTAGE" property="canmutistage" />
+        <result column="ISDEDUCTMARGIN" property="isdeductmargin" />
+        <result column="CANMANUALQUOTESTRIKE" property="canmanualquotestrike" />
+        <result column="TRADETYPE" property="tradetype" />
+        <result column="PENDINGFLAG" property="pendingflag" />
+        <result column="PENDINGTIME" property="pendingtime" />
+        <result column="RECKONTIME" property="reckontime" />
+        <result column="HASTRADECREDIT" property="hastradecredit" />
+        <result column="CONTRACTTMP" property="contracttmp" />
+        <result column="HASREBATE" property="hasrebate" />
+        <result column="REBATERATIO" property="rebateratio" />
+        <result column="OTCUSERID" property="otcuserid" />
+        <result column="OUTERSYNCTIME" property="outersynctime" />
+        <result column="AUCTIONWRTYPE" property="auctionwrtype" />
+        <result column="ISRELEASEMARGIN" property="isreleasemargin" />
+        <result column="SELLLISTINGAUDITFLAG" property="selllistingauditflag" />
+        <result column="TRADEMARKETTYPE" property="trademarkettype" />
+        <result column="PAYLATERFLAG" property="paylaterflag" />
+        <result column="ISUPDATERECKONPRICE" property="isupdatereckonprice" />
+        <result column="UPDATERECKONPRICEINTERVAL" property="updatereckonpriceinterval" />
+        <result column="FINANCEMARKETID" property="financemarketid" />
+        <result column="FORCECLOSEMODE" property="forceclosemode" />
+        <result column="FORCECLOSEVALUE" property="forceclosevalue" />
+        <result column="DELIVERYMODE" property="deliverymode" />
+        <result column="ISDELIVERYSELLERCANAPPLY" property="isdeliverysellercanapply" />
+        <result column="ISDELIVERYBUYERPAYONLINE" property="isdeliverybuyerpayonline" />
+        <result column="RISKCONTROLMODE" property="riskcontrolmode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        MARKETID, MARKETNAME, EXCHAREAID, MARKETTYPE, TRADEMODE, TRADEPROPERTY, OPENMETHOD, RECKONPRICEALGORITHM, RECKONPRICEPARAM, MARKETSTATUS, MARKETSERVICEID, MARGINFORMULA, PERFORMANCETEMPID, CLEARINTERVAL, MATCHERMODE, RECKONORDER, CANPREEXERCISE, CANGOODSEXERCISE, GOODSTYPE, ROLEPRIORITYTYPE, ISRECORDSOURCE, MARGINFORMULA2, HASWR, PREMIUMQUOTEMODE, CANGOODSEXERCISETYPE, CANACCEPTQUOTE, CANMUTISTAGE, ISDEDUCTMARGIN, CANMANUALQUOTESTRIKE, TRADETYPE, PENDINGFLAG, PENDINGTIME, RECKONTIME, HASTRADECREDIT, CONTRACTTMP, HASREBATE, REBATERATIO, OTCUSERID, OUTERSYNCTIME, AUCTIONWRTYPE, ISRELEASEMARGIN, SELLLISTINGAUDITFLAG, TRADEMARKETTYPE, PAYLATERFLAG, ISUPDATERECKONPRICE, UPDATERECKONPRICEINTERVAL, FINANCEMARKETID, FORCECLOSEMODE, FORCECLOSEVALUE, DELIVERYMODE, ISDELIVERYSELLERCANAPPLY, ISDELIVERYBUYERPAYONLINE, RISKCONTROLMODE
+    </sql>
+
+    <select id="getMarketsNameByUseridAndrole" resultType="com.muchinfo.mtp3pojos.vo.profitshar.Marketvo">
+        select m.marketid,m.marketname,m.trademode,o.roletype,o.spotrighttype ,
+        o.buyspotrighttype,m.tradeproperty
+        from market m ,arearolemarket o
+        where m.marketid = o.marketid and o.areauserid = #{uid}
+        and m.marketstatus = 2
+        and o.roletype = #{roletype}
+        group by m.marketid,m.marketname,m.trademode,o.roletype,
+        o.spotrighttype,o.buyspotrighttype,m.tradeproperty
+    </select>
+</mapper>

mtp3-century/src/main/resources/mapper/SubareagroupMapper.xml

@@ -32,7 +32,7 @@
     </select>
 
     <select id="getMemberPage" resultType="com.muchinfo.mtp3pojos.vo.profitshar.ProfitSharMemberResult">
-        select u.userid ||'/' || u.accountname as accountname
+        select t.userid, u.userid ||'/' || u.accountname as accountname
         from subareagroupdetail t
         left join useraccount u on t.userid = u.userid
         <where>

mtp3-century/src/main/resources/mapper/TaaccountMapper.xml

@@ -99,6 +99,22 @@
                      jdbcType="VARCHAR"
                      select="com.muchinfo.mtp3interface.mapper.IUseraccountMapper.selectOrganName"></association>
     </resultMap>
+
+    <resultMap id="monitorResultMap" extends="BaseResultMap"
+               type="com.muchinfo.mtp3pojos.vo.marketrun.TaaccountMonitorVo">
+        <result column="PARENTUSERID" jdbcType="DECIMAL" property="parentuserid"/>
+        <result column="MEMBERUSERID" jdbcType="DECIMAL" property="memberuserid"/>
+        <result column="USERTYPE" jdbcType="DECIMAL" property="usertype"/>
+        <result column="SUBAREALEVELPATH" jdbcType="VARCHAR" property="subarealevelpath"/>
+        <result column="USERACCOUNTNAME" jdbcType="VARCHAR" property="useraccountname"/>
+        <result column="LOGINID" jdbcType="VARCHAR" property="loginid"/>
+        <association property="memberusername" column="MEMBERUSERID" jdbcType="VARCHAR"
+                     select="com.muchinfo.mtp3interface.mapper.IUseraccountMapper.selectOrganName"></association>
+        <association property="parentusername" column="PARENTUSERID" jdbcType="VARCHAR"
+                     select="com.muchinfo.mtp3interface.mapper.IUseraccountMapper.selectOrganName"></association>
+        <!-- <association property="borkername" column="BROKER" jdbcType="VARCHAR"
+            select="com.muchinfo.services.participantor.dao.IUserAccountDao.selectOrganName"></association> -->
+    </resultMap>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         ACCOUNTID, USERID, CURRENCYID, CHANGEFLAG, PASSWORD, TRADESTATUS, SIGNSTATUS, ISMAIN, PARENTACCOUNTID, RELATEDUSERID, RELATEDACCOUNTSTATUS, TAACCOUNTTYPE, ISRECKONACCOUNT, ISMARKETACCOUNT, BALANCE, ORIFREEZEMARGIN, ORIUSEDMARGIN, ORIOTHERFREEZEMARGIN, ORIFREEZECHARGE, ORIMORTGAGECREDIT, ORIOTHERCREDIT, ORIOUTAMOUNTFREEZE, FREEZEMARGIN, USEDMARGIN, OTHERFREEZEMARGIN, FREEZECHARGE, MORTGAGECREDIT, OTHERCREDIT, OUTAMOUNTFREEZE, INAMOUNT, CURRENTBALANCE, OUTAMOUNT, PAYCHARGE, CLOSEPL, CREDITINCREASE, CREDITDECREASE, OTHERCREDITINCREASE, OTHERCREDITDECREASE, TRANSFERAMOUNT, OTHERPAY, OTHERINCOME, OUTTHRESHOLD, TRADESTATUSCHANGETIME, CHANGETIME, THIRDINAMOUNT, THIRDOUTAMOUNT, CAPITALBALANCE, FROMACCOUNTID, SUBLEVELPATH, SERIVCEGROUP, ACCOUNTNAME, ACCOUNTFLAG, ORIDEBT, CURDEBT, MODIFYTIME, MODIFYSRC, MODIFIERID
@@ -286,4 +302,29 @@
         </if>
         order by ua.userid
     </select>
+
+    <select id="getMonitorInvestor" resultMap="monitorResultMap">
+        select t.*,
+               u.usertype,
+               u.userid,
+               u.accountname useraccountname,
+               u.parentuserid,
+               u.memberuserid,
+               u.broker,
+               v.loginids    loginid
+        from taaccount t
+                 left join useraccount u on t.userid = u.userid
+                 left join VIEW_USER_LOGINIDS v on t.userid = v.userid
+        where 1 = 1
+          and t.accountid = #{accountid}
+        <if test="puserid != null">
+            and t.relateduserid in
+            (
+            select userid from useraccount uo
+            start with uo.userid = #{puserid}
+            connect by prior uo.userid =uo.parentuserid
+            )
+        </if>
+    </select>
+
 </mapper>

mtp3-century/src/main/resources/mapper/TradeOrderdetailMapper.xml

@@ -1264,7 +1264,7 @@
                 and g.goodsid=#{vo.goodsid}
             </if>
             <if test="vo.marketid != null and vo.marketid != ''">
-                and m.marketid=#{marketid}
+                and m.marketid=#{vo.marketid}
             </if>
             <if test="vo.excludeAccountIds!=null and vo.excludeAccountIds.length>0">
                 <foreach collection="vo.excludeAccountIds" item="item" open=" and ta.accountid not in (" close=")"
@@ -1315,7 +1315,7 @@
                 and g.goodsid=#{vo.goodsid}
             </if>
             <if test="vo.marketid != null and vo.marketid != ''">
-                and m.marketid=#{marketid}
+                and m.marketid=#{vo.marketid}
             </if>
             <if test="vo.excludeAccountIds!=null and vo.excludeAccountIds.length>0">
                 <foreach collection="vo.excludeAccountIds" item="item" open=" and ta.accountid not in (" close=")"
@@ -1332,4 +1332,15 @@
         order by t.reckondate, to_char(g.goodscode)
     </select>
 
+
+    <!-- 查询斩仓委托明细表(新 - CUTPOSITIONDETAIL表记录交易没更新成交) -->
+    <select id="queryCutListFromOrderDetail" resultType="com.muchinfo.mtp3pojos.vo.marketrun.MarketRunCutPositionResult">
+        select t.orderid as cutorderid, t.ordertime as cuttime, t.accountid,
+               g.goodsname , t.buyorsell , t.tradeqty as cuttradeqty
+        from trade_orderdetail t
+        left join goods g on g.goodsid = t.goodsid
+        where t.operatetype = 2 and t.listingselecttype = 1
+        order by t.orderindexid desc, t.orderid desc
+    </select>
+
 </mapper>

mtp3-century/src/main/resources/mapper/WrtradeOrderdetailMapper.xml

@@ -89,15 +89,14 @@
         select
         wr.accountid,
         wr.wrtradeorderid ,
-        wr.userid,
-        mk.marketName,
+        mk.marketname,
         wr.wrtradetype,
         wr.buyorsell ,
         ws.wrstandardcode || '/' ||  ws.wrstandardname as wrstandard,
         ft.optioncompare as wrfactortypename,
-        wr.orderqty || '(' ||  ei.enumdicname || ')' || as orderqtyname,
-        wr.tradeqty || '(' ||  ei.enumdicname || ')' || as tradeqtyname,
-        wr.Wrtradeorderstatus ,
+        wr.orderqty || '(' ||  ei.enumdicname || ')' as orderqtyname,
+        wr.tradeqty || '(' ||  ei.enumdicname || ')' as tradeqtyname,
+        wr.wrtradeorderstatus ,
         to_char(wr.validtime,'yyyy-MM-dd') as validtime,
         to_char(wr.ordertime,'yyyy-MM-dd hh24:mi:ss') as ordertime,
         to_char(to_date(wr.tradedate,'yyyy-MM-dd'),'yyyy-MM-dd') as tradedate,
@@ -142,17 +141,17 @@
                 or(wr.userid like '%'||#{vo.accountname}||'%'))
             </if>
             <if test="vo.handlestatus != null">
-                and wr.Wrtradeorderstatus = #{vo.handlestatus}
+                and wr.wrtradeorderstatus = #{vo.handlestatus}
             </if>
             <if test="vo.ishis==1">
-                and wr.IsValidData=1
+                and wr.isvaliddata=1
                 <!-- 开始日期 -->
                 <if test="vo.hisstartdate != null and vo.hisstartdate != ''">
-                    and to_date(wr.HisTradeDate, 'yyyyMMdd') &gt;= to_date(#{vo.hisstartdate},'yyyy-MM-dd')
+                    and to_date(wr.histradedate, 'yyyyMMdd') &gt;= to_date(#{vo.hisstartdate},'yyyy-MM-dd')
                 </if>
                 <!-- 结束日期 -->
                 <if test="vo.hisenddate != null and vo.hisenddate != ''">
-                    and to_date(wr.HisTradeDate, 'yyyyMMdd') &lt;= to_date(#{vo.hisenddate},'yyyy-MM-dd')
+                    and to_date(wr.histradedate, 'yyyyMMdd') &lt;= to_date(#{vo.hisenddate},'yyyy-MM-dd')
                 </if>
             </if>
             <if test="vo.userid != null">
@@ -160,7 +159,7 @@
                 #{vo.userid}) || '%'
             </if>
         </where>
-        order by wr.ordertime desc,wr.Wrtradeorderstatus asc
+        order by wr.ordertime desc,wr.wrtradeorderstatus asc
     </select>
 
     <select id="getWRTradeGoodsConfigById" parameterType="java.lang.Long"
@@ -174,7 +173,7 @@
                g.goodsname
         from WRTrade_GoodsConfig gf
                  left join Goods g on gf.goodsid = g.goodsid
-        where gf.wrtradeorderid = #{wrTradeOrderId}
+        where gf.wrtradeorderid = #{wrtradeorderid}
     </select>
 
     <select id="getWRTradeMatchDetailById" parameterType="java.lang.Long"
@@ -185,7 +184,7 @@
         u.accountname
         from WRTrade_MatchDetail m
         left join useraccount u on m.matchuserid =u.userid
-        where m.wrtradeorderid=#{wrTradeOrderId}
+        where m.wrtradeorderid=#{wrtradeorderid}
     </select>
 
     <select id="queryPerformanceStep" parameterType="java.lang.Long"
@@ -223,13 +222,13 @@
         tr.accountid,
         tr.wrtradedetailid ,
         lo.loginids || '/' ||  ua.accountname as userid,
-        mk.marketName,
+        mk.marketname,
         tr.wrtradetype ,
         wr.buyorsell ,
         ws.wrstandardcode || '/' ||  ws.wrstandardname as wrstandard,
         ft.optioncompare as wrfactortypename,
-        wr.orderqty || '(' ||  ei.enumdicname || ')' || as orderqtyname,
-        wr.realtradeqty || '(' ||  ei.enumdicname || ')' || as realtradeqtyname,
+        wr.orderqty || '(' ||  ei.enumdicname || ')'  as orderqtyname,
+        wr.realtradeqty || '(' ||  ei.enumdicname || ')'  as realtradeqtyname,
         tr.tradeprice ,
         case mk.trademode
         when 64 then
@@ -275,7 +274,7 @@
         left join VIEW_USER_LOGINIDS lo on ua.userid = lo.userid
         <where>
             <if test="vo.marketid != null">
-                and tr.marketid = #{marketid}
+                and tr.marketid = #{vo.marketid}
             </if>
             <if test="vo.wrtradetype != null">
                 and tr.wrtradetype = #{vo.wrtradetype}

mtp3-century/src/main/resources/message_en.properties

@@ -6,6 +6,8 @@ message_code_system006=Successfully obtained verification code
 message_code_system007=Login succeeded
 message_code_system008=Successful withdrawal of funds
 message_code_system009=Deposit successful
+message_code_system010=User authentication passed
+
 
 message_error_code_system001=Token invalid, please log in again!
 message_error_code_system002=operation failed
@@ -14,6 +16,13 @@ message_error_code_system004=File upload failed, please contact the management p
 message_error_code_system005=Your application has been submitted, please check the results later。
 message_error_code_system006=Request timed out, please try again later
 message_error_code_system007=System maintenance in progress, please try again later
+message_error_code_system008=System exception, please contact the administrator
+message_error_code_system009=Authentication service is abnormal
+message_error_code_system010=The user account does not exist
+message_error_code_system011=Account or password error
+message_error_code_system012=The user account has been locked
+message_error_code_system013=The user password has expired
+message_error_code_system014=User account disabled
 
 login_error_code_001=Account or password error
 login_error_code_002=Unauthorized access is not allowed! Please contact the administrator to handle it!
@@ -66,6 +75,7 @@ query_error_code_003=Please select the end date for historical queries
 query_error_code_004=Do not have this permission
 query_error_code_005=No data available for export
 query_error_code_006=Export failed, please contact the administrator!
+query_error_code_007=Please enter the fund account
 
 settlement_message_001=Confirm payment completion: {0} Successful entry, {1} Article failed
 settlement_message_002=Data has changed, please refresh and try again

mtp3-century/src/main/resources/message_th.properties

@@ -6,6 +6,7 @@ message_code_system006=รับ CAPTCHA สำเร็จ
 message_code_system007=เข้าสู่ระบบสำเร็จ
 message_code_system008=ความสำเร็จในการออกคิม
 message_code_system009=ความสำเร็จในการลงทุน
+message_code_system010=การรับรองผู้ใช้ ผ่าน
 
 message_error_code_system001=โทเค็นล้มเหลวโปรดเข้าสู่ระบบอีกครั้ง!
 message_error_code_system002=การดำเนินการล้มเหลว!
@@ -14,6 +15,13 @@ message_error_code_system004=การอัพโหลดไฟล์ล้ม
 message_error_code_system005=ส่งใบสมัครของคุณแล้ว โปรดตรวจสอบผลลัพธ์ในภายหลัง。
 message_error_code_system006=ขอหมดเวลาโปรดลองอีกครั้งในภายหลัง
 message_error_code_system007=ในระหว่างการบำรุงรักษาระบบ โปรดลองอีกครั้งในภายหลัง
+message_error_code_system008=ระบบผิดปกติ ติดต่อผู้ดูแลระบบ
+message_error_code_system009=บริการรับรองไม่ถูกต้อง
+message_error_code_system010=ไม่มีบัญชีผู้ใช้
+message_error_code_system011=บัญชีหรือรหัสผ่านไม่ถูกต้อง
+message_error_code_system012=บัญชีผู้ใช้ถูกล็อค
+message_error_code_system013=รหัสผ่านผู้ใช้ล้มเหลว
+message_error_code_system014=บัญชีผู้ใช้ถูกปิดใช้งาน
 
 login_error_code_001=บัญชีหรือรหัสผ่านไม่ถูกต้อง
 login_error_code_002=ไม่สามารถเข้าถึงได้โดยไม่ได้รับอนุญาต! กรุณาติดต่อผู้ดูแลระบบเพื่อจัดการ!
@@ -66,6 +74,7 @@ query_error_code_003=สอบถามประวัติ กรุณาเ
 query_error_code_004=ไม่มีสิทธิ์นี้
 query_error_code_005=ไม่มีข้อมูลที่จะส่งออก
 query_error_code_006=ส่งออกล้มเหลว, ติดต่อผู้ดูแลระบบ!
+query_error_code_007=กรุณากรอกบัญชีเงินทุน
 
 settlement_message_001=ยืนยันการชำระเงินเสร็จสิ้น: {0} ความสำเร็จของบาร์, {1} แถบล้มเหลว
 settlement_message_002=ข้อมูลมีการเปลี่ยนแปลงโปรดรีเฟรชลองอีกครั้ง

mtp3-century/src/main/resources/message_zh-CN.properties

@@ -6,6 +6,7 @@ message_code_system006=获取验证码成功
 message_code_system007=登录成功
 message_code_system008=出金成功
 message_code_system009=入金成功
+message_code_system010=用户认证通过
 
 message_error_code_system001=令牌失效，请重新登录！
 message_error_code_system002=操作失败
@@ -14,6 +15,13 @@ message_error_code_system004=文件上传失败，请联系管理人员处理！
 message_error_code_system005=您的申请已提交，请稍后查询结果。
 message_error_code_system006=请求超时,请稍后重试
 message_error_code_system007=系统维护中，请稍后再试
+message_error_code_system008=系统异常,请联系管理员
+message_error_code_system009=认证服务不正常
+message_error_code_system010=用户账户不存在
+message_error_code_system011=账户或密码错误
+message_error_code_system012=用户账户已被锁
+message_error_code_system013=用户密码已失效
+message_error_code_system014=用户账户已禁用
 
 login_error_code_001=账户或密码错误
 login_error_code_002=未经允许，不可访问！请联系管理员处理！
@@ -66,6 +74,7 @@ query_error_code_003=历史查询请选择结束日期
 query_error_code_004=没有此权限
 query_error_code_005=无数据可导出
 query_error_code_006=导出失败，请联系管理员！
+query_error_code_007=请输入资金账户
 
 settlement_message_001=确认付款完成: {0} 条成功, {1} 条失败
 settlement_message_002=数据有变更，请刷新重试

mtp3-century/src/main/resources/message_zh-HK.properties

@@ -6,6 +6,7 @@ message_code_system006=獲取驗證碼成功
 message_code_system007=登入成功
 message_code_system008=出金成功
 message_code_system009=入金成功
+message_code_system010=用戶認證通過
 
 message_error_code_system001=權杖失效，請重新登入！
 message_error_code_system002=操作失敗
@@ -14,6 +15,13 @@ message_error_code_system004=文件上傳失敗，請聯系管理人員處理！
 message_error_code_system005=您的申請已提交，請稍後查詢結果。
 message_error_code_system006=請求超時，請稍後重試
 message_error_code_system007=系統維護中，請稍後再試
+message_error_code_system008=系統异常，請聯系管理員
+message_error_code_system009=認證服務不正常
+message_error_code_system010=用戶帳戶不存在
+message_error_code_system011=帳戶或密碼錯誤
+message_error_code_system012=用戶帳戶已被鎖
+message_error_code_system013=用戶密碼已失效
+message_error_code_system014=用戶帳戶已禁用
 
 login_error_code_001=帳戶或密碼錯誤
 login_error_code_002=未經允許，不可訪問！ 請聯系管理員處理！
@@ -66,6 +74,7 @@ query_error_code_003=歷史査詢請選擇結束日期
 query_error_code_004=沒有此許可權
 query_error_code_005=無數據可匯出
 query_error_code_006=匯出失敗，請聯系管理員！
+query_error_code_007=請輸入資金帳戶
 
 settlement_message_001=確認付款完成:{0}條成功,{1}條失敗
 settlement_message_002=數據有變更，請重繪重試

mtp3-century/src/main/resources/message_zh-TW.properties

@@ -6,6 +6,7 @@ message_code_system006=獲取驗證碼成功
 message_code_system007=登入成功
 message_code_system008=出金成功
 message_code_system009=入金成功
+message_code_system010=用戶認證通過
 
 message_error_code_system001=權杖失效，請重新登入！
 message_error_code_system002=操作失敗
@@ -14,6 +15,13 @@ message_error_code_system004=文件上傳失敗，請聯系管理人員處理！
 message_error_code_system005=您的申請已提交，請稍後查詢結果。
 message_error_code_system006=請求超時，請稍後重試
 message_error_code_system007=系統維護中，請稍後再試
+message_error_code_system008=系統异常，請聯系管理員
+message_error_code_system009=認證服務不正常
+message_error_code_system010=用戶帳戶不存在
+message_error_code_system011=帳戶或密碼錯誤
+message_error_code_system012=用戶帳戶已被鎖
+message_error_code_system013=用戶密碼已失效
+message_error_code_system014=用戶帳戶已禁用
 
 login_error_code_001=帳戶或密碼錯誤
 login_error_code_002=未經允許，不可訪問！ 請聯系管理員處理！
@@ -66,6 +74,7 @@ query_error_code_003=歷史査詢請選擇結束日期
 query_error_code_004=沒有此許可權
 query_error_code_005=無數據可匯出
 query_error_code_006=匯出失敗，請聯系管理員！
+query_error_code_007=請輸入資金帳戶
 
 settlement_message_001=確認付款完成:{0}條成功,{1}條失敗
 settlement_message_002=數據有變更，請重繪重試

mtp3-common/src/main/java/com/muchinfo/mtp3common/enumtype/Constants.java

@@ -197,33 +197,16 @@ public class Constants {
     }
 
     /**
-     * 登录成功
-     */
-    public static int loginSuccess = 0;
-    public static String loginSuccess_mag = "登录成功";
-
-    /**
-     * 登录出错
-     */
-    public static int loginError = 4000;
-    public static String loginError_msg = "登录出错";
-    /**
      * 账户锁定
      */
     public static int userlock = 4001;
     public static String userlock_msg = "账户已锁定";
     public static String loginlock_msg = "登录锁定";
 
-    public static int noUser = 4004;    //用户不存在
-    public static String noUser_msg = "用户不存在";
     public static int unOk = 4005;    //用户未启用
-    public static String unUsered = "账户未启用";
-    public static String upErr_msg = "密码错误";
     /**
      * 用户名/密码为空
      */
-    public static int loginFail = 4002;    //密码错
-    public static String loginFail_msg = "账户或密码错误";//"登录失败";
     public static String loginStop_msg = "账户已停用,请联系管理员";//"登录失败";
 
     public static String loginPWDFail_msg = "还剩{#1}次错误机会,账号或密码不匹配达到{#2}次,登录账号将锁定{#3}分钟";//"登录失败";
@@ -234,14 +217,6 @@ public class Constants {
      */
     public static int loginChange = 4003;
 
-    public static int vcodeError = 4006;
-    public static String vcodeError_msg = "验证码错误";
-    public static String get_vcodeError_msg = "获取验证码成功";
-    public static String DeliverDeclare_query = "交割申报查询";
-
-    public static BigDecimal b00 = new BigDecimal(100);
-    public static BigDecimal b0000 = new BigDecimal(10000);
-
     /**
      * ip黑名单
      */
@@ -256,7 +231,6 @@ public class Constants {
 
 
     public static int Token_failure_code = 4009;
-    public static String Token_failure_code_msg = "令牌失效，请重新登录！";
 
     /**
      * 系统异常错误枚举
@@ -266,11 +240,4 @@ public class Constants {
      * 系统操作成功枚举
      */
     public static Integer Success_Code_Design = 200;
-
-
-    public static String File_Error_Message = "文件上传失败，请联系管理人员处理！";
-
-    public static String Deal_Success_Message = "操作成功";
-
-    public static String Error_Code_Message = "操作失败";
 }

mtp3-common/src/main/java/com/muchinfo/mtp3common/enumtype/GlobalExceptionEnum.java

@@ -9,22 +9,20 @@ public enum GlobalExceptionEnum {
 
     SUCCESS(200, "操作成功!"),
 
-    PHONE_IS_NULL_ERROR (1001, "电话不能为空"),
+    PHONE_IS_NULL_ERROR(1001, "电话不能为空"),
 
-    PARAM_ERROR (1002, "参数校验异常"),
+    PARAM_ERROR(1002, "参数校验异常"),
 
-    DELETE_ERROR (1101, "删除错误"),
+    DELETE_ERROR(1101, "删除错误"),
 
     UPLOAD_ERROR(1102, "上传文件失败错误"),
     ;
 
 
     // 2. 枚举实例
-    private Integer code; // 错误码
-    private String message; // 错误码对应的错误信息提示语
-
-    // 3. 字段的构造方法
+    private final Integer code;
 
+    private final String message;
 
     GlobalExceptionEnum(Integer code, String message) {
         this.code = code;

mtp3-common/src/main/java/com/muchinfo/mtp3common/enumtype/MessageType.java

@@ -13,83 +13,93 @@ public enum MessageType {
     MESSAGE_CODE_SYSTEM007("message_code_system007", "登录成功"),
     MESSAGE_CODE_SYSTEM008("message_code_system008", "出金成功"),
     MESSAGE_CODE_SYSTEM009("message_code_system009", "入金成功"),
-
-    MESSAGE_ERROR_CODE_SYSTEM001("message_error_code_system001","令牌失效，请重新登录！"),
-    MESSAGE_ERROR_CODE_SYSTEM002("message_error_code_system002","操作失败"),
-    MESSAGE_ERROR_CODE_SYSTEM003("message_error_code_system003","没有该用户的操作权限"),
-    MESSAGE_ERROR_CODE_SYSTEM004("message_error_code_system004","文件上传失败，请联系管理人员处理"),
-    MESSAGE_ERROR_CODE_SYSTEM005("message_error_code_system005","您的申请已提交，请稍后查询结果"),
-    MESSAGE_ERROR_CODE_SYSTEM006("message_error_code_system006","请求超时,请稍后重试"),
-    MESSAGE_ERROR_CODE_SYSTEM007("message_error_code_system007","系统维护中，请稍后再试"),
-
-    LOGIN_ERROR_CODE_001("login_error_code_001","账户或密码错误"),
-    LOGIN_ERROR_CODE_002("login_error_code_002","未经允许，不可访问！请联系管理员处理"),
-    LOGIN_ERROR_CODE_003("login_error_code_003","登录锁定"),
-    LOGIN_ERROR_CODE_004("login_error_code_004","账户已停用,请联系管理员"),
-    LOGIN_ERROR_CODE_005("login_error_code_005","登录账号已存在"),
-    LOGIN_ERROR_CODE_006("login_error_code_006","该用户不存在，请联系管理人员处理"),
-    LOGIN_ERROR_CODE_007("login_error_code_007","不允许停用当前登录账户"),
-    LOGIN_ERROR_CODE_008("login_error_code_008","不能与旧密码相同"),
-    LOGIN_ERROR_CODE_009("login_error_code_009","旧密码错误"),
-    LOGIN_ERROR_CODE_010("login_error_code_010","角色信息有误"),
-
-    ROLE_ERROR_CODE_001("role_error_code_001","角色信息有误"),
-
-    ORGAN_ERROR_CODE_001("organ_error_code_001","已分配角色,无法注销"),
-    ORGAN_ERROR_CODE_002("organ_error_code_002","存在下级机构,无法注销"),
-    ORGAN_ERROR_CODE_003("organ_error_code_003","存在下级投资者,无法注销"),
-    ORGAN_ERROR_CODE_004("organ_error_code_004","有剩余资金,无法注销"),
-    ORGAN_ERROR_CODE_005("organ_error_code_005","有剩余持仓,无法注销"),
-    ORGAN_ERROR_CODE_006("organ_error_code_006","证件号码已存在正常记录,无法恢复"),
-    ORGAN_ERROR_CODE_007("organ_error_code_007","手机号已存在正常记录,无法恢复"),
-    ORGAN_ERROR_CODE_008("organ_error_code_008","上级机构为非正常状态,无法恢复"),
-    ORGAN_ERROR_CODE_009("organ_error_code_009","所属会员没有经纪角色,无法恢复"),
-    ORGAN_ERROR_CODE_010("organ_error_code_010","代码或机构代码重复"),
-    ORGAN_ERROR_CODE_011("organ_error_code_011","证件号码已存在"),
-    ORGAN_ERROR_CODE_012("organ_error_code_012","证件号码已存在黑名单中,不能开户"),
-    ORGAN_ERROR_CODE_013("organ_error_code_013","名称已存在"),
-    ORGAN_ERROR_CODE_014("organ_error_code_014","管理员登录帐号重复"),
-    ORGAN_ERROR_CODE_015("organ_error_code_015","新增失败，请联系管理员"),
-    ORGAN_ERROR_CODE_016("organ_error_code_016","手机号已存在"),
-    ORGAN_ERROR_CODE_017("organ_error_code_017","企业名称已存在"),
-    ORGAN_ERROR_CODE_018("organ_error_code_018","该机构信息已变更,请刷新数据"),
-    ORGAN_ERROR_CODE_019("organ_error_code_019","证件号码或手机号已存在"),
-    ORGAN_ERROR_CODE_020("organ_error_code_020","审核拒绝原因不能超过80个字"),
-    ORGAN_ERROR_CODE_021("organ_error_code_021","该投资者信息已变更,请刷新数据"),
-    ORGAN_ERROR_CODE_022("organ_error_code_022","非待审核状态,无法撤回"),
-    ORGAN_ERROR_CODE_023("organ_error_code_023","所属会员为非正常状态,无法审核通过"),
-    ORGAN_ERROR_CODE_024("organ_error_code_024","所属机构为非正常状态,无法审核通过"),
-    ORGAN_ERROR_CODE_025("organ_error_code_025","所属经纪人为非正常状态,无法审核通过"),
-
-    PROFIT_SHAR_ERROR_CODE_001("profit_shar_error_code_001","请先删除分润配置"),
-    PROFIT_SHAR_ERROR_CODE_002("profit_shar_error_code_002","请先删除分组人员"),
-    PROFIT_SHAR_ERROR_CODE_003("profit_shar_error_code_003","该费用类型已存在分润配置"),
-
-    QUERY_ERROR_CODE_001("query_error_code_001","请选择市场查询"),
-    QUERY_ERROR_CODE_002("query_error_code_002","历史查询请选择开始日期"),
-    QUERY_ERROR_CODE_003("query_error_code_003","历史查询请选择结束日期"),
-    QUERY_ERROR_CODE_004("query_error_code_004","没有此权限"),
-    QUERY_ERROR_CODE_005("query_error_code_005","无数据可导出"),
-    QUERY_ERROR_CODE_006("query_error_code_006","导出失败，请联系管理员！"),
-
-    MARKET_RUN_MESSAGE_001("market_run_message_001","强制下线已发送"),
-
-    SETTLEMENT_MESSAGE_001("settlement_message_001","确认付款完成: {0} 条成功, {1} 条失败"),
-    SETTLEMENT_MESSAGE_002("settlement_message_002","数据有变更，请刷新重试"),
-
-    PWD_ERROR_CODE_001("pwd_error_code_001","请填写旧密码"),
-    PWD_ERROR_CODE_002("pwd_error_code_002","请填写新密码"),
-    PWD_ERROR_CODE_003("pwd_error_code_003","请填写新密码确认"),
-    PWD_ERROR_CODE_004("pwd_error_code_004","两次密码不一致"),
-    PWD_ERROR_CODE_005("pwd_error_code_005","旧密码错误"),
-
-    AMOUNT_ERROR_CODE_001("amount_error_code_001","金额为 0,不做处理!"),
-
-    INVESTOR_ERROR_CODE_001("investor_error_code_001","没有找到资金账户"),
-    INVESTOR_ERROR_CODE_002("investor_error_code_002","非投资者账户,不能销户审核."),
-    INVESTOR_ERROR_CODE_003("investor_error_code_003","资金账户未解约,不能销户."),
-    INVESTOR_ERROR_CODE_004("investor_error_code_004","账户存在资金、持仓等相关信息,不能注销."),
-    INVESTOR_ERROR_CODE_005("investor_error_code_005","资金账户请求没有回应."),
+    MESSAGE_CODE_SYSTEM010("MESSAGE_CODE_SYSTEM010", "用户认证通过"),
+
+
+    MESSAGE_ERROR_CODE_SYSTEM001("message_error_code_system001", "令牌失效，请重新登录！"),
+    MESSAGE_ERROR_CODE_SYSTEM002("message_error_code_system002", "操作失败"),
+    MESSAGE_ERROR_CODE_SYSTEM003("message_error_code_system003", "没有该用户的操作权限"),
+    MESSAGE_ERROR_CODE_SYSTEM004("message_error_code_system004", "文件上传失败，请联系管理人员处理"),
+    MESSAGE_ERROR_CODE_SYSTEM005("message_error_code_system005", "您的申请已提交，请稍后查询结果"),
+    MESSAGE_ERROR_CODE_SYSTEM006("message_error_code_system006", "请求超时,请稍后重试"),
+    MESSAGE_ERROR_CODE_SYSTEM007("message_error_code_system007", "系统维护中，请稍后再试"),
+    MESSAGE_ERROR_CODE_SYSTEM008("message_error_code_system008", "系统异常,请联系管理员"),
+    MESSAGE_ERROR_CODE_SYSTEM009("message_error_code_system009", "认证服务不正常"),
+    MESSAGE_ERROR_CODE_SYSTEM010("message_error_code_system010", "用户账户不存在"),
+    MESSAGE_ERROR_CODE_SYSTEM011("message_error_code_system011", "账户或密码错误"),
+    MESSAGE_ERROR_CODE_SYSTEM012("message_error_code_system012", "用户账户已被锁"),
+    MESSAGE_ERROR_CODE_SYSTEM013("message_error_code_system013", "用户密码已失效"),
+    MESSAGE_ERROR_CODE_SYSTEM014("message_error_code_system014", "用户账户已禁用"),
+
+    LOGIN_ERROR_CODE_001("login_error_code_001", "账户或密码错误"),
+    LOGIN_ERROR_CODE_002("login_error_code_002", "未经允许，不可访问！请联系管理员处理"),
+    LOGIN_ERROR_CODE_003("login_error_code_003", "登录锁定"),
+    LOGIN_ERROR_CODE_004("login_error_code_004", "账户已停用,请联系管理员"),
+    LOGIN_ERROR_CODE_005("login_error_code_005", "登录账号已存在"),
+    LOGIN_ERROR_CODE_006("login_error_code_006", "该用户不存在，请联系管理人员处理"),
+    LOGIN_ERROR_CODE_007("login_error_code_007", "不允许停用当前登录账户"),
+    LOGIN_ERROR_CODE_008("login_error_code_008", "不能与旧密码相同"),
+    LOGIN_ERROR_CODE_009("login_error_code_009", "旧密码错误"),
+    LOGIN_ERROR_CODE_010("login_error_code_010", "角色信息有误"),
+
+    ROLE_ERROR_CODE_001("role_error_code_001", "角色信息有误"),
+
+    ORGAN_ERROR_CODE_001("organ_error_code_001", "已分配角色,无法注销"),
+    ORGAN_ERROR_CODE_002("organ_error_code_002", "存在下级机构,无法注销"),
+    ORGAN_ERROR_CODE_003("organ_error_code_003", "存在下级投资者,无法注销"),
+    ORGAN_ERROR_CODE_004("organ_error_code_004", "有剩余资金,无法注销"),
+    ORGAN_ERROR_CODE_005("organ_error_code_005", "有剩余持仓,无法注销"),
+    ORGAN_ERROR_CODE_006("organ_error_code_006", "证件号码已存在正常记录,无法恢复"),
+    ORGAN_ERROR_CODE_007("organ_error_code_007", "手机号已存在正常记录,无法恢复"),
+    ORGAN_ERROR_CODE_008("organ_error_code_008", "上级机构为非正常状态,无法恢复"),
+    ORGAN_ERROR_CODE_009("organ_error_code_009", "所属会员没有经纪角色,无法恢复"),
+    ORGAN_ERROR_CODE_010("organ_error_code_010", "代码或机构代码重复"),
+    ORGAN_ERROR_CODE_011("organ_error_code_011", "证件号码已存在"),
+    ORGAN_ERROR_CODE_012("organ_error_code_012", "证件号码已存在黑名单中,不能开户"),
+    ORGAN_ERROR_CODE_013("organ_error_code_013", "名称已存在"),
+    ORGAN_ERROR_CODE_014("organ_error_code_014", "管理员登录帐号重复"),
+    ORGAN_ERROR_CODE_015("organ_error_code_015", "新增失败，请联系管理员"),
+    ORGAN_ERROR_CODE_016("organ_error_code_016", "手机号已存在"),
+    ORGAN_ERROR_CODE_017("organ_error_code_017", "企业名称已存在"),
+    ORGAN_ERROR_CODE_018("organ_error_code_018", "该机构信息已变更,请刷新数据"),
+    ORGAN_ERROR_CODE_019("organ_error_code_019", "证件号码或手机号已存在"),
+    ORGAN_ERROR_CODE_020("organ_error_code_020", "审核拒绝原因不能超过80个字"),
+    ORGAN_ERROR_CODE_021("organ_error_code_021", "该投资者信息已变更,请刷新数据"),
+    ORGAN_ERROR_CODE_022("organ_error_code_022", "非待审核状态,无法撤回"),
+    ORGAN_ERROR_CODE_023("organ_error_code_023", "所属会员为非正常状态,无法审核通过"),
+    ORGAN_ERROR_CODE_024("organ_error_code_024", "所属机构为非正常状态,无法审核通过"),
+    ORGAN_ERROR_CODE_025("organ_error_code_025", "所属经纪人为非正常状态,无法审核通过"),
+
+    PROFIT_SHAR_ERROR_CODE_001("profit_shar_error_code_001", "请先删除分润配置"),
+    PROFIT_SHAR_ERROR_CODE_002("profit_shar_error_code_002", "请先删除分组人员"),
+    PROFIT_SHAR_ERROR_CODE_003("profit_shar_error_code_003", "该费用类型已存在分润配置"),
+
+    QUERY_ERROR_CODE_001("query_error_code_001", "请选择市场查询"),
+    QUERY_ERROR_CODE_002("query_error_code_002", "历史查询请选择开始日期"),
+    QUERY_ERROR_CODE_003("query_error_code_003", "历史查询请选择结束日期"),
+    QUERY_ERROR_CODE_004("query_error_code_004", "没有此权限"),
+    QUERY_ERROR_CODE_005("query_error_code_005", "无数据可导出"),
+    QUERY_ERROR_CODE_006("query_error_code_006", "导出失败，请联系管理员！"),
+    QUERY_ERROR_CODE_007("query_error_code_007", "请输入资金账户"),
+
+    MARKET_RUN_MESSAGE_001("market_run_message_001", "强制下线已发送"),
+
+    SETTLEMENT_MESSAGE_001("settlement_message_001", "确认付款完成: {0} 条成功, {1} 条失败"),
+    SETTLEMENT_MESSAGE_002("settlement_message_002", "数据有变更，请刷新重试"),
+
+    PWD_ERROR_CODE_001("pwd_error_code_001", "请填写旧密码"),
+    PWD_ERROR_CODE_002("pwd_error_code_002", "请填写新密码"),
+    PWD_ERROR_CODE_003("pwd_error_code_003", "请填写新密码确认"),
+    PWD_ERROR_CODE_004("pwd_error_code_004", "两次密码不一致"),
+    PWD_ERROR_CODE_005("pwd_error_code_005", "旧密码错误"),
+
+    AMOUNT_ERROR_CODE_001("amount_error_code_001", "金额为 0,不做处理!"),
+
+    INVESTOR_ERROR_CODE_001("investor_error_code_001", "没有找到资金账户"),
+    INVESTOR_ERROR_CODE_002("investor_error_code_002", "非投资者账户,不能销户审核."),
+    INVESTOR_ERROR_CODE_003("investor_error_code_003", "资金账户未解约,不能销户."),
+    INVESTOR_ERROR_CODE_004("investor_error_code_004", "账户存在资金、持仓等相关信息,不能注销."),
+    INVESTOR_ERROR_CODE_005("investor_error_code_005", "资金账户请求没有回应."),
     ;
 
     private String code;

mtp3-common/src/main/java/com/muchinfo/mtp3common/utils/ResponseUtils.java

@@ -10,7 +10,6 @@ import java.io.OutputStream;
 
 /**
  * 响应工具类
- *
  */
 public class ResponseUtils {
     private static final Logger logger = LoggerFactory.getLogger(ResponseUtils.class);
@@ -20,35 +19,35 @@ public class ResponseUtils {
      *
      * @param response 响应对象
      * @param status   状态码
-     * @param msg      响应信息
+     * @param msgType  响应信息
      */
-    public static void writeSucceed(HttpServletResponse response, int status, String msg, boolean flag, String token) {
+    public static void writeSucceed(HttpServletResponse response, int status, String msgType, String languages, String token) {
         try {
             response.setHeader("Access-Control-Allow-Origin", "*");
             response.setHeader("Cache-Control", "no-cache");
             response.setCharacterEncoding("UTF-8");
             response.setContentType("application/json");
             response.setStatus(status);
-            byte[] bytes = JsonUtils.toString(new AjaxResult(flag, status, msg, token)).getBytes();
+            byte[] bytes = JsonUtils.toString(AjaxResult.success(status, msgType, languages, token)).getBytes();
             OutputStream out = response.getOutputStream();
             out.write(bytes);
         } catch (Exception e) {
-            logger.error("响应出错：" + msg, e);
+            logger.error("响应出错：" + msgType, e);
         }
     }
 
-    public static void writeFiled(HttpServletResponse response, int status, String msg, boolean flag) {
+    public static void writeFiled(HttpServletResponse response, int status, String msgType, String languages) {
         try {
             response.setHeader("Access-Control-Allow-Origin", "*");
             response.setHeader("Cache-Control", "no-cache");
             response.setCharacterEncoding("UTF-8");
             response.setContentType("application/json");
             response.setStatus(status);
-            byte[] bytes = JsonUtils.toString(new AjaxResult(flag, status, msg)).getBytes();
+            byte[] bytes = JsonUtils.toString(AjaxResult.error(status, msgType, languages)).getBytes();
             OutputStream out = response.getOutputStream();
             out.write(bytes);
         } catch (Exception e) {
-            logger.error("响应出错：" + msg, e);
+            logger.error("响应出错：" + msgType, e);
         }
     }
 }

mtp3-common/src/main/java/com/muchinfo/mtp3common/vo/AjaxResult.java

@@ -3,7 +3,9 @@ package com.muchinfo.mtp3common.vo;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.muchinfo.mtp3common.enumtype.GlobalExceptionEnum;
 import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.text.MessageFormat;
 import java.util.Locale;
@@ -11,46 +13,22 @@ import java.util.ResourceBundle;
 
 @Data
 @ApiModel(value = "AjaxResult对象", description = "公共响应对象")
+@AllArgsConstructor
+@NoArgsConstructor
 public class AjaxResult<T> {
 
     // 默认成功
-    private boolean success = true;
+    private boolean success;
 
     // 默认成功的状态码为0
-    private Integer code = 200;
+    private Integer code;
 
     // 返回的消息,默认成功
-    private String message = "操作成功!";
+    private String message;
 
     // 保存任何数据类型的数据
     private T data;
 
-
-    public AjaxResult() {
-    }
-
-    public AjaxResult(boolean success, String message) {
-        this.success = success;
-        this.message = message;
-    }
-
-    public AjaxResult(boolean success, Integer code, String message) {
-        this.success = success;
-        this.code = code;
-        this.message = message;
-    }
-
-    public AjaxResult(boolean success, Integer code, String message, T data) {
-        this.success = success;
-        this.code = code;
-        this.message = message;
-        this.data = data;
-    }
-
-    public static AjaxResult success() {
-        return new AjaxResult();
-    }
-
     public static AjaxResult success(Integer code, String message, String languages) {
         message = dealMsg(message, languages);
         AjaxResult ajaxResult = new AjaxResult();
@@ -115,27 +93,6 @@ public class AjaxResult<T> {
         return ajaxResult;
     }
 
-    // 构建链式语法
-    public AjaxResult setSuccess(boolean success) {
-        this.success = success;
-        return this;
-    }
-
-    public AjaxResult setMessage(String message) {
-        this.message = message;
-        return this;
-    }
-
-    public AjaxResult setCode(Integer code) {
-        this.code = code;
-        return this;
-    }
-
-    public AjaxResult setResultObj(T data) {
-        this.data = data;
-        return this;
-    }
-
     public static String dealMsg(String message, String languages) {
         try {
             //处理语种

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IGoodsMapper.java

@@ -19,5 +19,5 @@ import java.util.List;
 @Mapper
 public interface IGoodsMapper extends BaseMapper<Goods> {
 
-    List<GoodsSelectResult> queryGoodsSelect(@Param("goodsStatusIds") String goodsStatusIds,@Param("marketId")  String marketId,@Param("searchCode")  String searchCode);
+    List<GoodsSelectResult> queryGoodsSelect(@Param("split") String[] split,@Param("marketId")  Long marketId,@Param("searchCode")  String searchCode);
 }

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IMarketMapper.java

@@ -2,7 +2,11 @@ package com.muchinfo.mtp3interface.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muchinfo.mtp3pojos.entity.Market;
+import com.muchinfo.mtp3pojos.vo.profitshar.Marketvo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +19,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IMarketMapper extends BaseMapper<Market> {
 
+    List<Marketvo> getMarketsNameByUseridAndrole(@Param("uid") Long uid, @Param("roletype") int roletype);
 }

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ISubareagroupMapper.java

@@ -27,6 +27,5 @@ public interface ISubareagroupMapper extends BaseMapper<Subareagroup> {
 
     IPage<ProfitSharMemberResult> getMemberPage(IPage<ProfitSharMemberResult> page,@Param("subareagroupid") Long subareagroupid);
 
-
     List<ProfitSharInitConfigResult> getDivideConfigPage(@Param("areauserid")Long areauserid);
 }

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ITaaccountMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.muchinfo.mtp3pojos.entity.Taaccount;
 import com.muchinfo.mtp3pojos.vo.common.TAAccountChildrenResult;
+import com.muchinfo.mtp3pojos.vo.marketrun.TaaccountMonitorVo;
 import com.muchinfo.mtp3pojos.vo.reportform.RefUserResult;
 import com.muchinfo.mtp3pojos.vo.reportform.TAAccountChildrenSelect;
 import com.muchinfo.mtp3pojos.vo.taaccount.*;
@@ -37,4 +38,6 @@ public interface ITaaccountMapper extends BaseMapper<Taaccount> {
     List<RefUserResult> queryRefUserSelect(@Param("searchcode")String searchcode,@Param("refereeuserid") Long refereeuserid);
 
     List<TAAccountChildrenSelect> queryChildren(@Param("searchcode") String searchcode, @Param("relateduserid") Long relateduserid);
+
+    TaaccountMonitorVo getMonitorInvestor(@Param("accountid")Long accountid, @Param("puserid")Long puserid);
 }

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/ITradeOrderdetailMapper.java

@@ -3,6 +3,7 @@ package com.muchinfo.mtp3interface.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.muchinfo.mtp3pojos.entity.TradeOrderdetail;
+import com.muchinfo.mtp3pojos.vo.marketrun.MarketRunCutPositionResult;
 import com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQueryParam;
 import com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.commission.*;
@@ -90,4 +91,6 @@ public interface ITradeOrderdetailMapper extends BaseMapper<TradeOrderdetail> {
     List<GoodsTradeQueryResult> queryByAGoods(@Param("vo") GoodsTradeQueryParam param);
 
     List<GoodsTradeQueryResult> queryByAGoodsDate(@Param("vo") GoodsTradeQueryParam param);
+
+    IPage<MarketRunCutPositionResult> queryCutListFromOrderDetail(IPage<MarketRunCutPositionResult> page);
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Market.java

@@ -241,10 +241,9 @@ public class Market extends Model<Market> {
     @TableField("ISDELIVERYBUYERPAYONLINE")
     private Integer isdeliverybuyerpayonline;
 
-/*    @ApiModelProperty(value = "风控方式(52模式) 1：按单风控 2：按账户风控")
+    @ApiModelProperty(value = "风控方式(52模式) 1：按单风控 2：按账户风控")
     @TableField("RISKCONTROLMODE")
-    private Integer riskcontrolmode;*/
-
+    private Integer riskcontrolmode;
 
     @Override
     public Serializable pkVal() {

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/common/GoodsSelectResult.java

@@ -15,7 +15,7 @@ import lombok.NoArgsConstructor;
 public class GoodsSelectResult {
 
     @ApiModelProperty(value = "id")
-    private String goodsId;
+    private Long goodsId;
 
     @ApiModelProperty(value = "商品代码")
     private String goodsCode;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/InvestorLoginQueryParam.java

@@ -24,7 +24,7 @@ public class InvestorLoginQueryParam {
 
     private Integer loginusertype;
 
-    private Integer pageNo;
+    private Integer pageNum;
 
     private Integer pageSize;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/InvestorModifyParam.java

@@ -22,7 +22,7 @@ public class InvestorModifyParam {
 
     private Long memberuserid;
 
-    private Integer pageNo;
+    private Integer pageNum;
 
     private Integer pageSize;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/marketrun/MarketRunCutPositionResult.java

@@ -0,0 +1,37 @@
+package com.muchinfo.mtp3pojos.vo.marketrun;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "MarketRunCutPositionResult对象", description = "斩仓监控")
+public class MarketRunCutPositionResult {
+
+    @ApiModelProperty(value = "斩仓资金账户")
+    private Long accountid;
+
+    @ApiModelProperty(value = "商品")
+    private String goodsname;
+
+    @ApiModelProperty(value = "交易方向")
+    private Integer buyorsell;
+
+    @ApiModelProperty(value = "斩仓时间")
+    private Date cuttime;
+
+    @ApiModelProperty(value = "已斩数量")
+    private Integer cuttradeqty;
+
+    @ApiModelProperty(value = "关联单号")
+    private String cutorderid;
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/marketrun/MarketRunInitInvestor.java

@@ -0,0 +1,25 @@
+package com.muchinfo.mtp3pojos.vo.marketrun;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "MarketRunInitInvestor对象", description = "账户风险初始化参数信息")
+public class MarketRunInitInvestor {
+
+    @ApiModelProperty(value = "是否按风险率风控")
+    private String isshowrate;
+
+    @ApiModelProperty(value = "是否按安全度风控")
+    private String isshowsafe;
+
+    @ApiModelProperty(value = "是否显示授信金额")
+    private String isshowshouxin;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/marketrun/MarketRunInvestorParam.java

@@ -0,0 +1,37 @@
+package com.muchinfo.mtp3pojos.vo.marketrun;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "MarketRunInvestorParam对象", description = "账户风险监控列表查询")
+public class MarketRunInvestorParam {
+
+    @ApiModelProperty(value = "类型")
+    private Integer orderbytype;
+
+    @ApiModelProperty(value = "监控当前风险率")
+    private Double risk;
+
+    @ApiModelProperty(value = "查询类型")
+    private Integer searchtype;
+
+    @ApiModelProperty(value = "所属机构")
+    private Long puserid;
+
+    @ApiModelProperty(value = "管理员所属机构角色类型")
+    private String orgztypes;
+
+    private Integer pageNo;
+
+    private Integer pageSize;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/marketrun/MarketRunInvestorResult.java

@@ -0,0 +1,67 @@
+package com.muchinfo.mtp3pojos.vo.marketrun;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "MarketRunInvestorResult对象", description = "账户风险监控列表")
+public class MarketRunInvestorResult {
+
+    @ApiModelProperty(value = "账户")
+    private Long accountid;
+
+    @ApiModelProperty(value = "账户名称 ")
+    private String accountname;
+
+    @ApiModelProperty(value = "所属会员")
+    private String memberusername;
+
+    @ApiModelProperty(value = "所属机构")
+    private String parentusername;
+
+    @ApiModelProperty(value = "当前冻结资金")
+    private BigDecimal freezemargin;
+
+    @ApiModelProperty(value = "当前占用保证金")
+    private BigDecimal usedmargin;
+
+    @ApiModelProperty(value = "当前净值")
+    private BigDecimal netbalance;
+
+    @ApiModelProperty(value = "当前风险净值")
+    private BigDecimal balance;
+
+    @ApiModelProperty(value = "可用资金")
+    private BigDecimal availmargin;
+
+    @ApiModelProperty(value = "总冻结")
+    private BigDecimal totalfrozen;
+
+    @ApiModelProperty(value = "浮动盈亏")
+    private BigDecimal totalfloatpl;
+
+    @ApiModelProperty(value = "授信资金")
+    private BigDecimal credit;
+
+    @ApiModelProperty(value = "当前风险率(%)")
+    private BigDecimal curriskrate;
+
+    @ApiModelProperty(value = "当前风险等级")
+    private Integer currisklv;
+
+    @ApiModelProperty(value = "当前安全度(%)")
+    private BigDecimal currisksaferate;
+
+    @ApiModelProperty(value = "当前安全等级")
+    private Integer currisksafelv;
+}
+

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/marketrun/TaaccountMonitorVo.java

@@ -0,0 +1,23 @@
+package com.muchinfo.mtp3pojos.vo.marketrun;
+
+import com.muchinfo.mtp3pojos.entity.Taaccount;
+import io.swagger.annotations.ApiModel;
+import lombok.*;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "MarketRunInvestorResult对象", description = "账户风险监控列表")
+public class TaaccountMonitorVo extends Taaccount {
+    private String memberusername;
+    private String borkername;
+    private String parentusername;
+    private Long memberuserid;
+    private Long borker;
+    private Long parentuserid;
+    private Integer usertype;
+    private String subarealevelpath;
+    private String useraccountname;
+    private String loginid;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/profitshar/Marketvo.java

@@ -0,0 +1,29 @@
+package com.muchinfo.mtp3pojos.vo.profitshar;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "Marketvo对象", description = "")
+public class Marketvo {
+
+    private Long marketid;
+
+    private String marketname;
+
+    private Integer trademode;
+
+    private Integer roletype;
+
+    private Integer spotrighttype;
+
+    private Integer buyspotrighttype;
+
+    private Integer tradeproperty;
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/profitshar/ProfitSharGroupResult.java

@@ -17,13 +17,13 @@ import java.util.Date;
 public class ProfitSharGroupResult {
 
     @ApiModelProperty(value = "id")
-    private String subareagroupid;
+    private Long subareagroupid;
 
     @ApiModelProperty(value = "名称")
     private String subareagroupname;
 
     @ApiModelProperty(value = "分组类型")
-    private String subareagrouptype;
+    private Integer subareagrouptype;
 
     @ApiModelProperty(value = "备注")
     private String remark;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/profitshar/ProfitSharInitResult.java

@@ -19,7 +19,7 @@ import java.util.Map;
 public class ProfitSharInitResult {
 
     @ApiModelProperty(value = "市场")
-    private List<Market> mks;
+    private List<Marketvo> mks;
 
     private Integer dividefeetype1;
 
@@ -27,6 +27,12 @@ public class ProfitSharInitResult {
 
     private Integer dividefeetype9;
 
+    private String dividefeetype1name;
+
+    private String dividefeetype6name;
+
+    private String dividefeetype9name;
+
     private Map<Long, List<ProfitSharInitConfigResult>> ft1;
 
     private List<ProfitSharInitConfigResult> ft2;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/profitshar/ProfitSharMemberResult.java

@@ -16,4 +16,6 @@ public class ProfitSharMemberResult {
 
     @ApiModelProperty(value = "子机构")
     private String accountname;
+
+    private Long userid;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/profitshar/ProfitSharParam.java

@@ -15,7 +15,7 @@ import lombok.NoArgsConstructor;
 public class ProfitSharParam {
 
     @ApiModelProperty(value = "id")
-    private Integer subareagroupid;
+    private Long subareagroupid;
 
     @ApiModelProperty(value = "分组类型")
     private Integer subareagrouptype;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/warehouse/WarehouseCommissionParam.java

@@ -38,14 +38,14 @@ public class WarehouseCommissionParam {
     @ApiModelProperty(value = "开始时间")
     private String hisstartdate;
 
-    @ApiModelProperty(value = "结束世界")
+    @ApiModelProperty(value = "结束时间")
     private String hisenddate;
 
     @ApiModelProperty(value = "* 页码 *")
-    private Integer pagenum;
+    private Integer pageNum;
 
     @ApiModelProperty(value = "* 页大小 *")
-    private Integer pagesize;
+    private Integer pageSize;
 
     private Long userid;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/warehouse/WarehouseCommissionResult.java

@@ -29,7 +29,7 @@ public class WarehouseCommissionResult {
     @ExcelProperty("委托单号")
     @ColumnWidth(20)
     @ApiModelProperty(value = "委托单号")
-    private Long wrtradeorderid;
+    private String wrtradeorderid;
 
     @ExcelProperty("会员或交易商")
     @ColumnWidth(20)
@@ -44,7 +44,7 @@ public class WarehouseCommissionResult {
     @ExcelProperty(value = "委托类型", converter = ListTypeConverter.class)
     @ColumnWidth(20)
     @ApiModelProperty(value = "委托类型")
-    private String wrtradetype;
+    private Integer wrtradetype;
 
     @ExcelProperty(value = "方向", converter = BuyOrSellConverter.class)
     @ColumnWidth(20)

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/warehouse/WarehouseContractParam.java

@@ -39,10 +39,10 @@ public class WarehouseContractParam {
     private String hisenddate;
 
     @ApiModelProperty(value = "* 页码 *")
-    private Integer pagenum;
+    private Integer pageNum;
 
     @ApiModelProperty(value = "* 页大小 *")
-    private Integer pagesize;
+    private Integer pageSize;
 
     private Long userid;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/warehouse/WarehouseSumDetailParam.java

@@ -26,10 +26,10 @@ public class WarehouseSumDetailParam {
     private Integer ishis;
 
     @ApiModelProperty(value = "* 页码 *")
-    private Integer pagenum;
+    private Integer pageNum;
 
     @ApiModelProperty(value = "* 页大小 *")
-    private Integer pagesize;
+    private Integer pageSize;
 
     private Long memberuserid;
 

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/warehouse/WarehouseSumParam.java

@@ -32,10 +32,10 @@ public class WarehouseSumParam {
     private String hisenddate;
 
     @ApiModelProperty(value = "* 页码 *")
-    private Integer pagenum;
+    private Integer pageNum;
 
     @ApiModelProperty(value = "* 页大小 *")
-    private Integer pagesize;
+    private Integer pageSize;
 
     private Long memberuserid;