ORDER_REFUND_POUNDAGE_EXPLAIN

ORDER_REFUND_POUNDAGE
绑定演出id

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

@@ -104,7 +104,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                 item.setPriceActual(orderTicketVo.getPriceActual().subtract(orderTicketVo.getPriceExpress()).divide(BigDecimal.valueOf(orderTicketVo.getNumber()), 2, BigDecimal.ROUND_HALF_UP));
                 item.setPriceCanRefund(dataUtils.getCanRefundOrderEntitiesPrice(orderTicketVo, kylinOrderRefundsVoBaseList, item.getOrderTicketEntitiesId()));
                 // 手续费处理
-                BigDecimal chargesRatio = getChargesRatio(orderTicketVo.getUseStart(), performanceVo.getIsRefundPoundage());
+                BigDecimal chargesRatio = getChargesRatio(orderTicketVo.getUseStart(), performanceVo.getIsRefundPoundage(),performanceVo.getPerformancesId());
                 BigDecimal chargesPrice = item.getPriceCanRefund().multiply(chargesRatio).setScale(2, BigDecimal.ROUND_HALF_UP);
                 item.setPriceCanRefund(item.getPriceCanRefund().subtract(chargesPrice));
                 item.setChargesRatio(chargesRatio);
@@ -120,7 +120,7 @@ public class KylinOrderTicketsRefundServiceImpl {
                 orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
             }
             // 手续费相关
-            OrderRefundPoundageAll refundPoundageAll = dataUtils.getRefundPoundageAll(performanceVo.getIsRefundPoundage());
+            OrderRefundPoundageAll refundPoundageAll = dataUtils.getRefundPoundageAll(performanceVo.getIsRefundPoundage(),performanceVo.getPerformancesId());
             // 券
             ArrayList<KylinOrderCoupons> orderCoupon = dataUtils.getOrderCoupon(orderId);
             // 快递地址
@@ -234,7 +234,7 @@ public class KylinOrderTicketsRefundServiceImpl {
             }
 
             // 手续费处理
