From 036569c419291dc4cbe72b23b0450fc0dec70974 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 12 九月 2024 10:27:17 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
index 545bb1f..8c230d6 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -73,11 +73,17 @@
@Override
public List<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) {
+ List<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
QueryWrapper<TAppCoupon> wrapper = new QueryWrapper<>();
wrapper.eq("coupon_id",dto.getCouponId());
+ wrapper.in("ways_to_obtain",integers);
+ if (dto.getStatus()!=null){
+ wrapper.eq("status",dto.getStatus());
+ }
List<TAppCoupon> tAppCoupons = this.baseMapper.selectList(wrapper);
-
List<ExchangeRecordVO> list = new ArrayList<>();
// 订单ids
StringBuilder stringBuilder = new StringBuilder();
@@ -87,6 +93,8 @@
list.add(exchangeRecordVO);
}
for (ExchangeRecordVO exchangeRecordVO : list) {
+ TAppUser tAppUser = tAppUserMapper.selectById(exchangeRecordVO.getAppUserId());
+ if (tAppUser!=null)exchangeRecordVO.setPhone(tAppUser.getPhone());
switch (exchangeRecordVO.getWaysToObtain()){
case 1:
if (exchangeRecordVO.getId()!=null){
--
Gitblit v1.7.1