From 68d820d0f765bcdbf64d9ddc812920a66ac0fa1b Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 11:26:45 +0800
Subject: [PATCH] 1.管理后台商品分类

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java    |   31 ++++++++++++++++++++++++++++---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java |   21 +++++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 3a63281..c3582d7 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -12,14 +12,19 @@
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.order.enums.OrderStatus;
 import com.ruoyi.order.model.Order;
+import com.ruoyi.order.service.CommissionService;
 import com.ruoyi.order.service.OrderService;
 import com.ruoyi.order.vo.OrderDetailVO;
 import com.ruoyi.order.vo.OrderVO;
+import com.ruoyi.other.api.domain.BaseSetting;
+import com.ruoyi.other.api.feignClient.BaseSettingClient;
 import com.ruoyi.system.api.model.LoginUser;
 import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -40,6 +45,10 @@
     private TokenService tokenService;
     @Resource
     private UserAddressClient addressClient;
+    @Resource
+    private CommissionService commissionService;
+    @Resource
+    private BaseSettingClient baseSettingClient;
 
 
     /**
@@ -128,9 +137,25 @@
     })
     @GetMapping("/confirm/{orderId}")
     public R<Void> confirm(@PathVariable("orderId") Long orderId){
-        Order order = orderService.getById(orderId);
-        order.setOrderStatus(OrderStatus.COMPLETED.getCode());
-        orderService.updateById(order);
+        boolean update = orderService.update(new LambdaUpdateWrapper<Order>()
+                .eq(Order::getId, orderId)
+                .eq(Order::getOrderStatus, OrderStatus.PENDING_RECEIPT.getCode())
+                .set(Order::getOrderStatus, OrderStatus.COMPLETED.getCode()));
+        if(!update){
+            return R.fail("订单状态异常");
+        }
+        R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(5);
+        if (R.isError(baseSettingR)) {
+            return R.fail("售后设置获取失败");
+        }
+        BaseSetting baseSetting = baseSettingR.getData();
+        if (baseSetting == null) {
+            return R.fail("售后设置获取失败");
+        }
+        String content = baseSetting.getContent();
+        JSONObject jsonObject = JSONObject.parseObject(content);
+        Long days = jsonObject.getLong("days");
+        commissionService.addToCommissionDelayQueue(orderId, LocalDateTime.now().plusDays(days));
         return R.ok();
     }
 
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 022167c..7724e42 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
@@ -17,11 +17,13 @@
 import com.ruoyi.order.mapper.OrderMapper;
 import com.ruoyi.order.model.Order;
 import com.ruoyi.order.model.OrderGood;
+import com.ruoyi.order.service.CommissionService;
 import com.ruoyi.order.service.OrderService;
 import com.ruoyi.order.vo.OrderDetailVO;
 import com.ruoyi.order.vo.OrderGoodsVO;
 import com.ruoyi.order.vo.OrderVO;
 import com.ruoyi.other.api.domain.*;
+import com.ruoyi.other.api.feignClient.BaseSettingClient;
 import com.ruoyi.other.api.feignClient.ShopClient;
 import com.ruoyi.other.api.feignClient.TechnicianClient;
 import com.ruoyi.system.api.model.LoginUser;
@@ -29,6 +31,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -55,6 +58,10 @@
     private TechnicianClient technicianClient;
     @Resource
     private ShopClient shopClient;
+    @Resource
+    private CommissionService commissionService;
+    @Resource
+    private BaseSettingClient baseSettingClient;
 
 
     @Override
@@ -213,6 +220,20 @@
                 throw new ServiceException("修改技师状态失败");
             }
         }
+
+        // 售后设置
+        R<BaseSetting> baseSettingR = baseSettingClient.getBaseSetting(5);
+        if (R.isError(baseSettingR)) {
+            throw new ServiceException("售后设置获取失败");
+        }
+        BaseSetting baseSetting = baseSettingR.getData();
+        if (baseSetting == null) {
+            throw new ServiceException("售后设置获取失败");
+        }
+        String content = baseSetting.getContent();
+        JSONObject jsonObject = JSONObject.parseObject(content);
+        Long days = jsonObject.getLong("days");
+        commissionService.addToCommissionDelayQueue(order.getId(), LocalDateTime.now().plusDays(days));
     }
 
 

--
Gitblit v1.7.1