From 3de79cb08809a47a91d354331ab166ab7cc87dc6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 11:02:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 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 dfd365b..bc929ba 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
@@ -20,6 +20,8 @@
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.BaseSetting;
import com.ruoyi.other.api.feignClient.BaseSettingClient;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.*;
import org.springframework.validation.annotation.Validated;
@@ -31,6 +33,8 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -60,6 +64,8 @@
private BaseSettingClient baseSettingClient;
@Resource
private OrderMapper orderMapper;
+ @Resource
+ private SysUserClient sysUserClient;
/**
@@ -116,11 +122,11 @@
*/
@ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "订单id", name = "id", required = true, dataType = "String"),
})
- @GetMapping("/writeOff/{code}/{shopId}")
- public R<Void> writeOff(@PathVariable("code") String code, @PathVariable("shopId") Integer shopId){
- orderService.writeOff(code, shopId);
+ @GetMapping("/writeOff/{id}/{shopId}")
+ public R<Void> writeOff(@PathVariable("id") String id, @PathVariable("shopId") Integer shopId){
+ orderService.writeOff(id, shopId);
return R.ok();
}
@@ -275,7 +281,9 @@
public R<OrderStatistics> getOrderStatistics(@RequestParam("startTime") String startTime,
@RequestParam("endTime") String endTime){
- List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
+ 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"))));
@@ -306,11 +314,29 @@
orderStatisticsDetail.setServiceTotal(serviceTotal);
orderStatisticsDetail.setSingleTotal(singleTotal);
orderStatisticsDetail.setTotal(total);
+
+ orderStatisticsDetail.setServiceTotalMoney(serviceTotalMoney);
+ orderStatisticsDetail.setSingleTotalMoney(singleTotalMoney);
+ orderStatisticsDetail.setTotalMoney(totalMoney);
orderStatisticsDetails.add(orderStatisticsDetail);
});
- OrderStatistics orderStatistics = orderMapper.getOrderStatistics(startTime, endTime);
+ Integer shopId = null;
+ if(sysUser.getRoleType() == 2){
+ shopId = sysUser.getObjectId();
+ }
+ OrderStatistics orderStatistics = orderMapper.getOrderStatistics(startTime, endTime, shopId);
if(null != orderStatistics){
- orderStatistics.setOrderStatisticsDetailList(orderStatisticsDetails);
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ List<OrderStatisticsDetail> sortedDetails = orderStatisticsDetails.stream()
+ .sorted(Comparator.comparing((OrderStatisticsDetail detail) -> {
+ try {
+ return dateFormat.parse(detail.getDate());
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
+ }
+ }).reversed())
+ .collect(Collectors.toList());
+ orderStatistics.setOrderStatisticsDetailList(sortedDetails);
}
return R.ok(orderStatistics);
}
@@ -390,5 +416,18 @@
return R.ok(shopSaleNum);
}
+
+ /**
+ * 获取所有在指定门店消费的用户id
+ * @param shopId
+ * @return
+ */
+ @PostMapping("/getAppUserByShoppingShop")
+ public R<Set<Long>> getAppUserByShoppingShop(@RequestParam("shopId") Integer shopId){
+ List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getShopId, shopId).eq(Order::getDelFlag, 0)
+ .eq(Order::getPayStatus, 2).in(Order::getOrderStatus, Arrays.asList(1, 2, 3, 4, 7, 8)));
+ Set<Long> collect = list.stream().map(Order::getAppUserId).collect(Collectors.toSet());
+ return R.ok(collect);
+ }
}
--
Gitblit v1.7.1