修改 巡演城市列表 演出详情增加是否开启代理

order下单判断代理用户是否被禁用，禁用则不纪录代理销售数据

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.dto.vo.mongo;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.entity.KylinFields;
 import com.liquidnet.service.kylin.entity.KylinPerformanceRelations;
 import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
@@ -18,7 +19,7 @@ import java.util.List;
 
 @ApiModel
 @Data
-public class KylinPerformanceVo implements Serializable, Cloneable{
+public class KylinPerformanceVo implements Serializable, Cloneable {
 
     private Integer mid;
     @ApiModelProperty(value = "主键")
@@ -106,6 +107,8 @@ public class KylinPerformanceVo implements Serializable, Cloneable{
     @ApiModelProperty(value = "场次")
     private List<KylinTicketTimesVo> ticketTimeList;
 
+    @ApiModelProperty(value = "是否开启分销[0-否|1-是]")
+    private Integer isAgent;
     @ApiModelProperty(value = "分销人名称")
     private String agentName;
     @ApiModelProperty(value = "0正常、1黑名单")
@@ -135,7 +138,7 @@ public class KylinPerformanceVo implements Serializable, Cloneable{
     private Integer fieldAuditStatus;
 
     public Integer getIdCount() {
-        return idCount==null?limitCount:idCount;
+        return idCount == null ? limitCount : idCount;
     }
 
     private static final KylinPerformanceVo obj = new KylinPerformanceVo();
@@ -274,4 +277,16 @@ public class KylinPerformanceVo implements Serializable, Cloneable{
         this.roadShowId = performanceRelations.getRoadShowId();
         this.merchantId = performanceRelations.getMerchantId();
     }
+
+
+    public void setPIsAgent() {
+        for (KylinTicketTimesVo timeVo : this.getTicketTimeList()) {
+            for (KylinTicketVo ticketVo : timeVo.getTicketList()) {
+                if (ticketVo.getIsAgent() == 1) {
+                    this.isAgent = 1;
+                    break;
+                }
+            }
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -175,10 +175,10 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         HashMap<String, Object> newList = CollectionUtil.mapStringObject();
         newList.put("toDayList", toDayList);
         newList.put("threeDaysList", threeDaysList);
-        newList.put("toDaysNftList",toDaysNftList);
-        newList.put("threeDayNftList",threeDayNftList);
-        newList.put("toDayCombinationList",toDayCombinationList);
-        newList.put("threeDayCombinationList",threeDayCombinationList);
+        newList.put("toDaysNftList", toDaysNftList);
+        newList.put("threeDayNftList", threeDayNftList);
+        newList.put("toDayCombinationList", toDayCombinationList);
+        newList.put("threeDayCombinationList", threeDayCombinationList);
         return newList;
     }
 
@@ -204,14 +204,14 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         HashMap<String, Object> newList = CollectionUtil.mapStringObject();
         newList.put("toDayList", toDayList);
         newList.put("threeDaysList", threeDaysList);
-        newList.put("toDaysNftList",toDaysNftList);
-        newList.put("threeDayNftList",threeDayNftList);
-        newList.put("toDayCombinationList",toDayCombinationList);
-        newList.put("threeDayCombinationList",threeDayCombinationList);
+        newList.put("toDaysNftList", toDaysNftList);
+        newList.put("threeDayNftList", threeDayNftList);
+        newList.put("toDayCombinationList", toDayCombinationList);
+        newList.put("threeDayCombinationList", threeDayCombinationList);
         return newList;
     }
 
-    public HashMap<String,Object> setNoticeIds() {
+    public HashMap<String, Object> setNoticeIds() {
         return dataUtils.setNoticeIds();
     }
 
@@ -293,6 +293,9 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
     public List<KylinPerformanceVo> roadList(String roadShowId) {
         List<KylinPerformanceVo> performancesList = dataUtils.getRoadList(roadShowId);
         performancesList = checkAppStatusRoad(performancesList);
+        for (KylinPerformanceVo item : performancesList) {
+            item.setPIsAgent();
+        }
         return performancesList;
     }
 
@@ -493,7 +496,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
 
         PayDetailVo payDetailVo = new PayDetailVo();
-        if (ticketVo!=null && ticketVo.getIsExpress() == 1) {
+        if (ticketVo != null && ticketVo.getIsExpress() == 1) {
             KylinTicketExpressModuleVo expressModuleVo = dataUtils.getTEMVo(ticketsId);
             payDetailVo.setExpressModuleList(expressModuleVo == null ? null : expressModuleVo.getProduceCodeList());
         } else {

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java

@@ -61,7 +61,7 @@ public class OrderUtils {
     ) {
         Integer[] integers = orderLimit(userId, idCard, performanceId, ticketId, isTrueName);
         return judgeMemberType(performanceLimitCount, performanceMemberLimitCount, performanceLimitIdCard,
-                ticketLimitCount, ticketMemberLimitCount,ticketLimitIdCard,
+                ticketLimitCount, ticketMemberLimitCount, ticketLimitIdCard,
                 memberType, integers[0], integers[1], integers[2], integers[3], isTrueName);
     }
 
@@ -100,14 +100,14 @@ public class OrderUtils {
                                   int performanceBuyCountUid, int ticketBuyCountUid, int performanceBuyCountIdCard, int ticketBuyCountIdCard, int isTrueName) {
 
         if (memberType == 1 || memberType == 2) {
-            if(isTrueName==1){
+            if (isTrueName == 1) {
                 if (performanceBuyCountIdCard > performanceMemberLimitCount && performanceMemberLimitCount != 0) {
                     return "实名制演出限购" + performanceMemberLimitCount + "张，已超出";//超过演出维度购买量
                 }
                 if (ticketBuyCountIdCard > ticketMemberLimitCount && ticketMemberLimitCount != 0) {
                     return "实名制票种限购" + ticketMemberLimitCount + "张，已超出";//超过票维度购买量
                 }
-            }else{
+            } else {
                 if (performanceBuyCountUid > performanceMemberLimitCount && performanceMemberLimitCount != 0) {
                     return "本场演出限购" + performanceMemberLimitCount + "张，已超出";//超过演出维度购买量
                 }
@@ -116,7 +116,7 @@ public class OrderUtils {
                 }
             }
         } else {//非会员区间
-            if(isTrueName==1){
+            if (isTrueName == 1) {
                 if (performanceBuyCountIdCard > performanceLimitIdCard && performanceLimitIdCard != 0) {
                     return "实名制演出限购" + performanceLimitIdCard + "张，已超出";//超过演出维度购买量
                 }
@@ -129,7 +129,7 @@ public class OrderUtils {
                 if (ticketBuyCountUid > ticketLimitCount && ticketLimitCount != 0) {
                     return "该票种限购" + ticketLimitCount + "张，已超出";//超过演出维度购买量
                 }
-            }else{
+            } else {
                 if (performanceBuyCountUid > performanceLimitCount && performanceLimitCount != 0) {
                     return "本场演出限购" + performanceLimitCount + "张，已超出";//超过演出维度购买量
                 }
@@ -411,14 +411,21 @@ public class OrderUtils {
                     agentVo.setIdentity(identity);
                     agentVo.setIsBlack(isBlack);
                     agentVo.setAgentId(agentId);
-                    if (agentId.equals(masterId)) {
+                    if (isBlack == 1) {
                         agentVo.setAgentMasterId("0");
-                        agentVo.setCarry(totalCarry);
+                        agentVo.setCarry(BigDecimal.ZERO);
                         agentVo.setExCarry(BigDecimal.ZERO);
+                        agentVo.setAgentId("0");
                     } else {
-                        agentVo.setAgentMasterId(masterId);
-                        agentVo.setCarry(ordCarry);
-                        agentVo.setExCarry(totalCarry.subtract(ordCarry));
+                        if (agentId.equals(masterId)) {
+                            agentVo.setAgentMasterId("0");
+                            agentVo.setCarry(totalCarry);
+                            agentVo.setExCarry(BigDecimal.ZERO);
+                        } else {
+                            agentVo.setAgentMasterId(masterId);
+                            agentVo.setCarry(ordCarry);
+                            agentVo.setExCarry(totalCarry.subtract(ordCarry));
+                        }
                     }
                     return agentVo;
                 } else {