exit

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserData.java

@@ -50,5 +50,14 @@ public class UserData {
     private Integer priceStatus;
 
 
-
+    private static final UserData obj = new UserData();
+
+    public static UserData getNew() {
+        try {
+            return (UserData) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new UserData();
+    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserDataAgentVo.java

@@ -45,4 +45,15 @@ public class UserDataAgentVo {
      */
     @ApiModelProperty(value = "提成", example = "")
     private BigDecimal commission;
+
+    private static final UserDataAgentVo obj = new UserDataAgentVo();
+
+    public static UserDataAgentVo getNew() {
+        try {
+            return (UserDataAgentVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new UserDataAgentVo();
+    }
 }

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

@@ -14,6 +14,7 @@ import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.smile.dto.*;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
+import com.liquidnet.service.galaxy.utils.ObjectUtil;
 import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.kylin.dao.TicketAndStatusDao;
 import com.liquidnet.service.kylin.dao.report.KylinPerformancesDto;
@@ -294,20 +295,28 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             showAgentVoList.add(showAgentVo);
         }
 
-        //根据演出id查询出所有代理人的uid
+        //根据演出id查询出所有代理人的销售
         List<ShowBaseVoDto> showBaseVoList = smileAgentMapper.selectMapByPerId(performancesId);
+        //根据代理id进行分组
         Map<String, List<ShowBaseVoDto>> stringListMap = showBaseVoList.stream().collect(Collectors.groupingBy(ShowBaseVoDto::getAgentId));
+        //创建list长度定位分组数量
         List<UserData> userDataList = new ArrayList<>(stringListMap.size());
+        //遍历分组
         for (Map.Entry<String, List<ShowBaseVoDto>> showMap : stringListMap.entrySet()) {
-            UserData userData = new UserData();
-            List<UserDataAgentVo> userDataAgentVos = new ArrayList<>();
+            UserData userData = UserData.getNew();
             List<ShowBaseVoDto> showBaseVoDtoList = showMap.getValue();
+            List<UserDataAgentVo> userDataAgentVos = new ArrayList<>();
+            //当前list不为null，遍历有数据，方便后期判断是否总代取uid
             ShowBaseVoDto baseVoDto = showBaseVoDtoList.get(0);
+            //根据票提id分组 list数量小于等于票提数量
             Map<String, List<ShowBaseVoDto>> tidMapByUid = showBaseVoDtoList.stream().collect(Collectors.groupingBy(ShowBaseVoDto::getTid));
-            BigDecimal zero = new BigDecimal("0");
+            //对票提进行遍历（总代没有售出而普代有售出）
             for (TicketAndStatusDao smileAgent : ticketAndStatusDaoList) {
-                UserDataAgentVo userDataAgentVo = new UserDataAgentVo();
+                //为没个uid的没个票提id 塞数据
+                UserDataAgentVo userDataAgentVo = UserDataAgentVo.getNew();
+                //有且只有一条
                 List<ShowBaseVoDto> showBaseVoDtoS = tidMapByUid.get(smileAgent.getTicketsId());
+                //判断用户是否卖出该票提
                 if (showBaseVoDtoS != null && showBaseVoDtoS.size() > 0) {
                     ShowBaseVoDto showBaseVoDto = showBaseVoDtoS.get(0);
                     userDataAgentVo.setTicketsId(showBaseVoDto.getTid());
@@ -317,6 +326,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 //                    userDataAgentVo.setAgent(showBaseVoDto.getUse());
                     userDataAgentVo.setCommission(showBaseVoDto.getTotalPrice().setScale(2, RoundingMode.HALF_UP));
                 } else {
+                    //没有买过
                     userDataAgentVo.setTicketsId(smileAgent.getTicketsId());
                     userDataAgentVo.setTicketName(smileAgent.getTitle());
                     userDataAgentVo.setNumber(new BigDecimal(0));
@@ -332,10 +342,8 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                         userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))).setScale(2, RoundingMode.HALF_UP));
                     }
                 }
-
                 userDataAgentVos.add(userDataAgentVo);
             }
-
             userData.setUid(showBaseVoDtoList.get(0).getAgentId());
             userData.setUsername(showBaseVoDtoList.get(0).getName());
             userData.setCityName(showBaseVoDtoList.get(0).getCity());