exit

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

@@ -598,14 +598,11 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
     private List<List<Object>> contentData(List<UserData> userDataList, List<ShowAgentVo> agentVoList) {
         List<List<Object>> contentList = Lists.newArrayList();
         //这里一个List<Object>才代表一行数据，需要映射成每行数据填充，横向填充（把实体数据的字段设置成一个List<Object>）
-//        contentList.add(Lists.newArrayList("测试", "商品A", "苹果🍎"));
         userDataList.forEach(userData -> {
             //总销售张数
             BigDecimal num = new BigDecimal("0");
             //总销售金额
             BigDecimal price = new BigDecimal("0");
-            //总销售佣金
-            BigDecimal commission = new BigDecimal("0");
 
             ArrayList<Object> arrayList = Lists.newArrayList();
             arrayList.add(userData.getUid());
@@ -631,7 +628,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 if (userDataAgentVo != null) {
                     num = num.add(new BigDecimal(userDataAgentVo.getNumber().toString()));
                     price = price.add(userDataAgentVo.getPriceReal());
-                    commission = commission.add(userDataAgentVo.getCommission());
                     arrayList.add(userDataAgentVo.getNumber());
                 } else {
                     arrayList.add(0);
@@ -647,7 +643,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 
             arrayList.add(num);
             arrayList.add(price);
-            arrayList.add(commission);
+            arrayList.add(userData.getTotalCommission());
             arrayList.add(userData.getPriceStatus() != null && userData.getPriceStatus() == 0 ? "已打款" : "待打款");
 
             contentList.add(arrayList);