From 5c620de6f56977c1e0f3ad461b88c0188d2eeeab Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 08 二月 2025 18:20:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 76 +++++++++++++++++++++++++++++++-------
1 files changed, 62 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 d015b58..5b929b8 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
@@ -9,6 +9,7 @@
import com.ruoyi.account.api.model.UserAddress;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -29,15 +30,22 @@
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.*;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotBlank;
import java.io.IOException;
+import java.io.InputStream;
import java.io.PrintWriter;
import java.math.BigDecimal;
+import java.net.URL;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
@@ -237,9 +245,11 @@
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();
+ .eq(null != shopId && -1 != shopId, Order::getShopId, shopId)
+ .eq(Order::getPayStatus, 2)
+ .isNull(Order::getRefundStatus)
+ .eq(Order::getDelFlag, 0)
+ .notIn(Order::getOrderStatus, 5, 6).list();
return R.ok(list);
}
@PostMapping("/byShopId")
@@ -249,16 +259,16 @@
@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(null != shopId && -1 != shopId, Order::getShopId, shopId)
.eq(Order::getAppUserId, appUserId)
- .in(Order::getOrderStatus, 4, 7, 8).list();
+ .eq(Order::getPayStatus, 2)
+ .isNull(Order::getRefundStatus)
+ .eq(Order::getDelFlag, 0)
+ .notIn(Order::getOrderStatus, 5, 6).list();
return R.ok(list);
}
-
-
-
-
+
@PostMapping("/confirmDelivery")
@ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
@@ -335,14 +345,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);
@@ -506,5 +516,43 @@
orderService.updateById(order);
return R.ok();
}
+
+
+ /**
+ * 导入物流信息
+ */
+ @PostMapping("/importExpress")
+ public R importExpress(@RequestBody String url){
+ JSONObject jsonObject = JSONObject.parseObject(url);
+ String url2 = jsonObject.getString("url");
+ orderService.importExpress(url2);
+ return R.ok();
+ }
+
+ /**
+ * 导出订单信息
+ */
+ @GetMapping("/exportExpress")
+ public void exportExpress(HttpServletResponse response,OrderPageList orderPage){
+ PageInfo<OrderPageListVo> orderPageList = orderService.getOrderPageList(orderPage);
+ List<OrderPageListVo> list = orderPageList.getRecords();
+ 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