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

## 自助注册转复购订单会员没删掉（287）；

This commit is contained in:
cabbage 2025-07-17 14:26:14 +08:00
parent 550e7869a4
commit 501ea3b1fa
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -672,8 +672,10 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
deductCancelOrderCost(businessCommissionDTO); deductCancelOrderCost(businessCommissionDTO);
// 回退给创建人 // 回退给创建人
CuMemberAccount payMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator()); CuMemberAccount payMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType() || if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType()
EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()) { || EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()
|| (EOrderType.REPURCHASE_ORDER.getValue() == saOrder.getOrderType() && EOrderTypeExtend.REG_REP.getValue() == saOrder.getOrderTypeExtend())
) {
// 会员账号 验证会员账户是否存在金额 // 会员账号 验证会员账户是否存在金额
CuMember member = iCuMemberService.getMember(saOrder.getPkMember()); CuMember member = iCuMemberService.getMember(saOrder.getPkMember());

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

@ -2260,7 +2260,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 撤销注册订单(注册订单,海粉订单,特殊注册订单) // 撤销注册订单(注册订单,海粉订单,特殊注册订单)
if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue() if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue()
|| myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue() || myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()
|| (EOrderType.REPURCHASE_ORDER.getValue() == saOrderExt.getOrderType() && EOrderTypeExtend.REG_REP.getValue() == saOrderExt.getOrderTypeExtend()) || (myOrderVO.getOrderType() == EOrderType.REPURCHASE_ORDER.getValue() && EOrderTypeExtend.REG_REP.getValue() == saOrderExt.getOrderTypeExtend())
) { ) {
// 逻辑删除会员 // 逻辑删除会员
if (!iMemberServiceApi.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrderExt, businessCommissionDTO).getData()) { if (!iMemberServiceApi.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrderExt, businessCommissionDTO).getData()) {