From eb5d7885fa9e4bd20c0827eec9b4cdd48c47b509 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 07 一月 2025 09:11:20 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java |   75 +++++++++++++++++++++++++++++++------
 1 files changed, 63 insertions(+), 12 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 dd4d036..1fe2e7f 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
@@ -16,6 +16,7 @@
 import com.ruoyi.order.model.Order;
 import com.ruoyi.order.service.CommissionService;
 import com.ruoyi.order.service.OrderService;
+import com.ruoyi.order.util.payment.model.RefundCallbackResult;
 import com.ruoyi.order.vo.*;
 import com.ruoyi.other.api.domain.BaseSetting;
 import com.ruoyi.other.api.feignClient.BaseSettingClient;
@@ -25,7 +26,10 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -147,13 +151,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("售后设置获取失败");
@@ -165,7 +162,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();
     }
 
@@ -230,7 +231,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());
     }
 
     
@@ -281,7 +282,7 @@
                                                  @RequestParam("endTime") String endTime){
 
         List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
-                .between(Order::getCreateTime, LocalDateTime.parse(startTime), LocalDateTime.parse(endTime)));
+                .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()
@@ -313,11 +314,61 @@
             orderStatisticsDetail.setTotal(total);
             orderStatisticsDetails.add(orderStatisticsDetail);
         });
-        OrderStatistics orderStatistics = orderMapper.getOrderStatistics(LocalDateTime.parse(startTime), LocalDateTime.parse(endTime));
-        orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
+        OrderStatistics orderStatistics = orderMapper.getOrderStatistics(startTime, endTime);
+        if(null != orderStatistics){
+            orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
+        }
         return R.ok(orderStatistics);
     }
 
 
+    /**
+     * 订单取消支付回退
+     * @param refundCallbackResult
+     * @param response
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/refundPayMoneyCallback")
+    public void refundPayMoneyCallback(RefundCallbackResult refundCallbackResult, HttpServletResponse response){
+        R callback = orderService.refundPayMoneyCallback(refundCallbackResult);
+        if(callback.getCode() == 200){
+            response.setStatus(200);
+            PrintWriter out = null;
+            try {
+                out = response.getWriter();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            out.println("success");
+            out.flush();
+            out.close();
+        }
+    }
+
+
+    /**
+     * 取消订单快递费回退
+     * @param refundCallbackResult
+     * @param response
+     */
+    @ResponseBody
+    @GetMapping("/refundExpressPayMoneyCallback")
+    public void refundExpressPayMoneyCallback(RefundCallbackResult refundCallbackResult, HttpServletResponse response){
+        R callback = orderService.refundExpressPayMoneyCallback(refundCallbackResult);
+        if(callback.getCode() == 200){
+            response.setStatus(200);
+            PrintWriter out = null;
+            try {
+                out = response.getWriter();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            out.println("success");
+            out.flush();
+            out.close();
+        }
+    }
+
 }
 

--
Gitblit v1.7.1