merchant 快递票

kylin 快递票相关

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/PayDetailVo.java

@@ -2,11 +2,13 @@ package com.liquidnet.service.kylin.dto.vo.returns;
 
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.partner.ExpressModuleVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -24,4 +26,7 @@ public class PayDetailVo implements Serializable {
 
     @ApiModelProperty(value = "票种数据")
     private KylinTicketVo ticketInfo;
+
+    @ApiModelProperty(value = "快递可选择列表")
+    private List<ExpressModuleVo> ExpressModuleList;
 }

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

@@ -13,6 +13,7 @@ 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.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.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
@@ -411,6 +412,8 @@ 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);
         payDetailVo.setPerformanceInfo(performancesInfo);
         payDetailVo.setTicketInfo(ticketVo);
 

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

@@ -12,6 +12,7 @@ import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundageAll;
 import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressRouteVo;
 import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.*;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
@@ -788,4 +789,20 @@ public class DataUtils {
         String redisKey = KylinRedisConst.ORDER_REFUND_EXPRESS_INFO.concat(orderId);
         return (KylinOrderExpressVo) redisUtil.get(redisKey);
     }
+
+    /**
+     * 获取 票种快递票模板关联vo [线上]
+     *
+     * @param ticketId
+     * @return
+     */
+    public KylinTicketExpressModuleVo getTEMVo(String ticketId) {
+        String redisKey = KylinRedisConst.TICKET_EXPRESS_MODULE.concat(ticketId);
+        Object obj = redisUtil.get(redisKey);
+        if (obj != null) {
+            return (KylinTicketExpressModuleVo) obj;
+        } else {
+            return null;
+        }
+    }
 }

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

@@ -413,12 +413,12 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                                     DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getQrCodeShowTime()), ticketItem.getTicketsId(), now, now
                             });
                             //快递相关
-                            KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMPVo(ticketItem.getTicketsId());
+                            KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMMerchantVo(ticketItem.getTicketsId());
                             redisMerchantUtils.setTEMVo(ticketItem.getTicketsId(), moduleVo);
                             sqlsDataE.add(new Object[]{ticketItem.getTicketsId()});
-                            for (String mVo : moduleVo.getProduceCodeList())
+                            for (ExpressModuleVo mVo : moduleVo.getProduceCodeList())
                                 sqlsDataF.add(new Object[]{
-                                        ticketItem.getTicketsId(), mVo, now, now
+                                        ticketItem.getTicketsId(), mVo.getProductCode(), now, now
                                 });
                         }
                     }

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

@@ -295,9 +295,9 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
             KylinTicketPartnerVo kylinTicketPartnerVo = mongoMerchantUtils.getTicketPartnerVo(ticketsId);
             //快递类型判断
             if (kylinTicketPartnerVo.getIsExpress() == 1) {
-                KylinTicketExpressModuleVo vo = redisMerchantUtils.getTEMVo(kylinTicketPartnerVo.getTicketsId());
+                KylinTicketExpressModuleVo vo = redisMerchantUtils.getTEMMerchantVo(kylinTicketPartnerVo.getTicketsId());
                 vo.setTicketId(ticketsIdNew);
-                redisMerchantUtils.setTEMVo(ticketsIdNew, vo);
+                redisMerchantUtils.setTEMMerchantVo(ticketsIdNew, vo);
             }
 
             kylinTicketPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -337,7 +337,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
     @Override
     public KylinTicketPartnerVo getTicketsMongo(String ticketsId) {
         KylinTicketPartnerVo vo = mongoMerchantUtils.getTicketsMongo(ticketsId);
-        vo.setExpressModuleList(redisMerchantUtils.getTEMVo(ticketsId).getProduceCodeList());
+        vo.setExpressModuleList(redisMerchantUtils.getTEMMerchantVo(ticketsId).getProduceCodeList());
         return mongoMerchantUtils.getTicketsMongo(ticketsId);
     }
 
@@ -462,7 +462,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
                 }
             }
             expressModuleVo.setProduceCodeList(voList);
-            redisMerchantUtils.setTEMVo(ticketId, expressModuleVo);
+            redisMerchantUtils.setTEMMerchantVo(ticketId, expressModuleVo);
         }
         return true;
     }

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

@@ -391,8 +391,8 @@ public class PerformanceUtils {
                     redisMerchantUtils.setSurplusGeneral(tickets.getTicketsId(), ticketStatus.getSurplusGeneral());
 
                     //快递相关
-                    KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMPVo(tickets.getTicketsId());
-                    redisMerchantUtils.setTEMVo(tickets.getTicketsId(), moduleVo);
+                    KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMMerchantVo(tickets.getTicketsId());
+                    redisMerchantUtils.setTEMMerchantVo(tickets.getTicketsId(), moduleVo);
                     del9.add(new Object[]{tickets.getTicketsId(), updatedAt});
                     for (ExpressModuleVo mVo : moduleVo.getProduceCodeList())
                         insert9.add(new Object[]{

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

@@ -104,7 +104,7 @@ public class RedisMerchantUtils {
      *
      * @param ticketId 票id
      */
-    public void setTEMPVo(String ticketId, KylinTicketExpressModuleVo vo) {
+    public void setTEMMerchantVo(String ticketId, KylinTicketExpressModuleVo vo) {
         redisUtil.set(KylinRedisConst.TICKET_EXPRESS_MODULE_P.concat(ticketId), vo);
     }
 
@@ -114,7 +114,7 @@ public class RedisMerchantUtils {
      * @param ticketId
      * @return
      */
-    public KylinTicketExpressModuleVo getTEMPVo(String ticketId) {
+    public KylinTicketExpressModuleVo getTEMMerchantVo(String ticketId) {
         String redisKey = KylinRedisConst.TICKET_EXPRESS_MODULE_P.concat(ticketId);
         Object obj = redisUtil.get(redisKey);
         if (obj != null) {
@@ -264,7 +264,7 @@ public class RedisMerchantUtils {
     }
 
     /**
-     * 可选快递方式列表
+     * 是否为超级权限账户
      *
      * @return
      */