From b9e32d124c68216ad534a89e0d2f32ff4f986be4 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 21 Aug 2025 17:29:58 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E8=87=AA=E5=8A=A9=E6=92=A4=E5=8D=95?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=80=E6=96=B0=E8=AE=A2=E5=8D=95=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/service/impl/CuMemberBusinessServiceImpl.java | 1 - .../order/service/impl/OrderBusinessServiceImpl.java | 7 +++---- .../main/resources/mapper/sale/order/SaOrderMapper.xml | 6 +++--- .../common/core/constant/msg/SaOrderMsgConstants.java | 10 ---------- 4 files changed, 6 insertions(+), 18 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 e17927cf..b9add7c8 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 @@ -618,7 +618,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { updateWrapper.set(CuMember::getPkModified, saOrder.getPkModified()); updateWrapper.eq(CuMember::getPkId, member.getPkId()); iCuMemberService.update(updateWrapper); - // 删除会员注册表 LambdaUpdateWrapper updateWrapperRegister = new LambdaUpdateWrapper<>(); updateWrapperRegister.set(CuMemberRegister::getDelFlag, EDelFlag.DELETE.getValue()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java index 39601676..daead204 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hzs.bonus.settle.IMemberSettleBonusApi; import com.hzs.common.core.constant.*; import com.hzs.common.core.constant.msg.*; @@ -2356,8 +2355,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService { return myOrderVO; } if (myOrderVO.getOrderType() == EOrderType.RETAIL_REGISTER.getValue() || - myOrderVO.getOrderType() == EOrderType.RETAIL_UPGRADE.getValue() || - myOrderVO.getOrderType() == EOrderType.RETAIL_REPURCHASE.getValue()) { + myOrderVO.getOrderType() == EOrderType.RETAIL_UPGRADE.getValue()) { String lastOrderCode = iSaOrderService.lastOrderList(userId, myOrderVO.getPkCountry()); if (StringUtils.isEmpty(lastOrderCode) || !lastOrderCode.equals(myOrderVO.getOrderCode())) { myOrderVO.setMsg(TransactionUtils.getContent(SaOrderMsgConstants.CHECK_MEMBER_LAST_ORDER)); @@ -2397,7 +2395,8 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService { } // 校验订单是否存在进行中的签呈 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_CANCEL_PRODUCT.getValue() ), diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml index b56c51d6..a94bd8fc 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml @@ -320,7 +320,7 @@ soi.soi.wares_quantity, bc.in_exchange_rate, case - when soi.order_status in (1, 2) then + when soi.order_status in (1, 2, 6) then 0 else 1 @@ -1197,12 +1197,12 @@ LEFT JOIN sa_order_items soi ON soi.pk_order = so.pk_id AND soi.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 so.ORDER_STATUS = 1 and so.PAY_TIME is not null 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 ) WHERE ROWNUM = 1 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java index a380a975..dec42129 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java @@ -150,11 +150,6 @@ public class SaOrderMsgConstants { * 待支付订单支付时，校验商品已经下架，不能继续购买 -- 订单下商品已下架，不能购买 */ 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 WARES_PRE_SALE_QUANTITY_LACK = "商品预售数量不足"; - }