From 1b6c4cd60f3882c400d30af367bd4c5960fbd4a1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 10 四月 2023 15:02:24 +0800
Subject: [PATCH] 优化管理
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
index 03b5969..a82dbcc 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
@@ -76,7 +76,8 @@
// 优惠券数据,,,通过订单找到该区域的下单人，找出优惠券信息
List<Integer> userIds = orders.stream().map(TOrder::getUserId).collect(Collectors.toList());
- List<TUserToCoupon> tUserToCoupons = tUserToCouponMapper.selectList(new EntityWrapper<TUserToCoupon>().in("userId", userIds));
+ List<TUserToCoupon> tUserToCoupons = tUserToCouponMapper.selectList(new EntityWrapper<TUserToCoupon>().eq("objectId", tBranchOfficeId)
+ .eq("roleType",2));
// 优惠券有效数量
int validCount = tUserToCoupons.stream().mapToInt(TUserToCoupon::getValidCount).sum();
// 过期数量
@@ -127,6 +128,7 @@
wrapper.eq("status",status);
}
wrapper.ne("status", StatusEnum.DELETE.getCode());
+ wrapper.orderBy("createTime",false);
// 判断代理商 分公司
Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
@@ -165,7 +167,8 @@
// 优惠券数据,,,通过订单找到该区域的下单人，找出优惠券信息
List<Integer> userIds = orderList.stream().map(TOrder::getUserId).collect(Collectors.toList());
- List<TUserToCoupon> tUserToCoupons = tUserToCouponMapper.selectList(new EntityWrapper<TUserToCoupon>().in("userId", userIds));
+ List<TUserToCoupon> tUserToCoupons = tUserToCouponMapper.selectList(new EntityWrapper<TUserToCoupon>().eq("objectId", tBranchOfficeResp.getId())
+ .eq("roleType",2));
// 优惠券有效数量
int validCount = tUserToCoupons.stream().mapToInt(TUserToCoupon::getValidCount).sum();
// 过期数量
--
Gitblit v1.7.1