java/mx_charging_pile.git

			@@ -1,6 +1,7 @@
			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;
			@@ -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;
			@@ -70,24 +73,41 @@

			@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");
			List<ExchangeRecordVO> list = this.baseMapper.pageList(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;
			}
			@@ -96,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{
			@@ -111,7 +131,7 @@
			}
			}
			if (exchangeRecordVO.getStatus()==2){
			if (exchangeRecordVO.getDelFlag() == 1){
			if (exchangeRecordVO.getDelFlag()){
			// 删除了就是已取消状态
			exchangeRecordVO.setStatus(4);
			}else{