angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## Opt - 优化支付类型判断&实际提交在线退款逻辑延后

This commit is contained in:
sangelxiu1 2025-07-03 17:02:38 +08:00 committed by cabbage
parent 9b90f13c5e
commit c0e2097d03
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java
View File

@ -776,17 +776,9 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
List<CuMemberTradeDetail> cuMemberTradeDetailList = new ArrayList<>(); List<CuMemberTradeDetail> cuMemberTradeDetailList = new ArrayList<>();
CuMemberAccount updateMemberAccount = new CuMemberAccount(); CuMemberAccount updateMemberAccount = new CuMemberAccount();
List<CuMemberTrade> cuMemberTradeList = packageCancelOrderCuMemberTrades(pkApprove, saOrder, payMemberAccount, newCuMemberTradeBonusList, cuMemberTradeDetailList, updateMemberAccount); List<CuMemberTrade> cuMemberTradeList = packageCancelOrderCuMemberTrades(pkApprove, saOrder, payMemberAccount, newCuMemberTradeBonusList, cuMemberTradeDetailList, updateMemberAccount);
R<TOnlinePayment> 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) { if (newCuMemberTradeBonusList.size() > 0) {
iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList); iCuMemberTradeBonusService.batchInsertCuMemberTradeBonus(newCuMemberTradeBonusList);
} }
}
// 根据 newCuMemberTradeBonusList 更新 cu_member_trade_detail // 根据 newCuMemberTradeBonusList 更新 cu_member_trade_detail
iCuMemberTradeDetailService.updateAddCuMemberTradeDetail(cuMemberTradeDetailList); iCuMemberTradeDetailService.updateAddCuMemberTradeDetail(cuMemberTradeDetailList);
saveAndUpdateCuMember(cuMemberTradeList, updateMemberAccount); saveAndUpdateCuMember(cuMemberTradeList, updateMemberAccount);

22
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -2300,17 +2300,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
public void selfRevokeOrder(Long pkApprove, MyOrderVO myOrderVO) { public void selfRevokeOrder(Long pkApprove, MyOrderVO myOrderVO) {
SaOrderExt saOrderExt = myOrderVO.getSaOrderExt(); SaOrderExt saOrderExt = myOrderVO.getSaOrderExt();
BusinessCommissionDTO businessCommissionDTO = null; BusinessCommissionDTO businessCommissionDTO = null;
R<TOnlinePayment> 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)) { if (ObjectUtil.isNotEmpty(saOrderExt)) {
// 删除订单 // 删除订单
saOrderExt.setDelFlag(EDelFlag.DELETE.getValue()); saOrderExt.setDelFlag(EDelFlag.DELETE.getValue());
@ -2447,6 +2436,17 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
throw new RuntimeException("撤单失败"); throw new RuntimeException("撤单失败");
} }
} }
R<TOnlinePayment> 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 { try {
// 验证订单是否有仓库，有仓库的可以回退，没有的回退 // 验证订单是否有仓库，有仓库的可以回退，没有的回退
if (saOrderExt.getPkStorehouse() != null) { if (saOrderExt.getPkStorehouse() != null) {