From 4012bded166a10d57cf29dc4d518433ff3fdd99d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 七月 2025 11:21:20 +0800
Subject: [PATCH] 修改监管上传bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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..f4d78d6 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
@@ -15,20 +15,15 @@
import com.ruoyi.account.service.TAppCouponService;
import com.ruoyi.account.service.TAppUserVipDetailService;
import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient;
-import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.order.api.query.TChargingCountQuery;
-import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.feignClient.OtherClient;
import com.ruoyi.other.api.feignClient.VipClient;
-import io.swagger.models.auth.In;
-import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -42,6 +37,7 @@
import java.util.Comparator;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -73,11 +69,26 @@
@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 (StringUtils.hasLength(dto.getPhone())){
+ List<Long> collect = tAppUserMapper.selectList(new QueryWrapper<TAppUser>().like("phone", dto.getPhone())).stream()
+ .map(TAppUser::getId).collect(Collectors.toList());
+ if(collect.isEmpty()){
+ collect.add(-1L);
+ }
+ wrapper.in("app_user_id",collect);
+ }
+ 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 +98,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