angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## 撤单处理取消区域配置；

This commit is contained in:
cabbage 2025-07-14 10:14:55 +08:00
parent 443dbbe4b8
commit b9472479cc
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hzs.common.core.constant.*; import com.hzs.common.core.constant.*;
import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.constant.msg.MemberMsgConstants;
import com.hzs.common.core.domain.R; import com.hzs.common.core.domain.R;
@ -575,6 +576,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 处理推荐人等级 // 处理推荐人等级
handleParentLevel(saOrder, currentDateTime); handleParentLevel(saOrder, currentDateTime);
// 删除会员区域
iCuMemberRetailRegionService.update(Wrappers.<CuMemberRetailRegion>lambdaUpdate()
.eq(CuMemberRetailRegion::getPkMember, saOrder.getPkMember())
.set(CuMemberRetailRegion::getDelFlag, EDelFlag.DELETE.getValue())
.set(CuMemberRetailRegion::getModifiedTime, currentDateTime)
);
cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount); cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount);
return true; return true;
@ -594,7 +601,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
LambdaUpdateWrapper<CuMember> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<CuMember> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(CuMember::getMemberCode, CommonUtil.deleteMemberCode(member.getMemberCode())); updateWrapper.set(CuMember::getMemberCode, CommonUtil.deleteMemberCode(member.getMemberCode()));
updateWrapper.set(CuMember::getDelFlag, EDelFlag.DELETE.getValue()); updateWrapper.set(CuMember::getDelFlag, EDelFlag.DELETE.getValue());
updateWrapper.set(CuMember::getModifiedTime, DateUtils.currentDateTime()); updateWrapper.set(CuMember::getModifiedTime, currentDateTime);
updateWrapper.set(CuMember::getPkModified, saOrder.getPkModified()); updateWrapper.set(CuMember::getPkModified, saOrder.getPkModified());
updateWrapper.eq(CuMember::getPkId, member.getPkId()); updateWrapper.eq(CuMember::getPkId, member.getPkId());
iCuMemberService.update(updateWrapper); iCuMemberService.update(updateWrapper);
@ -602,7 +609,7 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 删除会员注册表 // 删除会员注册表
LambdaUpdateWrapper<CuMemberRegister> updateWrapperRegister = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<CuMemberRegister> updateWrapperRegister = new LambdaUpdateWrapper<>();
updateWrapperRegister.set(CuMemberRegister::getDelFlag, EDelFlag.DELETE.getValue()); updateWrapperRegister.set(CuMemberRegister::getDelFlag, EDelFlag.DELETE.getValue());
updateWrapperRegister.set(CuMemberRegister::getModifiedTime, DateUtils.currentDateTime()); updateWrapperRegister.set(CuMemberRegister::getModifiedTime, currentDateTime);
updateWrapperRegister.set(CuMemberRegister::getPkModified, saOrder.getPkModified()); updateWrapperRegister.set(CuMemberRegister::getPkModified, saOrder.getPkModified());
updateWrapperRegister.eq(CuMemberRegister::getPkMember, member.getPkId()); updateWrapperRegister.eq(CuMemberRegister::getPkMember, member.getPkId());
iCuMemberRegisterService.update(updateWrapperRegister); iCuMemberRegisterService.update(updateWrapperRegister);
@ -610,6 +617,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 处理推荐人等级 // 处理推荐人等级
handleParentLevel(saOrder, currentDateTime); handleParentLevel(saOrder, currentDateTime);
// 删除会员区域
iCuMemberRetailRegionService.update(Wrappers.<CuMemberRetailRegion>lambdaUpdate()
.eq(CuMemberRetailRegion::getPkMember, saOrder.getPkMember())
.set(CuMemberRetailRegion::getDelFlag, EDelFlag.DELETE.getValue())
.set(CuMemberRetailRegion::getModifiedTime, currentDateTime)
);
cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount); cancelOrderBackAccount(pkApprove, saOrder, payMemberAccount);
return true; return true;
@ -856,14 +869,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
// 升级订单 // 升级订单
// 回退等级 // 回退等级
iCuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime); iCuMemberLevelService.deleteCuMemberLevelRecord(saOrder.getPkId(), pkApprove, currentDateTime);
} else if (EOrderType.RETAIL_REPURCHASE.getValue() == saOrder.getOrderType()) { // 删除会员区域
// 复购订单 iCuMemberRetailRegionService.update(Wrappers.<CuMemberRetailRegion>lambdaUpdate()
// 会员等级发生变化，新等级需要处理 .eq(CuMemberRetailRegion::getPkMember, saOrder.getPkMember())
BdGrade newGrade = saOrder.getNewGrade(); .set(CuMemberRetailRegion::getDelFlag, EDelFlag.DELETE.getValue())
if (null != cuMember && null != newGrade) { .set(CuMemberRetailRegion::getModifiedTime, currentDateTime)
// 更新会员等级 );
cuMember.setPkSettleGrade(newGrade.getPkId());
}
} }
// 更新会员标记，如果是则更新会员信息 // 更新会员标记，如果是则更新会员信息

2
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java
View File

@ -556,7 +556,7 @@ public class ApiOrderController extends BaseController {
} }
/** /**
* 自助撤单w * 自助撤单
**/ **/
@PostMapping("/self-revoke-order") @PostMapping("/self-revoke-order")
public AjaxResult selfRevokeOrder(@RequestBody MyOrderVO myOrderVO, HttpServletRequest request) { public AjaxResult selfRevokeOrder(@RequestBody MyOrderVO myOrderVO, HttpServletRequest request) {