From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:53 +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 | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 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 cd7fa60..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
@@ -1,13 +1,14 @@
package com.ruoyi.account.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.dto.CouponListDto;
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.api.model.TAppUserVipDetail;
import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery;
-import com.ruoyi.account.api.vo.CouponListVOVO;
+import com.ruoyi.other.api.vo.CouponListVOVO;
import com.ruoyi.account.api.vo.ExchangeRecordVO;
import com.ruoyi.account.mapper.TAppCouponMapper;
import com.ruoyi.account.mapper.TAppUserMapper;
@@ -28,6 +29,7 @@
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;
import org.springframework.util.StringUtils;
@@ -36,6 +38,7 @@
import java.math.BigInteger;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
@@ -63,28 +66,48 @@
private ChargingOrderClient chargingOrderClient;
@Autowired
private TAppUserVipDetailService tAppUserVipDetailService;
+ @Autowired
+ private TAppUserMapper tAppUserMapper;
+ @Autowired
+ private TokenService tokenService;
@Override
- public PageInfo<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) {
+ 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");
- PageInfo<ExchangeRecordVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
- List<ExchangeRecordVO> list = this.baseMapper.pageList(pageInfo,dto);
+ 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();
+ for (TAppCoupon tAppCoupon : tAppCoupons) {
+ ExchangeRecordVO exchangeRecordVO = new ExchangeRecordVO();
+ BeanUtils.copyProperties(tAppCoupon,exchangeRecordVO);
+ 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.getOrderId()!=null){
- stringBuilder.append(exchangeRecordVO.getOrderId()).append(",");
+ if (exchangeRecordVO.getId()!=null){
+ stringBuilder.append("-").append(exchangeRecordVO.getId()).append(",");
}else{
stringBuilder.append("0").append(",");
}
break;
case 2:
- if (exchangeRecordVO.getOrderId()!=null){
- stringBuilder.append("-").append(exchangeRecordVO.getOrderId()).append(",");
+ if (exchangeRecordVO.getId()!=null){
+ stringBuilder.append(exchangeRecordVO.getId()).append(",");
}else{
- stringBuilder.append("-").append("0").append(",");
+ stringBuilder.append("0").append(",");
}
break;
}
@@ -93,7 +116,7 @@
exchangeRecordVO.setEndTime1(format.format(date));
exchangeRecordVO.setCreateTime1(format.format(date1));
if (exchangeRecordVO.getStatus()==1){
- if (exchangeRecordVO.getDelFlag() == 1){
+ if (exchangeRecordVO.getDelFlag()){
// 删除了 就是已取消状态
exchangeRecordVO.setStatus(4);
}else{
@@ -108,7 +131,7 @@
}
}
if (exchangeRecordVO.getStatus()==2){
- if (exchangeRecordVO.getDelFlag() == 1){
+ if (exchangeRecordVO.getDelFlag()){
// 删除了 就是已取消状态
exchangeRecordVO.setStatus(4);
}else{
@@ -116,7 +139,6 @@
}
}
}
-
// 去除最后一个字符
if (StringUtils.hasText(stringBuilder.toString())){
String string = stringBuilder.deleteCharAt(stringBuilder.length() - 1).toString();
@@ -126,16 +148,11 @@
list.get(i).setOrderId(data.get(i));
}
}
-
- pageInfo.setRecords(list);
- return pageInfo;
+ return list;
}
- @Autowired
- private TAppUserMapper tAppUserMapper;
- @Autowired
- private TokenService tokenService;
+
@Override
public PageInfo<CouponListVOVO> couponList(CouponListDto dto) {
// todo token获取用户id
--
Gitblit v1.7.1