经纪会员后台权限增加：查询管理-订单管理-订单监控/订单查询/订单日报表； 其它查询-交易商资金查询

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

@@ -641,10 +641,11 @@ public class CommonServiceImpl implements ICommonService {
                                         }
                                     }
 
-                                    // 根据所属机构代码过滤
+                                    // 根据所属会员、所属机构代码过滤
                                     if (!StringUtils.isBlank(param.getParentusername())) {
                                         String memberuserid = param.getParentusername().trim();
-                                        if (!memberuserid.equals(ua.getMemberuserid().toString())) {
+                                        if (!memberuserid.equals(ua.getMemberuserid().toString()) &&
+                                                !memberuserid.equals(ua.getParentuserid().toString())) {
                                             continue;
                                         }
                                     }

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

@@ -425,6 +425,13 @@ public class OrderQueryServiceImpl implements IOrderQueryService {
             param.setRisk(new BigDecimal("50.0"));
         }
 
+        // #7037【管理端】经纪会员后台权限增加：查询管理-订单管理-订单监控
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if (systemmanager.getReletype() != 1) {
+            //经纪会员查询自己下属客户的订单
+            param.setAreauserid(systemmanager.getAreauserid());
+        }
+
         MonitorddjkCountResult result = new MonitorddjkCountResult();
         HolderDetailExRedisVo build = HolderDetailExRedisVo.builder()
                 .risk(param.getRisk())
@@ -432,6 +439,7 @@ public class OrderQueryServiceImpl implements IOrderQueryService {
                 .userfullname(param.getUserfullname())
                 .goodsfullname(param.getGoodsfullname())
                 .parentusername(param.getParentusername())
+                .areauserid(param.getAreauserid())
                 .build();
         //销售总数量
         double sellCount = 0.0;
@@ -468,12 +476,20 @@ public class OrderQueryServiceImpl implements IOrderQueryService {
 
     @Override
     public PageResult<HolderDetailExRedisVo> monitorddjk(MonitorddjkParam param, HttpServletRequest request) {
+        // #7037【管理端】经纪会员后台权限增加：查询管理-订单管理-订单监控
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if (systemmanager.getReletype() != 1) {
+            //经纪会员查询自己下属客户的订单
+            param.setAreauserid(systemmanager.getAreauserid());
+        }
+
         HolderDetailExRedisVo build = HolderDetailExRedisVo.builder()
                 .risk(param.getRisk())
                 .buyorsell(param.getBuyorsell())
                 .userfullname(param.getUserfullname())
                 .goodsfullname(param.getGoodsfullname())
                 .parentusername(param.getParentusername())
+                .areauserid(param.getAreauserid())
                 .build();
         // flag=1:YJ(按定金率，值小风险大  flag=2:交易中心(按风险率，值大风险大)
         List<HolderDetailExRedisVo> resultList = iCommonService.getHolderDetailExFromRedis(build, 2);

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

@@ -83,4 +83,6 @@ public class HolderDetailExRedisVo {
 
     @ApiModelProperty(value = "订单时间")
     private String tradetimestr;
+
+    private Long areauserid;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/order/MonitorddjkParam.java

@@ -36,4 +36,6 @@ public class MonitorddjkParam {
 
     @ApiModelProperty(value = "* 页大小 *")
     private Integer pageSize;
+
+    private Long areauserid;
 }