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

## 解决合并二次发货冲突；

This commit is contained in:
cabbage 2025-06-05 14:30:52 +08:00
parent b34d0539df
commit 5331961236
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverBusinessServiceImpl.java
View File

@ -569,14 +569,14 @@ public class SaDeliverBusinessServiceImpl implements ISaDeliverBusinessService {
iSaOrderBonusService.insertBatch(orderBonusList);
}
// 需要扣款
if (null != updateAccount) {
R accountR = iMemberAccountServiceApi.insertMemberTrade(saOrder, updateAccount);
if (!accountR.isSuccess()) {
log.error("订单二次发货同意处理失败: 会员扣款失败");
throw new ServiceException("订单二次发货同意处理失败: 会员扣款失败");
}
}
// // 需要扣款
// if (null != updateAccount) {
// R accountR = iMemberAccountServiceApi.insertMemberTrade(saOrder, updateAccount);
// if (!accountR.isSuccess()) {
// log.error("订单二次发货同意处理失败: 会员扣款失败");
// throw new ServiceException("订单二次发货同意处理失败: 会员扣款失败");
// }
// }
return null;
}