merchant 快递修改

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

@@ -464,6 +464,12 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
             TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = TicketTimesTicketCreatePartnerVo.getNew();
             BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
             List<KylinTicketPartnerVo> kylinTicketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
+            for(KylinTicketPartnerVo item : kylinTicketPartnerVos){
+                if(item.getIsExpress()==1) {
+                    List<ExpressModuleVo> expressModuleVos = redisMerchantUtils.getTEMMerchantVo(item.getTicketsId()).getProduceCodeList();
+                    item.setExpressModuleList(expressModuleVos);
+                }
+            }
             ticketTimesTicketCreatePartnerVo.setTicket(kylinTicketPartnerVos);
             ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
         }

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

@@ -455,11 +455,12 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
             List<KylinExpressModuleVo> kylinExpressModuleVoList = redisMerchantUtils.expressList();
             for (String produceCode : expressModuleIdList) {
                 for (KylinExpressModuleVo item2 : kylinExpressModuleVoList) {
-                    if (item2.getProductCode().equals(produceCode)) {
+                    if (item2.getProductCode().toString().equals(produceCode)) {
                         ExpressModuleVo vo = ExpressModuleVo.getNew();
                         vo.setProductCode(item2.getProductCode().toString());
                         vo.setTitle(item2.getTitle());
                         voList.add(vo);
+                        break;
                     }
                 }
             }