From c90a8ac772937f8f084356ea1f04c5dba1d9e5d5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 一月 2025 11:15:33 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 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 e5b1b25..4cfea56 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,8 +16,10 @@
import com.ruoyi.order.enums.OrderStatus;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.model.Order;
+import com.ruoyi.order.model.RefundPass;
import com.ruoyi.order.service.CommissionService;
import com.ruoyi.order.service.OrderService;
+import com.ruoyi.order.service.RefundPassService;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
import com.ruoyi.order.util.vo.MapTrackKD100Vo;
import com.ruoyi.order.vo.*;
@@ -29,6 +31,7 @@
import io.swagger.annotations.*;
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;
@@ -69,6 +72,8 @@
private OrderMapper orderMapper;
@Resource
private SysUserClient sysUserClient;
+ @Resource
+ private RefundPassService refundPassService;
/**
@@ -127,9 +132,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "String"),
})
- @GetMapping("/writeOff/{id}/{shopId}")
- public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId){
- orderService.writeOff(id, shopId);
+ @GetMapping("/writeOff")
+ public R<Void> writeOff(String code, Integer shopId, String technicianId){
+ orderService.writeOff(code, shopId, technicianId);
return R.ok();
}
@@ -205,6 +210,7 @@
public R<Void> updateOrderStatus(@RequestBody Order order){
Order order1 = orderService.getById(order.getId());
order1.setOrderStatus(order.getOrderStatus());
+ order1.setOldOrderStatus(order.getOldOrderStatus());
orderService.updateById(order1);
return R.ok();
}
@@ -229,12 +235,31 @@
@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(null != shopId && -1 != shopId, Order::getShopId, shopId)
+ .eq(Order::getDistributionMode, 1)
+ .eq(Order::getPayStatus, 2)
+ .isNull(Order::getRefundStatus)
+ .eq(Order::getDelFlag, 0)
+ .notIn(Order::getOrderStatus, 5, 6).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(null != shopId && -1 != shopId, Order::getShopId, shopId)
+ .eq(Order::getAppUserId, appUserId)
+ .eq(Order::getPayStatus, 2)
+ .isNull(Order::getRefundStatus)
+ .eq(Order::getDelFlag, 0)
+ .notIn(Order::getOrderStatus, 5, 6).list();
+ return R.ok(list);
}
@@ -245,7 +270,7 @@
@PostMapping("/confirmDelivery")
@ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})
public R confirmDelivery(@RequestBody ConfirmDelivery confirmDelivery){
- return orderService.confirmDelivery(confirmDelivery.getOrderId(), confirmDelivery.getCode());
+ return orderService.confirmDelivery(confirmDelivery);
}
@@ -266,6 +291,11 @@
@ApiOperation(value = "查询订单详情", tags = {"管理后台-订单管理"})
public R<OrderInfoVo> getOrderInfo(@PathVariable("orderId") Long orderId){
OrderInfoVo orderInfo = orderService.getOrderInfo(orderId);
+ 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);
}
@@ -286,12 +316,19 @@
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = sysUserClient.getSysUser(userid).getData();
- List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>().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"))));
+ 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));
- Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
- .format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ Map<String, List<Order>> map = orderList.stream()
+ .collect(Collectors.groupingBy(
+ item -> item.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),
+ TreeMap::new, // 使用 TreeMap 按键排序
+ Collectors.toList()
+ ));
List<OrderStatisticsDetail> orderStatisticsDetails = new ArrayList<>();
map.forEach((key, value) -> {
@@ -305,13 +342,15 @@
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.getTotalAmount());
}else if (order.getOrderType().equals(2)){
singleTotal++;
- singleTotalMoney = singleTotalMoney.add(order.getPaymentAmount());
+ singleTotalMoney = singleTotalMoney.add(order.getTotalAmount());
+ total++;
+ totalMoney = totalMoney.add(order.getTotalAmount());
}
- total++;
- totalMoney = totalMoney.add(order.getPaymentAmount());
}
orderStatisticsDetail.setDate(key);
orderStatisticsDetail.setServiceTotal(serviceTotal);
@@ -337,7 +376,7 @@
} catch (ParseException e) {
throw new RuntimeException(e);
}
- }).reversed())
+ }))
.collect(Collectors.toList());
orderStatistics.setOrderStatisticsDetailList(sortedDetails);
}
@@ -401,7 +440,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);
}
@@ -474,5 +513,13 @@
orderService.updateById(order);
return R.ok();
}
+
+
+ /**
+ * 导入物流信息
+ */
+ @PostMapping("/importExpress")
+ public R importExpress(@RequestParam("file") MultipartFile file){
+ }
}
--
Gitblit v1.7.1