1. 优化快递模板

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

@@ -478,26 +478,41 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
 
     private boolean judgeTEM(String ticketId, int expressType, List<String> expressModuleIdList) {
         if (expressType != 0) {//无类型
-            if (expressModuleIdList.size() == 0) {
-                return false;
-            }
-            KylinTicketExpressModuleVo expressModuleVo = KylinTicketExpressModuleVo.getNew();
-            expressModuleVo.setTicketId(ticketId);
-            List<ExpressModuleVo> voList = new ArrayList();
+
+            List<ExpressModuleVo> voList = new ArrayList<>();
             List<KylinExpressModuleVo> kylinExpressModuleVoList = redisSlimeUtils.expressList();
-            for (String produceCode : expressModuleIdList) {
+
+            // 包邮
+            if (expressType == 3) {
                 for (KylinExpressModuleVo item2 : kylinExpressModuleVoList) {
-                    if (item2.getProductCode().toString().equals(produceCode)) {
-                        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;
+                    ExpressModuleVo vo = ExpressModuleVo.getNew();
+                    vo.setProductCode(item2.getProductCode().toString());
+                    vo.setTitle(item2.getTitle());
+                    vo.setEstimatePriceMin(item2.getEstimatePriceMin());
+                    vo.setEstimatePriceMax(item2.getEstimatePriceMax());
+                    voList.add(vo);
+                }
+            }else {
+                if(expressModuleIdList.isEmpty()) {
+                    log.error("[judgeTEM] expressType: {}, expressModuleIdList: {}", expressType, expressModuleIdList);
+                    return false;
+                }
+                for (String produceCode : expressModuleIdList) {
+                    for (KylinExpressModuleVo item2 : kylinExpressModuleVoList) {
+                        if (item2.getProductCode().toString().equals(produceCode)) {
+                            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;
+                        }
                     }
                 }
             }
+            KylinTicketExpressModuleVo expressModuleVo = KylinTicketExpressModuleVo.getNew();
+            expressModuleVo.setTicketId(ticketId);
             expressModuleVo.setProduceCodeList(voList);
             redisSlimeUtils.setTEMMerchantVo(ticketId, expressModuleVo);
         }