exit

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -93,7 +93,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 
     @Override
     public TableDataInfo listShow(SmileShowParam smileShowParam) {
-        PageHelper.startPage(smileShowParam.getPageNum(),smileShowParam.getPageSize());
+        PageHelper.startPage(smileShowParam.getPageNum(), smileShowParam.getPageSize());
         TableDataInfo rspData = new TableDataInfo();
         //查询所有代理的演出id
         List<KylinPerformancesDto> kylinPerformancesList = kylinPerformancesMapper.selectPerIdByAgent();
@@ -273,7 +273,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         }
         //演出名称
         LambdaQueryWrapper<KylinPerformances> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(KylinPerformances::getPerformancesId,performancesId);
+        queryWrapper.eq(KylinPerformances::getPerformancesId, performancesId);
         KylinPerformances kylinPerformances = kylinPerformancesMapper.selectOne(queryWrapper);
         //KylinPerformanceVo kylinPerformanceVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
         if (kylinPerformances == null) {
@@ -302,30 +302,32 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             UserData userData = new UserData();
             List<UserDataAgentVo> userDataAgentVos = new ArrayList<>();
             List<ShowBaseVoDto> showBaseVoDtoList = showMap.getValue();
+            ShowBaseVoDto baseVoDto = showBaseVoDtoList.get(0);
             Map<String, List<ShowBaseVoDto>> tidMapByUid = showBaseVoDtoList.stream().collect(Collectors.groupingBy(ShowBaseVoDto::getTid));
-
-            for (TicketAndStatusDao smileAgent : ticketAndStatusDaoList){
+            BigDecimal zero = new BigDecimal("0");
+            for (TicketAndStatusDao smileAgent : ticketAndStatusDaoList) {
                 UserDataAgentVo userDataAgentVo = new UserDataAgentVo();
-                ShowBaseVoDto showBaseVoDto = tidMapByUid.get(smileAgent.getTicketsId()).get(0);
-                if (!StringUtils.isEmpty(stringListMap)){
+                List<ShowBaseVoDto> showBaseVoDtoS = tidMapByUid.get(smileAgent.getTicketsId());
+                if (showBaseVoDtoS != null && showBaseVoDtoS.size() > 0) {
+                    ShowBaseVoDto showBaseVoDto = showBaseVoDtoS.get(0);
                     userDataAgentVo.setTicketsId(showBaseVoDto.getTid());
                     userDataAgentVo.setTicketName(smileAgent.getTitle());
                     userDataAgentVo.setNumber(showBaseVoDto.getNumber());
                     userDataAgentVo.setPrice(showBaseVoDto.getPrice());
-                    userDataAgentVo.setAgent(showBaseVoDto.getUse());
+//                    userDataAgentVo.setAgent(showBaseVoDto.getUse());
                     userDataAgentVo.setCommission(showBaseVoDto.getTotalPrice().setScale(2, RoundingMode.HALF_UP));
-                }else {
+                } else {
                     userDataAgentVo.setTicketsId(smileAgent.getTicketsId());
                     userDataAgentVo.setTicketName(smileAgent.getTitle());
                     userDataAgentVo.setNumber(new BigDecimal(0));
                     userDataAgentVo.setPrice(new BigDecimal(0));
-                    userDataAgentVo.setAgent(showBaseVoDto.getType() == 1 ? tidMap.get(smileAgent.getTicketsId()).getTotalCarry() : tidMap.get(smileAgent.getTicketsId()).getOrdCarry());
+//                    userDataAgentVo.setAgent(showBaseVoDto.getType() == 1 ? tidMap.get(smileAgent.getTicketsId()).getTotalCarry() : tidMap.get(smileAgent.getTicketsId()).getOrdCarry());
                     userDataAgentVo.setCommission(new BigDecimal("0.00"));
                 }
                 //判断是否为总代
-                if (showBaseVoDto.getType() == 1) {
+                if (baseVoDto.getType() == 1) {
                     //是总代  //在原有的数据上新增加该用户下所有普代的提成
-                    Map orgMap = smileAgentMapper.getUserOrgByPerIdAndUidAndAgentMaster(performancesId, showBaseVoDto.getAgentId(), smileAgent.getTicketsId());
+                    Map orgMap = smileAgentMapper.getUserOrgByPerIdAndUidAndAgentMaster(performancesId, baseVoDto.getAgentId(), smileAgent.getTicketsId());
                     if (orgMap != null) {
                         userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))).setScale(2, RoundingMode.HALF_UP));
                     }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml

@@ -133,7 +133,7 @@
                     kotr.agent_distributions
                 FROM
                     smile_user AS su
-                        INNER JOIN kylin_order_ticket_relations AS kotr ON kotr.agent_id = su.uid
+                        INNER JOIN kylin_order_ticket_relations AS kotr ON kotr.agent_id = su.uid OR kotr.agent_id_master = su.uid
                 WHERE
                     kotr.performance_id = #{performancesId}
             ) AS sukotr ON sukotr.order_id = kot.order_tickets_id