排除特邀代理查询提成

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

@@ -417,14 +417,13 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 //                    userDataAgentVo.setAgent(showBaseVoDto.getType() == 1 ? tidMap.get(smileAgent.getTicketsId()).getTotalCarry() : tidMap.get(smileAgent.getTicketsId()).getOrdCarry());
                         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"))).stripTrailingZeros());
+                    //判断是否为特邀代理
+                    if (baseVoDto.getType() != 5) {
+                        Map orgMap = smileAgentMapper.getUserOrgByPerIdAndUidAndAgentMaster(performancesId, baseVoDto.getAgentId(), smileAgent.getTicketsId());
+                        if (orgMap != null) {
+                            userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))).stripTrailingZeros());
+                        }
                     }
-//                    }
                     userDataAgentVos.add(userDataAgentVo);
                 }
                 userData.setUid(showBaseVoDtoList.get(0).getAgentId());
@@ -663,7 +662,16 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             arrayList.add(userData.getUid());
             arrayList.add(userData.getUsername());
             arrayList.add(userData.getCityName());
-            arrayList.add(userData.getType() == 1 ? "总代" : "普代");
+            Integer type = userData.getType();
+            if (type == 1) {
+                arrayList.add("总代");
+            } else if (type == 2) {
+                arrayList.add("普代");
+            } else if (type == 5) {
+                arrayList.add("特邀代理");
+            } else {
+                arrayList.add("未知");
+            }
 
             //便利票数据
             List<UserDataAgentVo> dataAgentVos = userData.getDataAgentVos();