From 20bf12dc209329b29ac96d01efabaa3a0ff30cb2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 26 一月 2025 17:27:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 dc5342e..1dd6cb4 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
@@ -526,8 +526,10 @@
* 导入物流信息
*/
@PostMapping("/importExpress")
- public R importExpress(String url){
- orderService.importExpress(url);
+ public R importExpress(@RequestBody String url){
+ JSONObject jsonObject = JSONObject.parseObject(url);
+ String url2 = jsonObject.getString("url");
+ orderService.importExpress(url2);
return R.ok();
}
@@ -541,6 +543,20 @@
ExcelUtil<OrderPageListVo> util = new ExcelUtil<OrderPageListVo>(OrderPageListVo.class);
util.exportExcel(response, list, "订单数据");
}
+
+
+ /**
+ * 获取用户订单数量
+ * @param appUserId
+ * @return
+ */
+ @PostMapping("/getOrderCountByAppUserId")
+ public R<Long> getOrderCountByAppUserId(@RequestParam("id") Long appUserId){
+ long count = orderService.count(new LambdaQueryWrapper<Order>().eq(Order::getDelFlag, 0)
+ .eq(Order::getAppUserId, appUserId).in(Order::getOrderStatus, Arrays.asList(1, 2, 3, 4, 7, 8))
+ .eq(Order::getPayStatus, 2));
+ return R.ok(count);
+ }
}
--
Gitblit v1.7.1