From 501ea3b1fa805f0674599c6257b6b3bda5d223f2 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 17 Jul 2025 14:26:14 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E8=87=AA=E5=8A=A9=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E8=BD=AC=E5=A4=8D=E8=B4=AD=E8=AE=A2=E5=8D=95=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=B2=A1=E5=88=A0=E6=8E=89=EF=BC=88287=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/service/impl/CuMemberBusinessServiceImpl.java | 6 ++++-- .../com/hzs/sale/order/service/impl/SaOrderServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) 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 63f3b229..f8730048 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 @@ -672,8 +672,10 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { deductCancelOrderCost(businessCommissionDTO); // 回退给创建人 CuMemberAccount payMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator()); - if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType() || - EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()) { + if (EOrderType.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()); 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 f645fd60..d95dca72 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 @@ -2260,7 +2260,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 撤销注册订单(注册订单,海粉订单,特殊注册订单) if (myOrderVO.getOrderType() == EOrderType.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()) {