diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java index 377244fe..1f2395d8 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java @@ -776,16 +776,8 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { List cuMemberTradeDetailList = new ArrayList<>(); CuMemberAccount updateMemberAccount = new CuMemberAccount(); List cuMemberTradeList = packageCancelOrderCuMemberTrades(pkApprove, saOrder, payMemberAccount, newCuMemberTradeBonusList, cuMemberTradeDetailList, updateMemberAccount); - R onlinePaymentR = itOnlinePaymentServiceApi.getOnlinePayment(saOrder.getOrderCode()); - TOnlinePayment onlinePayment = null; - if(ObjectUtil.isNotEmpty(onlinePaymentR)){ - onlinePayment = onlinePaymentR.getData(); - } - // 2025年7月2日 在线支付无视现金流水明细 - if(ObjectUtil.isEmpty(onlinePayment)){ - if (newCuMemberTradeBonusList.size() > 0) { - iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList); - } + if (newCuMemberTradeBonusList.size() > 0) { + iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList); } // 根据 newCuMemberTradeBonusList 更新 cu_member_trade_detail iCuMemberTradeDetailService.updateAddCuMemberTradeDetail(cuMemberTradeDetailList); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 3fe04eaf..b474d5f3 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -2300,17 +2300,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl public void selfRevokeOrder(Long pkApprove, MyOrderVO myOrderVO) { SaOrderExt saOrderExt = myOrderVO.getSaOrderExt(); BusinessCommissionDTO businessCommissionDTO = null; - R onlinePaymentR = itOnlinePaymentServiceApi.getOnlinePayment(saOrderExt.getOrderCode()); - TOnlinePayment onlinePayment = null; - if(ObjectUtil.isNotEmpty(onlinePaymentR)){ - onlinePayment = onlinePaymentR.getData(); - if(ObjectUtil.isNotEmpty(onlinePayment)){ - R result = itOnlinePaymentServiceApi.refund(saOrderExt.getOrderCode(), SecurityUtils.getUserId()); - if(!result.isSuccess()){ - throw new ServiceException(result.getMsg()); - } - } - } if (ObjectUtil.isNotEmpty(saOrderExt)) { // 删除订单 saOrderExt.setDelFlag(EDelFlag.DELETE.getValue()); @@ -2447,6 +2436,17 @@ public class SaOrderServiceImpl extends ServiceImpl impl throw new RuntimeException("撤单失败"); } } + R onlinePaymentR = itOnlinePaymentServiceApi.getOnlinePayment(saOrderExt.getOrderCode()); + TOnlinePayment onlinePayment; + if(ObjectUtil.isNotEmpty(onlinePaymentR)){ + onlinePayment = onlinePaymentR.getData(); + if(ObjectUtil.isNotEmpty(onlinePayment)){ + R result = itOnlinePaymentServiceApi.refund(saOrderExt.getOrderCode(), SecurityUtils.getUserId()); + if(!result.isSuccess()){ + throw new ServiceException(result.getMsg()); + } + } + } try { // 验证订单是否有仓库,有仓库的可以回退,没有的回退 if (saOrderExt.getPkStorehouse() != null) {