From 30390327f0cca13b8ad5e7ad4d433ca0f02c350d Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 08 一月 2024 12:12:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phi_platform_user/src/main/java/com/hx/phip/service/order/impl/OrderRefundServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/phi_platform_user/src/main/java/com/hx/phip/service/order/impl/OrderRefundServiceImpl.java b/phi_platform_user/src/main/java/com/hx/phip/service/order/impl/OrderRefundServiceImpl.java
index dd093bf..0eb1076 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/service/order/impl/OrderRefundServiceImpl.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/service/order/impl/OrderRefundServiceImpl.java
@@ -2224,6 +2224,13 @@
//娲诲姩瑙勫垯閫�娆惧鐞�
OrderRefundCancelTool.activityRuleHandle(ordersTotal,refundRecord,OrderRefundCancelTool.OPT_TYPE_CANCEL,"鎷掔粷瀹℃壒",orderNodeBuilder,commonService);
+ //瀹℃牳涓嶉�氳繃鏃�,杩囨护鍑哄瓙鍗曠被鍨嬩负铏氭嫙鍟嗗搧鐨勫瓙鍗曪紝瀵瑰簲鐨勮鎶婁綔搴熺殑浼樻儬鍒告仮澶嶅洖鏈夋晥
+ List<OrderItem> vgItemList = orderItemList.stream().filter(s->s.getType().equals(OrderItemConstants.TYPE_COUPON)).collect(Collectors.toList());
+ logger.info("閫�娆惧鏍镐笉閫氳繃锛屼紭鎯犲埜鍟嗗搧鏁伴噺锛歿}", vgItemList.size());
+ if(vgItemList != null && vgItemList.size() > 0){
+ OrderVirtualGoodsUtil.refundNotRecoveredCouponRestoreEffective(commonService, vgItemList, refundRecord.getId());
+ }
+
ordersNodeLog.setCommonType(OrdersNodeLog.TYPE_COMMON_ORDER_REFUND);
ordersNodeLog.setContent(orderNodeBuilder.toString());
ordersNodeLog.setOrderId(ordersTotal.getId());
--
Gitblit v1.8.0