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-08-21 17:29:58 +08:00
parent bb2d5a2879
commit e4ef3827c1
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -618,7 +618,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
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);
// 删除会员注册表 // 删除会员注册表
LambdaUpdateWrapper<CuMemberRegister> updateWrapperRegister = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<CuMemberRegister> updateWrapperRegister = new LambdaUpdateWrapper<>();
updateWrapperRegister.set(CuMemberRegister::getDelFlag, EDelFlag.DELETE.getValue()); updateWrapperRegister.set(CuMemberRegister::getDelFlag, EDelFlag.DELETE.getValue());

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

@ -6,7 +6,6 @@ import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
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.bonus.settle.IMemberSettleBonusApi; import com.hzs.bonus.settle.IMemberSettleBonusApi;
import com.hzs.common.core.constant.*; import com.hzs.common.core.constant.*;
import com.hzs.common.core.constant.msg.*; import com.hzs.common.core.constant.msg.*;
@ -2356,8 +2355,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
return myOrderVO; return myOrderVO;
} }
if (myOrderVO.getOrderType() == EOrderType.RETAIL_REGISTER.getValue() || if (myOrderVO.getOrderType() == EOrderType.RETAIL_REGISTER.getValue() ||
myOrderVO.getOrderType() == EOrderType.RETAIL_UPGRADE.getValue() || myOrderVO.getOrderType() == EOrderType.RETAIL_UPGRADE.getValue()) {
myOrderVO.getOrderType() == EOrderType.RETAIL_REPURCHASE.getValue()) {
String lastOrderCode = iSaOrderService.lastOrderList(userId, myOrderVO.getPkCountry()); String lastOrderCode = iSaOrderService.lastOrderList(userId, myOrderVO.getPkCountry());
if (StringUtils.isEmpty(lastOrderCode) || !lastOrderCode.equals(myOrderVO.getOrderCode())) { if (StringUtils.isEmpty(lastOrderCode) || !lastOrderCode.equals(myOrderVO.getOrderCode())) {
myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.CHECK_MEMBER_LAST_ORDER)); myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.CHECK_MEMBER_LAST_ORDER));
@ -2397,7 +2395,8 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
} }
// 校验订单是否存在进行中的签呈 // 校验订单是否存在进行中的签呈
if (iSaOrderChargeLogService.checkOrderApprovalExist( if (iSaOrderChargeLogService.checkOrderApprovalExist(
Arrays.asList(EApprovalBusiness.ORDER_CHANGE_ADDRESS.getValue(), EApprovalBusiness.ORDER_CHANGE_PRODUCT.getValue(), Arrays.asList(EApprovalBusiness.ORDER_CHANGE_ADDRESS.getValue(),
EApprovalBusiness.ORDER_CHANGE_PRODUCT.getValue(),
EApprovalBusiness.ORDER_RETURN.getValue(), approveBusiness, EApprovalBusiness.ORDER_RETURN.getValue(), approveBusiness,
EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue() EApprovalBusiness.ORDER_CANCEL_PRODUCT.getValue()
), ),

6
bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
View File

@ -320,7 +320,7 @@
soi.soi.wares_quantity, soi.soi.wares_quantity,
bc.in_exchange_rate, bc.in_exchange_rate,
case case
when soi.order_status in (1, 2) then when soi.order_status in (1, 2, 6) then
0 0
else else
1 1
@ -1197,12 +1197,12 @@
LEFT JOIN sa_order_items soi ON soi.pk_order = so.pk_id LEFT JOIN sa_order_items soi ON soi.pk_order = so.pk_id
AND soi.del_flag = 0 AND soi.del_flag = 0
WHERE so.del_flag = 0 WHERE so.del_flag = 0
and so.order_type in (41, 42,43) and so.order_type in (41, 42)
and soi.del_flag = 0 and soi.del_flag = 0
and so.ORDER_STATUS = 1 and so.ORDER_STATUS = 1
and so.PAY_TIME is not null and so.PAY_TIME is not null
and (so.pk_creator = #{memberId} or so.pk_member = #{memberId}) and (so.pk_creator = #{memberId} or so.pk_member = #{memberId})
AND soi.order_status = 1 AND soi.order_status in (1, 6)
ORDER BY so.PAY_TIME DESC ORDER BY so.PAY_TIME DESC
) )
WHERE ROWNUM = 1 WHERE ROWNUM = 1

10
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java
View File

@ -150,11 +150,6 @@ public class SaOrderMsgConstants {
* 待支付订单支付时，校验商品已经下架，不能继续购买 -- 订单下商品已下架，不能购买 * 待支付订单支付时，校验商品已经下架，不能继续购买 -- 订单下商品已下架，不能购买
*/ */
public static final String ORDER_ITEM_OFF = "订单下商品已下架，不能购买"; public static final String ORDER_ITEM_OFF = "订单下商品已下架，不能购买";
/**
* 待支付订单支付时，校验商品已经下架，不能继续购买 -- 订单已经绑定条形码，建议解绑后在撤单！
*/
public static final String ORDER_BIND_BAR_CODE = "订单已经绑定条形码，建议解绑后在撤单！";
/** /**
* 请填写驳回信息 -- 请填写驳回信息 * 请填写驳回信息 -- 请填写驳回信息
*/ */
@ -168,9 +163,4 @@ public class SaOrderMsgConstants {
*/ */
public static final String CHECK_MEMBER_LOWER_EXIST = "该会员推荐存在会员不能撤单"; public static final String CHECK_MEMBER_LOWER_EXIST = "该会员推荐存在会员不能撤单";
/**
* 商品预售数量不足
*/
public static final String WARES_PRE_SALE_QUANTITY_LACK = "商品预售数量不足";
} }