-            BigDecimal chargesRatio = getChargesRatio(orderTicketVo.getUseStart(), performanceVo.getIsRefundPoundage());
+            BigDecimal chargesRatio = getChargesRatio(orderTicketVo.getUseStart(), performanceVo.getIsRefundPoundage(),performanceVo.getPerformancesId());
             BigDecimal priceCharges = refundSinglePrice.multiply(chargesRatio).setScale(2, BigDecimal.ROUND_HALF_UP);
             refundSinglePrice = refundSinglePrice.subtract(priceCharges);
             if (refundSinglePrice.compareTo(BigDecimal.ZERO) <= 0) {
@@ -318,8 +318,8 @@ public class KylinOrderTicketsRefundServiceImpl {
     }
 
     // 返回手续费比例
-    private BigDecimal getChargesRatio(String useStart, Integer isRefundPoundage) {
-        ArrayList<OrderRefundPoundage> refundPoundage = dataUtils.getRefundPoundage(isRefundPoundage);
+    private BigDecimal getChargesRatio(String useStart, Integer isRefundPoundage,String performanceId) {
+        ArrayList<OrderRefundPoundage> refundPoundage = dataUtils.getRefundPoundage(isRefundPoundage,performanceId);
         // 手续费比例
         BigDecimal chargesRatio = BigDecimal.valueOf(0);
         if (!CollectionUtils.isEmpty(refundPoundage)) {

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

@@ -655,7 +655,7 @@ public class DataUtils {
         try {
             DateTimeFormatter df = DateTimeFormatter.ofPattern(DateUtil.DATE_FULL_STR);
             LocalDateTime nowTime = LocalDateTime.parse(nowTimeTStr, df);
-            LocalDateTime endTime = LocalDateTime.parse(toDayEndTimeStr,df);
+            LocalDateTime endTime = LocalDateTime.parse(toDayEndTimeStr, df);
 
             LocalDateTime threeEndTime = DateUtil.asLocalDateTime(beforeDayEnd);
             //查询预约(当天)
@@ -978,8 +978,8 @@ public class DataUtils {
     public void changeBuyInfo(String userId, String idCard, String performanceId, String ticketId, int buyCount) {
         String redisKeyUid;
         String redisKeyIdCard;
-        String performanceIdKeyIdCard="";
-        String ticketIdKeyIdCard="";
+        String performanceIdKeyIdCard = "";
+        String ticketIdKeyIdCard = "";
 
         int isTrueName = getPerformanceIsTrueName(performanceId);
 
@@ -1092,10 +1092,10 @@ public class DataUtils {
     }
 
     // 获取手续费
-    public ArrayList<OrderRefundPoundage> getRefundPoundage(Integer isRefundPoundage) {
+    public ArrayList<OrderRefundPoundage> getRefundPoundage(Integer isRefundPoundage, String performanceId) {
         ArrayList<OrderRefundPoundage> orderRefundPoundageArrayList = ObjectUtil.getOrderRefundPoundageArrayList();
         if (null != isRefundPoundage && isRefundPoundage > 0) { // 开启了演出退票有手续费
-            Object obj = redisUtil.get(KylinRedisConst.ORDER_REFUND_POUNDAGE);
+            Object obj = redisUtil.get(KylinRedisConst.ORDER_REFUND_POUNDAGE.concat(":").concat(performanceId));
             if (obj == null) {
                 OrderRefundPoundage vo1 = OrderRefundPoundage.getNew();
                 vo1.setDay(15);
@@ -1115,7 +1115,7 @@ public class DataUtils {
                 orderRefundPoundageArrayList.add(vo1);
                 orderRefundPoundageArrayList.add(vo2);
                 orderRefundPoundageArrayList.add(vo3);
-                redisUtil.set(KylinRedisConst.ORDER_REFUND_POUNDAGE, orderRefundPoundageArrayList);
+                redisUtil.set(KylinRedisConst.ORDER_REFUND_POUNDAGE.concat(":").concat(performanceId), orderRefundPoundageArrayList);
                 return orderRefundPoundageArrayList;
             } else {
                 return (ArrayList<OrderRefundPoundage>) obj;
@@ -1126,16 +1126,16 @@ public class DataUtils {
     }
 
     // 获取手续费ALL说明
-    public OrderRefundPoundageAll getRefundPoundageAll(Integer isRefundPoundage) {
-        ArrayList<OrderRefundPoundage> refundPoundage = getRefundPoundage(isRefundPoundage);
+    public OrderRefundPoundageAll getRefundPoundageAll(Integer isRefundPoundage, String performanceId) {
+        ArrayList<OrderRefundPoundage> refundPoundage = getRefundPoundage(isRefundPoundage, performanceId);
 
         OrderRefundPoundageAll aNew = OrderRefundPoundageAll.getNew();
         aNew.setOrderRefundPoundageList(refundPoundage);
 
-        Object obj = redisUtil.get(KylinRedisConst.ORDER_REFUND_POUNDAGE_EXPLAIN);
+        Object obj = redisUtil.get(KylinRedisConst.ORDER_REFUND_POUNDAGE_EXPLAIN.concat(":").concat(performanceId));
         if (null == obj) {
             String explain = "1.存在异常订购行为的订单，平台有权不予办理退票。\n2.不支持退票示例：如演出时间为5月1日，则不支持退票的时间范围为4月28日-30日及5月1日（演出当天）。";
-            redisUtil.set(KylinRedisConst.ORDER_REFUND_POUNDAGE_EXPLAIN, explain);
+            redisUtil.set(KylinRedisConst.ORDER_REFUND_POUNDAGE_EXPLAIN.concat(":").concat(performanceId), explain);
             aNew.setExplain(explain);
         } else {
             String explain = (String) obj;
@@ -1315,11 +1315,13 @@ public class DataUtils {
         String rdk = KylinRedisConst.REDIS_WQ_ORDER_FIX.concat(orderId);
         redisUtil.del(rdk, orderId);
     }
+
     // 万青补偿vo覆盖
     public void setWqOrderVo(WqTempVo vo) {
         String rdk = KylinRedisConst.REDIS_WQ_ORDER_EXPRESS.concat(vo.getOrderId());
         redisUtil.set(rdk, vo);
     }
+
     // 万青补偿vo获取
     public WqTempVo getWqOrderVo(String orderId) {
         String rdk = KylinRedisConst.REDIS_WQ_ORDER_EXPRESS.concat(orderId);
@@ -1366,8 +1368,9 @@ public class DataUtils {
             return (List<String>) obj;
         }
     }
+
     //获得 admin配置的推荐活动
-    public   List<KylinRecommendActive> getRecommendActive(String id) {
+    public List<KylinRecommendActive> getRecommendActive(String id) {
         return (List<KylinRecommendActive>) redisUtil.get(KylinRedisConst.RECOMMEND_ACTIVE + id);
     }
 
@@ -1382,7 +1385,7 @@ public class DataUtils {
         KylinOrderTicketVo data = dataSingle;
         KylinOrderListVo voItem = KylinOrderListVo.getNew().copy(data);
         List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
-        if(redisData==null){
+        if (redisData == null) {
             return false;
         }
         if (type == 1) {
@@ -1432,32 +1435,32 @@ public class DataUtils {
     }
 
     //删除 订单Ar激活码
-    public void delOrderArCode(String orderId){
+    public void delOrderArCode(String orderId) {
         String rdk = KylinRedisConst.ORDER_AR_CODE.concat(orderId);
         redisUtil.del(rdk);
     }
 
     //添加 订单Ar激活码
-    public void addOrderArCode(String orderId,String arCode){
+    public void addOrderArCode(String orderId, String arCode) {
         String rdk = KylinRedisConst.ORDER_AR_CODE.concat(orderId);
         List<String> data = getOrderArCode(orderId);
         data.add(arCode);
-        redisUtil.set(rdk,data);
+        redisUtil.set(rdk, data);
     }
 
     //获取 订单Ar激活码
-    public List<String> getOrderArCode(String orderId){
+    public List<String> getOrderArCode(String orderId) {
         String rdk = KylinRedisConst.ORDER_AR_CODE.concat(orderId);
         Object obj = redisUtil.get(rdk);
-        if(obj==null){
+        if (obj == null) {
             return CollectionUtil.arrayListString();
-        }else{
+        } else {
             return (List<String>) obj;
         }
     }
 
     //添加激活码使用量
     public void incrArCode() {
-        redisUtil.incr(KylinRedisConst.ACTIVE_USE_AR_COUNT,1);
+        redisUtil.incr(KylinRedisConst.ACTIVE_USE_AR_COUNT, 1);
     }
 }