exit

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/saleData.html

@@ -64,6 +64,7 @@
                         <!--                        <td th:name="uid" th:text="${item.uid}" hidden="hidden"></td>-->
                         <td th:if="${item.type==1}" th:text="总代"></td>
                         <td th:if="${item.type==2}" th:text="普代"></td>
+                        <td th:if="${item.type==5}" th:text="特邀代理"></td>
                         <td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.number}"></td>
                         <td th:text="${#aggregates.sum(item.dataAgentVos.![number])}"></td>
                         <td th:text="${#aggregates.sum(item.dataAgentVos.![priceReal])}"></td>

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

@@ -337,7 +337,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         LambdaQueryWrapper<KylinPerformances> queryWrapper = new LambdaQueryWrapper<>();
         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) {
             return null;
         }
@@ -407,25 +406,25 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                         userDataAgentVo.setPrice(showBaseVoDto.getPrice());
                         userDataAgentVo.setPriceReal(showBaseVoDto.getPriceReal());
 //                    userDataAgentVo.setAgent(showBaseVoDto.getUse());
-                        userDataAgentVo.setCommission(showBaseVoDto.getTotalPrice().setScale(2, RoundingMode.HALF_UP));
+                        userDataAgentVo.setCommission(showBaseVoDto.getTotalPrice());
                     } else {
                         //没有买过
                         userDataAgentVo.setTicketsId(smileAgent.getTicketsId());
                         userDataAgentVo.setTicketName(smileAgent.getTitle());
-                        userDataAgentVo.setNumber(new BigDecimal(0));
-                        userDataAgentVo.setPrice(new BigDecimal(0));
-                        userDataAgentVo.setPriceReal(new BigDecimal("0.00"));
+                        userDataAgentVo.setNumber(BigDecimal.ZERO);
+                        userDataAgentVo.setPrice(BigDecimal.ZERO);
+                        userDataAgentVo.setPriceReal(BigDecimal.ZERO);
 //                    userDataAgentVo.setAgent(showBaseVoDto.getType() == 1 ? tidMap.get(smileAgent.getTicketsId()).getTotalCarry() : tidMap.get(smileAgent.getTicketsId()).getOrdCarry());
-                        userDataAgentVo.setCommission(new BigDecimal("0.00"));
+                        userDataAgentVo.setCommission(BigDecimal.ZERO);
                     }
                     //判断是否为总代
-                    if (baseVoDto.getType() == 1) {
-                        //是总代  //在原有的数据上新增加该用户下所有普代的提成
-                        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));
-                        }
+//                    if (baseVoDto.getType() == 1) {
+                    //是总代  //在原有的数据上新增加该用户下所有普代的提成
+                    Map orgMap = smileAgentMapper.getUserOrgByPerIdAndUidAndAgentMaster(performancesId, baseVoDto.getAgentId(), smileAgent.getTicketsId());
+                    if (orgMap != null) {
+                        userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))));
                     }
+//                    }
                     userDataAgentVos.add(userDataAgentVo);
                 }
                 userData.setUid(showBaseVoDtoList.get(0).getAgentId());
@@ -451,10 +450,10 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                         UserDataAgentVo userDataAgentVo = UserDataAgentVo.getNew();
                         userDataAgentVo.setTicketsId(smileAgent.getTicketsId());
                         userDataAgentVo.setTicketName(smileAgent.getTitle());
-                        userDataAgentVo.setNumber(new BigDecimal(0));
-                        userDataAgentVo.setPrice(new BigDecimal(0));
-                        userDataAgentVo.setPriceReal(new BigDecimal("0.00"));
-                        userDataAgentVo.setCommission(new BigDecimal("0.00"));
+                        userDataAgentVo.setNumber(BigDecimal.ZERO);
+                        userDataAgentVo.setPrice(BigDecimal.ZERO);
+                        userDataAgentVo.setPriceReal(BigDecimal.ZERO);
+                        userDataAgentVo.setCommission(BigDecimal.ZERO);
                         //是总代  //在原有的数据上新增加该用户下所有普代的提成
                         Map orgMap = smileAgentMapper.getUserOrgByPerIdAndUidAndAgentMaster(performancesId, smileUser.getUid(), smileAgent.getTicketsId());
                         if (orgMap != null) {