From f37365bc79ca14378c444c80d1c484cf32680235 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 19:46:25 +0800
Subject: [PATCH] 修改分佣逻辑
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 6e85163..eb93bbc 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -230,9 +230,6 @@
if (!check){
throw new ServiceException("订单不存在");
}
- order.setOrderStatus(OrderStatus.COMPLETED.getCode());
- orderMapper.updateById(order);
- Integer orderType = order.getOrderType();
// 售后设置
R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(5);
@@ -246,9 +243,10 @@
String content = baseSetting.getContent();
JSONObject jsonObject = JSONObject.parseObject(content);
Long days = jsonObject.getLong("days");
- if (days != null && days > 0){
- commissionService.addToCommissionDelayQueue(order.getId(), LocalDateTime.now().plusDays(days));
- }
+ order.setOrderStatus(OrderStatus.COMPLETED.getCode());
+ order.setIsCommission(0);
+ order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
+ orderMapper.updateById(order);
}
--
Gitblit v1.7.1