From 336db5dd2a9d204a14ae80b474e37327707307d5 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Tue, 23 Sep 2025 09:49:16 +0800 Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E5=8C=BA=E5=88=86=E7=B2=BE?= =?UTF-8?q?=E5=93=81=E4=B8=93=E5=8C=BA/=E5=95=86=E5=9F=8E=E4=B8=93?= =?UTF-8?q?=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/service/impl/CuMemberBusinessServiceImpl.java | 7 +++++-- .../main/resources/mapper/member/base/CuMemberMapper.xml | 2 +- .../controller/service/impl/RetailOrderServiceImpl.java | 3 ++- .../hzs/sale/order/service/impl/SaOrderServiceImpl.java | 2 +- 4 files changed, 9 insertions(+), 5 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 fa151657..fa14d091 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 @@ -621,10 +621,13 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { public Boolean singleRevokeMemberBySelfRevokeOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO) { deductCancelOrderCost(businessCommissionDTO); // 回退给创建人 + CuMember member = cuMemberService.getMember(saOrder.getPkMember()); CuMemberAccount payMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator()); - if (EOrderType.RETAIL_REGISTER.getValue() == saOrder.getOrderType()) { + if ( + EOrderType.RETAIL_REGISTER.getValue() == saOrder.getOrderType() + || (saOrder.getOrderType() == EOrderType.RETAIL_REPURCHASE.getValue() && saOrder.getPayTime().equals(member.getPayTime())) + ) { // 会员账号 验证会员账户是否存在金额 - CuMember member = cuMemberService.getMember(saOrder.getPkMember()); //删除会员 LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index 34562b58..7b65a071 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -2402,7 +2402,7 @@ inner join cu_member cm on cm.pk_id = so.pk_creator where so.del_flag = 0 - and so.order_type = 41 + and so.order_type in (41, 43) and so.order_code = #{orderCode} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java index e660642f..12591e9a 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java @@ -636,7 +636,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService { saOrderExt.setPkMember(newMember.getPkId()); if(ObjectUtil.isNotEmpty(registerParam.getCuMemberShare())){ saOrderExt.setPkReference(registerParam.getCuMemberShare().getPkParent()); - saOrderExt.setOrderType(EOrderType.RETAIL_REGISTER.getValue()); +// saOrderExt.setOrderType(EOrderType.RETAIL_REGISTER.getValue()); + saOrderExt.setOrderType(registerParam.getSpecialArea()); } resultStr = this.payRegOrder(saOrderExt, newMember, null); 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 a5869452..ed814c32 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 @@ -1154,7 +1154,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl saOrderChargeLogService.save(saOrderChargeLog); // 撤销注册订单 - CuMember member = memberServiceApi.getMember(myOrderVO.getPkMember()).getData(); + CuMember member = memberServiceApi.getMember(SecurityUtils.getUserId()).getData(); if (myOrderVO.getOrderType() == EOrderType.RETAIL_REGISTER.getValue() || (myOrderVO.getOrderType() == EOrderType.RETAIL_REPURCHASE.getValue() && myOrderVO.getPayTime().equals(member.getPayTime())) ) {