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 0e2d6742..e660642f 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 @@ -616,7 +616,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService { saOrderExt.setPayType(EOrderPayType.ONLINE.getValue()); RetailOrderRegisterParam registerParam = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_REG_PARAM + pkMember + orderCode); - boolean isShared = ObjectUtil.isNotEmpty(registerParam.getCuMemberShare()); + boolean isShared = ObjectUtil.isNotEmpty(registerParam) && ObjectUtil.isNotEmpty(registerParam.getCuMemberShare()); if (EOrderType.RETAIL_REGISTER.getValue() == saOrderExt.getOrderType() || (isShared && EOrderType.RETAIL_REPURCHASE.getValue() == saOrderExt.getOrderType()) ) { 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 2ab130a6..a5869452 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,10 @@ public class SaOrderServiceImpl extends ServiceImpl impl saOrderChargeLogService.save(saOrderChargeLog); // 撤销注册订单 - if (myOrderVO.getOrderType() == EOrderType.RETAIL_REGISTER.getValue()) { + CuMember member = memberServiceApi.getMember(myOrderVO.getPkMember()).getData(); + if (myOrderVO.getOrderType() == EOrderType.RETAIL_REGISTER.getValue() + || (myOrderVO.getOrderType() == EOrderType.RETAIL_REPURCHASE.getValue() && myOrderVO.getPayTime().equals(member.getPayTime())) + ) { // 逻辑删除会员 if (!memberServiceApi.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrderExt, businessCommissionDTO).getData()) { throw new ServiceException("撤单失败");