From d7f01edd56f2f8a822ceffa9240fa22e4763d7e4 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 22 Jan 2025 15:42:40 +0800
Subject: [PATCH] refactor(mall): 重构订单发货相关代码

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 1ddb84c..c346f21 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -412,8 +412,9 @@
             throw new FebsException("订单不存在");
         }
 
-        if (OrderStatusEnum.WAIT_PAY.getValue() != orderInfo.getStatus()) {
-            throw new FebsException("订单不是待付款, 无法取消");
+        if (OrderStatusEnum.WAIT_PAY.getValue() != orderInfo.getStatus()
+                && OrderStatusEnum.WAIT_SHIPPING.getValue() != orderInfo.getStatus() ) {
+            throw new FebsException("订单不是待付款或者待收货, 无法取消");
         }
 
         orderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
@@ -595,10 +596,10 @@
             throw new FebsException("支付密码错误");
         }
 
-        int reduce = memberWalletService.reduce(orderInfo.getAmount(), mallMember.getId(), field);
-        if (reduce == 2) {
-            throw new FebsException("余额不足");
-        }
+//        int reduce = memberWalletService.reduce(orderInfo.getAmount(), mallMember.getId(), field);
+//        if (reduce == 2) {
+//            throw new FebsException("余额不足");
+//        }
         return orderInfo.getOrderNo();
     }
 
@@ -683,9 +684,9 @@
         orderInfo.setReceivingTime(new Date());
         this.baseMapper.updateById(orderInfo);
         //普通订单才产生积分,积分订单不产生积分
-        if(1 == orderInfo.getOrderType()){
-            agentProducer.sendGetScoreMsg(orderInfo.getId());
-        }
+//        if(1 == orderInfo.getOrderType()){
+//            agentProducer.sendGetScoreMsg(orderInfo.getId());
+//        }
         //生成一条团长提成记录
 //        Long orderInfoId = orderInfo.getId();
 //        List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfoId);

--
Gitblit v1.9.1