From d0b043b8fa5f19d1295cac50fece0c65fceb3920 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 17 一月 2025 17:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java |   43 +++++++++++++++++++++++++++++--------------
 1 files changed, 29 insertions(+), 14 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 992a1c5..e68d5a8 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
@@ -132,8 +132,8 @@
             @ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "String"),
     })
     @GetMapping("/writeOff")
-    public R<Void> writeOff(String id, Integer shopId, String technicianId){
-        orderService.writeOff(id, shopId, technicianId);
+    public R<Void> writeOff(String code, Integer shopId, String technicianId){
+        orderService.writeOff(code, shopId, technicianId);
         return R.ok();
     }
 
@@ -234,12 +234,25 @@
 
 
     @PostMapping("/byUserId")
-    public R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId){
-        return R.ok(orderService.lambdaQuery().eq(Order::getAppUserId, appUserId).list());
+    public R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId){
+        List<Order> list = orderService.lambdaQuery()
+                .eq(Order::getAppUserId, appUserId)
+                .eq(Order::getShopId, shopId)
+                .eq(Order::getDistributionMode, 1)
+                .ne(Order::getOrderStatus,5).list();
+        return R.ok(list);
     }
     @PostMapping("/byShopId")
     public R<List<Order>> byShopId(@RequestParam("shopId") Integer shopId){
         return R.ok(orderService.lambdaQuery().isNotNull(Order::getEndTime).eq(Order::getShopId, shopId).list());
+    }
+    @PostMapping("/byShopIdAndUserId")
+    public R<List<Order>> byShopIdAndUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId){
+        List<Order> list = orderService.lambdaQuery().isNotNull(Order::getEndTime)
+                .eq(Order::getShopId, shopId)
+                .eq(Order::getAppUserId, appUserId)
+                .in(Order::getOrderStatus, 4, 7, 8).list();
+        return R.ok(list);
     }
 
     
@@ -271,9 +284,10 @@
     @ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
     public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId){
         OrderInfoVo orderInfo = orderService.getOrderInfo(orderId);
-        RefundPass refundPass = refundPassService.lambdaQuery().eq(RefundPass::getOrderId, orderId).one();
-        if (refundPass!=null){
-            orderInfo.setRefundPassId(refundPass.getId().toString());
+        RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderId)
+                .eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
+        if (one!=null){
+            orderInfo.setRefundPassId(one.getId().toString());
         }
         return R.ok(orderInfo);
     }
@@ -296,6 +310,7 @@
         Long userid = tokenService.getLoginUser().getUserid();
         SysUser sysUser = sysUserClient.getSysUser(userid).getData();
         List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
+                        .ne(Order::getOrderStatus,5)
                 .eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
                 .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")))
                 .orderByAsc(Order::getCreateTime));
@@ -320,14 +335,14 @@
             for (Order order : value) {
                 if (order.getOrderType().equals(1)) {
                     serviceTotal++;
-                    serviceTotalMoney = serviceTotalMoney.add(order.getPaymentAmount());
+                    serviceTotalMoney = serviceTotalMoney.add(order.getTotalAmount());
                     total++;
-                    totalMoney = totalMoney.add(order.getPaymentAmount());
-                }else if (order.getOrderType().equals(2) && 1 == order.getDistributionMode()){
+                    totalMoney = totalMoney.add(order.getTotalAmount());
+                }else if (order.getOrderType().equals(2)){
                     singleTotal++;
-                    singleTotalMoney = singleTotalMoney.add(order.getPaymentAmount());
+                    singleTotalMoney = singleTotalMoney.add(order.getTotalAmount());
                     total++;
-                    totalMoney = totalMoney.add(order.getPaymentAmount());
+                    totalMoney = totalMoney.add(order.getTotalAmount());
                 }
             }
             orderStatisticsDetail.setDate(key);
@@ -354,7 +369,7 @@
                         } catch (ParseException e) {
                             throw new RuntimeException(e);
                         }
-                    }).reversed())
+                    }))
                     .collect(Collectors.toList());
             orderStatistics.setOrderStatisticsDetailList(sortedDetails);
         }
@@ -418,7 +433,7 @@
      */
     @PostMapping("/getGoodsSaleNum")
     public R<Integer> getGoodsSaleNum(@RequestParam("goodsId") Integer goodsId, @RequestParam("type") Integer type){
-        Integer goodsSaleNum = orderService.getGoodsSaleNum(goodsId, type);
+        Integer goodsSaleNum = orderService.getGoodsSaleNum(goodsId, type, null);
         return R.ok(goodsSaleNum);
     }
 

--
Gitblit v1.7.1