exit

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

@@ -190,7 +190,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 for (SmileUser smileUser : smileUsers) {
                     //获取缓存单个用户代理记录
                     UserData userDataByUid = smileRedisUtils.getUserDataByUid(smilePriceParam.getPerformancesId(), smileUser.getUid());
-                    if (userDataByUid!=null){
+                    if (userDataByUid != null) {
                         SmilePrice smilePriceByUidAndPerId = SmilePrice.getNew();
                         BigDecimal price = new BigDecimal("0");
                         List<UserDataAgentVo> dataAgentVos = userDataByUid.getDataAgentVos();
@@ -378,7 +378,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         //判断该演出是否有打款
         Integer showPriceId = smileRedisUtils.getShowPriceId(performancesId);
 
-        if (showPriceId==null){
+        if (showPriceId == null) {
             //根据演出id查询出所有代理人的销售
             List<ShowBaseVoDto> showBaseVoList = smileAgentMapper.selectMapByPerId(performancesId);
             //根据代理id进行分组
@@ -445,7 +445,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             smileUsers.forEach(smileUser -> {
                 if (!ids.contains(smileUser.getUid())) {
                     UserData userData = UserData.getNew();
-
+                    BigDecimal price = BigDecimal.ZERO;
                     List<UserDataAgentVo> userDataAgentVos = new ArrayList<>();
                     for (TicketAndStatusDao smileAgent : ticketAndStatusDaoList) {
                         UserDataAgentVo userDataAgentVo = UserDataAgentVo.getNew();
@@ -455,12 +455,14 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                         userDataAgentVo.setPrice(new BigDecimal(0));
                         userDataAgentVo.setPriceReal(new BigDecimal("0.00"));
                         userDataAgentVo.setCommission(new BigDecimal("0.00"));
-                        userDataAgentVos.add(userDataAgentVo);
                         //是总代  //在原有的数据上新增加该用户下所有普代的提成
                         Map orgMap = smileAgentMapper.getUserOrgByPerIdAndUidAndAgentMaster(performancesId, smileUser.getUid(), smileAgent.getTicketsId());
                         if (orgMap != null) {
                             userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))).setScale(2, RoundingMode.HALF_UP));
                         }
+                        price = price.add(userDataAgentVo.getCommission());
+                        userDataAgentVos.add(userDataAgentVo);
+                    }
                     userData.setUid(smileUser.getUid());
                     userData.setUsername(smileUser.getName());
                     userData.setCityName(smileUser.getCity());
@@ -468,14 +470,12 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     userData.setDataAgentVos(userDataAgentVos);
                     //设置打款状态
                     userData.setPriceStatus(smileRedisUtils.getShowPriceUid(performancesId, smileUser.getUid()));
-                        ids.add(userData.getUid());
                     //缓存用户redis记录 计算
                     smileRedisUtils.setUserDataByUid(userData, performancesId);
-                        if (!userDataAgentVo.getCommission().equals(new BigDecimal("0.00"))){
+                    if (price.compareTo(BigDecimal.ZERO) > 0) {
                         userDataList.add(userData);
                     }
                 }
-                }
             });
         }
         saleDataVo.setUserDataList(userDataList);