From f6022783d664dc79fa7bee50ec6ec1b8b6ae5177 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 20 Jan 2025 16:53:32 +0800
Subject: [PATCH] refactor(datasource): 更新数据源配置
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 0ab21bb..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());
@@ -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