退款回调

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/OrderRefundOvertimeServiceImpl.java

@@ -89,6 +89,8 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
                 MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
                 headers.add("Accept", "application/json;charset=UTF-8");
 
+                log.info("订单超时支付refundApply-退所有优惠券：[orderTicketsId={}, [params={}, candyUrl={}]",
+                        orderTicketsId, params, candyUrl);
                 String returnData = HttpUtil.post(candyUrl + "/candy-coupon/useBack", params, headers);
                 log.info("订单超时支付refundApply-退券结果：[returnData={}]", returnData);
             }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/KylinRefundsStatusServiceImpl.java

@@ -226,20 +226,25 @@ public class KylinRefundsStatusServiceImpl {
                     dataUtils.changeBuyInfo(orderInfo.getUserId(), entitiesInfo.getEnterIdCode(), orderRelations.getPerformanceId(), entitiesInfo.getTicketId(), -1);
                 }
             }
-            // 退所有优惠券
-            ArrayList<KylinOrderCoupons> orderCoupon = dataUtils.getOrderCoupon(orderTicketsId);
-            if (!CollectionUtil.isEmpty(orderCoupon)) {
-                List<String> uCouponIds = orderCoupon.stream().filter(r -> r.getCouponType() != 101).map(KylinOrderCoupons -> KylinOrderCoupons.getCouponCode()).collect(Collectors.toList());
-                String uCouponIdsStr = Joiner.on(",").join(uCouponIds);
-                MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
-                params.add("uCouponIds", uCouponIdsStr);
-                params.add("uid", orderInfo.getUserId());
-
-                MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
-                headers.add("Accept", "application/json;charset=UTF-8");
-
-                String returnData = HttpUtil.post(candyUrl + "/candy-coupon/useBack", params, headers);
-                log.info("超时支付退款退券结果：{}", returnData);
+            // 退所有优惠券 提前购优惠卷不退
+            KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderRelations.getPerformanceId());
+            if (performanceVo.getIsRefundVoucher() > 0) {
+                ArrayList<KylinOrderCoupons> orderCoupon = dataUtils.getOrderCoupon(orderTicketsId);
+                if (!CollectionUtil.isEmpty(orderCoupon)) {
+                    List<String> uCouponIds = orderCoupon.stream().filter(r -> r.getCouponType() != 101).map(KylinOrderCoupons -> KylinOrderCoupons.getCouponCode()).collect(Collectors.toList());
+                    String uCouponIdsStr = Joiner.on(",").join(uCouponIds);
+                    MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
+                    params.add("uCouponIds", uCouponIdsStr);
+                    params.add("uid", orderInfo.getUserId());
+
+                    MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
+                    headers.add("Accept", "application/json;charset=UTF-8");
+
+                    log.info("订单退款回调orderTicketRefunded-退所有优惠券：[orderTicketsId={}, [params={}, candyUrl={}]",
+                            orderTicketsId, params, candyUrl);
+                    String returnData = HttpUtil.post(candyUrl + "/candy-coupon/useBack", params, headers);
+                    log.info("超时支付退款退券结果：{}", returnData);
+                }
             }
         }