From 22875a9b883293aa88c9ea02103a1e218835c6bc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:03:19 +0800
Subject: [PATCH] 修改分佣逻辑

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java |   66 ++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 13 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 fa009b9..25fc793 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
@@ -26,8 +26,14 @@
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -141,13 +147,6 @@
     })
     @GetMapping("/confirm/{orderId}")
     public R<Void> confirm(@PathVariable("orderId") Long orderId){
-        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("售后设置获取失败");
@@ -159,7 +158,11 @@
         String content = baseSetting.getContent();
         JSONObject jsonObject = JSONObject.parseObject(content);
         Long days = jsonObject.getLong("days");
-        commissionService.addToCommissionDelayQueue(orderId, LocalDateTime.now().plusDays(days));
+        Order order = orderService.getById(orderId);
+        order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
+        order.setIsCommission(0);
+        order.setOrderStatus(OrderStatus.COMPLETED.getCode());
+        orderService.updateById(order);
         return R.ok();
     }
 
@@ -224,7 +227,7 @@
     }
     @PostMapping("/byShopId")
     public R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId){
-        return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).groupBy(Order::getAppUserId).list());
+        return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).list());
     }
 
     
@@ -232,10 +235,10 @@
     
     
     
-    @PutMapping("/confirmDelivery/{orderId}")
+    @PostMapping("/confirmDelivery")
     @ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
-    public R confirmDelivery(@PathVariable("orderId") String orderId, String code){
-        return orderService.confirmDelivery(orderId, code);
+    public R confirmDelivery(@RequestBody ConfirmDelivery confirmDelivery){
+        return orderService.confirmDelivery(confirmDelivery.getOrderId(), confirmDelivery.getCode());
     }
     
     
@@ -273,7 +276,44 @@
     @ApiOperation(value = "订单统计", tags = {"管理后台-首页统计"})
     public R<OrderStatistics> getOrderStatistics(@RequestParam("startTime") String startTime,
                                                  @RequestParam("endTime") String endTime){
-        OrderStatistics orderStatistics = orderMapper.getOrderStatistics(LocalDateTime.parse(startTime), LocalDateTime.parse(endTime));
+
+        List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
+                .between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+
+
+        Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
+                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+
+        List<OrderStatisticsDetail> orderStatisticsDetails = new ArrayList<>();
+        map.forEach((key, value) -> {
+            int serviceTotal = 0;
+            int singleTotal = 0;
+            int total = 0;
+            BigDecimal totalMoney = BigDecimal.ZERO;
+            BigDecimal serviceTotalMoney = BigDecimal.ZERO;
+            BigDecimal singleTotalMoney = BigDecimal.ZERO;
+            OrderStatisticsDetail orderStatisticsDetail = new OrderStatisticsDetail();
+            for (Order order : value) {
+                if (order.getOrderType().equals(1)) {
+                    serviceTotal++;
+                    serviceTotalMoney = serviceTotalMoney.add(order.getPaymentAmount());
+                }else if (order.getOrderType().equals(2)){
+                    singleTotal++;
+                    singleTotalMoney = singleTotalMoney.add(order.getPaymentAmount());
+                }
+                total++;
+                totalMoney = totalMoney.add(order.getPaymentAmount());
+            }
+            orderStatisticsDetail.setDate(key);
+            orderStatisticsDetail.setServiceTotal(serviceTotal);
+            orderStatisticsDetail.setSingleTotal(singleTotal);
+            orderStatisticsDetail.setTotal(total);
+            orderStatisticsDetails.add(orderStatisticsDetail);
+        });
+        OrderStatistics orderStatistics = orderMapper.getOrderStatistics(startTime, endTime);
+        if(null != orderStatistics){
+            orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
+        }
         return R.ok(orderStatistics);
     }
 

--
Gitblit v1.7.1