提交 如果为开启代理权限的时候 代理购票

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

@@ -39,6 +39,12 @@ public class UserData implements Serializable, Cloneable {
     @ApiModelProperty(value = "身份   1。总代  2.普代", example = "")
     private Integer type;
 
+    /**
+     * 身份   1。黑名单  0正常
+     */
+    @ApiModelProperty(value = "黑名单状态  1。黑名单  0.正常", example = "")
+    private Integer state;
+
     /**
      * 手机号码
      */

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

@@ -437,6 +437,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 userData.setCityName(showBaseVoDtoList.get(0).getCity());
                 userData.setType(showBaseVoDtoList.get(0).getType());
                 userData.setPhone(showBaseVoList.get(0).getPhone());
+                userData.setState(showBaseVoDtoList.get(0).getState());
                 if (userData.getType() != 2) {
                     userData.setAgentName(showBaseVoDtoList.get(0).getName());
                 } else {

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dto/ShowBaseVoDto.java

@@ -47,6 +47,12 @@ public class ShowBaseVoDto implements Serializable, Cloneable{
      */
     private BigDecimal price;
 
+    /**
+     * 单价
+     */
+    private Integer state;
+
+
     /**
      * 真实付款金额
      */

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

@@ -558,16 +558,23 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         orderTicketRelations.setLiveId("");
         KylinAgentVo agentVo = orderUtils.checkAgent(payOrderParam.getAgentId(), performanceData.getPerformancesId(), ticketData);
         orderTicketRelations.setAgentId(payOrderParam.getAgentId());
-        if (agentVo == null && ticketData.getIsAgent() == 1) {
+        if (agentVo == null) {
             orderTicketRelations.setAgentDistributions(BigDecimal.ZERO);
             orderTicketRelations.setAgentStatus(0);
             orderTicketRelations.setAgentIdMaster("0");
             orderTicketRelations.setAgentDistributionsMaster(BigDecimal.ZERO);
-        } else {
+        } else if (agentVo != null && ticketData.getIsAgent() == 1) {
+            if (dataUtils.getShowIds().contains(performanceData.getPerformancesId())) {
                 orderTicketRelations.setAgentDistributions(agentVo.getCarry());
                 orderTicketRelations.setAgentStatus(agentVo.getIsBlack() == 1 ? 2 : 1);
                 orderTicketRelations.setAgentIdMaster(agentVo.getAgentMasterId());
                 orderTicketRelations.setAgentDistributionsMaster(agentVo.getExCarry());
+            }else{
+                orderTicketRelations.setAgentDistributions(BigDecimal.ZERO);
+                orderTicketRelations.setAgentStatus(0);
+                orderTicketRelations.setAgentIdMaster("0");
+                orderTicketRelations.setAgentDistributionsMaster(BigDecimal.ZERO);
+            }
         }
 
         orderTicketRelations.setIsMember(isMember ? 1 : 0);

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

@@ -5,6 +5,7 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IPUtil;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
+import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.KylinFreightChargeDao;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
@@ -372,4 +373,20 @@ public class DataUtils {
             return (int) obj;
         }
     }
+
+    /**
+     * 保存演出ids smile 小家伙可分销演出
+     */
+    /**
+     * 获取演出ids
+     */
+    public List<String> getShowIds(){
+        String rdk = SmileRedisConst.SMILE_SHOW;
+        Object obj = redisUtil.get(rdk);
+        if (obj == null) {
+            return CollectionUtil.arrayListString();
+        } else {
+            return (List<String>) obj;
+        }
+    }
 }

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

@@ -10,6 +10,7 @@ import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.candy.param.BackCouponParam;
 import com.liquidnet.service.candy.vo.CandyUseResultVo;
+import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.KylinFreightChargeDao;