修改 快递类型返回和储存类型

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/TicketCreateParam.java

@@ -35,7 +35,7 @@ public class TicketCreateParam implements Serializable {
     @ApiModelProperty(value = "快递类型[0无类型|1寄付|2到付|3包邮]", example = "2")
     private Integer expressType;
 
-    @ApiModelProperty(value = "快递模板")
+    @ApiModelProperty(value = "快递模板[productCode数组]")
     private List<String> expressModule;
 
     @ApiModelProperty(value = "是否学生票 0否 1是", example = "0")

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

+package com.liquidnet.service.kylin.dto.vo.partner;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ExpressModuleVo implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "名称")
+    private String title;
+
+    @ApiModelProperty(value = "产品编码")
+    private String productCode;
+
+    private static final ExpressModuleVo obj = new ExpressModuleVo();
+
+    public static ExpressModuleVo getNew() {
+        try {
+            return (ExpressModuleVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new ExpressModuleVo();
+        }
+    }
+}

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

@@ -13,7 +13,7 @@ public class KylinTicketExpressModuleVo implements Serializable, Cloneable {
     private String ticketId;
 
     @ApiModelProperty(value = "快递模板codeList")
-    private List<String> produceCodeList;
+    private List<ExpressModuleVo> produceCodeList;
 
     private static final KylinTicketExpressModuleVo obj = new KylinTicketExpressModuleVo();
 

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 
 /**
@@ -102,6 +103,9 @@ public class KylinTicketPartnerVo implements Serializable,Cloneable {
     @ApiModelProperty(value = "是否专属", example = "100")
     private Integer isExclusive;
 
+    @ApiModelProperty(value = "快递列表")
+    private List<ExpressModuleVo> ExpressModuleList;
+
     @ApiModelProperty(value = "")
     private String createdAt;
 

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

@@ -8,9 +8,11 @@ import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
+import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 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;
@@ -24,6 +26,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -288,9 +291,17 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
             if (performancePartnerVo.getAuditStatus() == 0 || performancePartnerVo.getAuditStatus() == 1) {
                 return ResponseDto.failure(ErrorMapping.get(20107));
             }
+            String ticketsIdNew = IDGenerator.nextSnowId();
             KylinTicketPartnerVo kylinTicketPartnerVo = mongoMerchantUtils.getTicketPartnerVo(ticketsId);
+            //快递类型判断
+            if (kylinTicketPartnerVo.getIsExpress() == 1) {
+                KylinTicketExpressModuleVo vo = redisMerchantUtils.getTEMVo(kylinTicketPartnerVo.getTicketsId());
+                vo.setTicketId(ticketsIdNew);
+                redisMerchantUtils.setTEMVo(ticketsIdNew, vo);
+            }
+
             kylinTicketPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            kylinTicketPartnerVo.setTicketsId(IDGenerator.nextSnowId());
+            kylinTicketPartnerVo.setTicketsId(ticketsIdNew);
 
             KylinTicketPartnerVo data = mongoMerchantUtils.insertTicketPartnerVo(kylinTicketPartnerVo);
             log.info(UserPathDto.setPartnerData("0", "deleteTicket", "performanceId=" + performanceId + ",ticketsId=" + ticketsId, kylinTicketPartnerVo));
@@ -325,6 +336,8 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
 
     @Override
     public KylinTicketPartnerVo getTicketsMongo(String ticketsId) {
+        KylinTicketPartnerVo vo = mongoMerchantUtils.getTicketsMongo(ticketsId);
+        vo.setExpressModuleList(redisMerchantUtils.getTEMVo(ticketsId).getProduceCodeList());
         return mongoMerchantUtils.getTicketsMongo(ticketsId);
     }
 
@@ -436,8 +449,20 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
             }
             KylinTicketExpressModuleVo expressModuleVo = KylinTicketExpressModuleVo.getNew();
             expressModuleVo.setTicketId(ticketId);
-            expressModuleVo.setProduceCodeList(expressModuleIdList);
-            redisMerchantUtils.setTEMPVo(ticketId, expressModuleVo);
+            List<ExpressModuleVo> voList = new ArrayList();
+            List<KylinExpressModuleVo> kylinExpressModuleVoList = redisMerchantUtils.expressList();
+            for (String produceCode : expressModuleIdList) {
+                for (KylinExpressModuleVo item2 : kylinExpressModuleVoList) {
+                    if (item2.getProductCode().equals(produceCode)) {
+                        ExpressModuleVo vo = ExpressModuleVo.getNew();
+                        vo.setProductCode(item2.getProductCode().toString());
+                        vo.setTitle(item2.getTitle());
+                        voList.add(vo);
+                    }
+                }
+            }
+            expressModuleVo.setProduceCodeList(voList);
+            redisMerchantUtils.setTEMVo(ticketId, expressModuleVo);
         }
         return true;
     }

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

@@ -394,9 +394,9 @@ public class PerformanceUtils {
                     KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMPVo(tickets.getTicketsId());
                     redisMerchantUtils.setTEMVo(tickets.getTicketsId(), moduleVo);
                     del9.add(new Object[]{tickets.getTicketsId(), updatedAt});
-                    for (String mVo : moduleVo.getProduceCodeList())
+                    for (ExpressModuleVo mVo : moduleVo.getProduceCodeList())
                         insert9.add(new Object[]{
-                                tickets.getTicketsId(), mVo, updatedAt, updatedAt
+                                tickets.getTicketsId(), mVo.getProductCode(), updatedAt, updatedAt
                         });
                 }
             }

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml

@@ -18,10 +18,10 @@ liquidnet:
     username: admin
     password: admin
   config:
-#    location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
-#    location: /Users/hujiachen/IdeaProjects/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
-#    location: /Users/Tice/Company/Liquidnet/Liquidnet_Bus/liquidnet-bus-config/liquidnet-config
-    location: /app/support-config
+    #    location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
+    #    location: /Users/Tice/Company/Liquidnet/Liquidnet_Bus/liquidnet-bus-config/liquidnet-config
+    location: /Users/hujiachen/IdeaProjects/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
+#    location: /app/support-config
 # end-dev-这里是配置信息基本值
 
 spring: