Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
| | |
|---|
| | | //活动规则退款处理 |
|---|
| | | 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()); |
|---|
