merchant 快递价格 逻辑修改

修改 演出状态接口。
修复kylin接口

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/ExpressModuleVo.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -15,6 +16,12 @@ public class ExpressModuleVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "产品编码")
     private String productCode;
 
+    @ApiModelProperty(value = "快递预估价格小")
+    private BigDecimal estimatePriceMin;
+
+    @ApiModelProperty(value = "快递预估价格大")
+    private BigDecimal estimatePriceMax;
+
     private static final ExpressModuleVo obj = new ExpressModuleVo();
 
     public static ExpressModuleVo getNew() {

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

@@ -14,6 +14,7 @@ import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.partner.ExpressModuleVo;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
@@ -412,8 +413,12 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
 
         PayDetailVo payDetailVo = new PayDetailVo();
-        List<ExpressModuleVo> expressModuleList = dataUtils.getTEMVo(ticketsId).getProduceCodeList();
-        payDetailVo.setExpressModuleList(expressModuleList);
+        if(ticketVo.getIsExpress()==1) {
+            KylinTicketExpressModuleVo expressModuleVo = dataUtils.getTEMVo(ticketsId);
+            payDetailVo.setExpressModuleList(expressModuleVo==null?null:expressModuleVo.getProduceCodeList());
+        }else{
+            payDetailVo.setExpressModuleList(null);
+        }
         payDetailVo.setPerformanceInfo(performancesInfo);
         payDetailVo.setTicketInfo(ticketVo);
 

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/KylinPerformancePartnerController.java

@@ -133,7 +133,7 @@ public class KylinPerformancePartnerController {
         }
     }
 
-    @PostMapping(value = "lintStatus")
+    @GetMapping(value = "lintStatus")
     @ApiOperation(value = "演出上下线状态", position = 8)
     @ApiResponse(code = 200, message = "接口返回对象参数")
     @ApiImplicitParams({

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/KylinTicketsPartnerServiceImpl.java

@@ -461,6 +461,8 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
                         ExpressModuleVo vo = ExpressModuleVo.getNew();
                         vo.setProductCode(item2.getProductCode().toString());
                         vo.setTitle(item2.getTitle());
+                        vo.setEstimatePriceMin(item2.getEstimatePriceMin());
+                        vo.setEstimatePriceMax(item2.getEstimatePriceMax());
                         voList.add(vo);
                         break;
                     }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/PerformanceUtils.java

@@ -393,7 +393,7 @@ public class PerformanceUtils {
 
                     //快递相关
                     KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMMerchantVo(tickets.getTicketsId());
-                    if(moduleVo!=null) {
+                    if (moduleVo != null) {
                         redisMerchantUtils.setTEMMerchantVo(tickets.getTicketsId(), moduleVo);
                         del9.add(new Object[]{tickets.getTicketsId(), updatedAt});
                         for (ExpressModuleVo mVo : moduleVo.getProduceCodeList())