From a17f15e196a89ab8a35fc8344384a6996c0864aa Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 12 八月 2024 17:02:37 +0800 Subject: [PATCH] 电站详情完成 --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java | 67 +++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 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 f626664..98dc39f 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 @@ -6,11 +6,17 @@ import com.ruoyi.account.api.vo.ExchangeRecordVO; import com.ruoyi.account.mapper.TAppCouponMapper; import com.ruoyi.account.service.TAppCouponService; +import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.web.page.PageInfo; +import com.ruoyi.order.api.feignClient.OrderClient; import com.ruoyi.other.api.domain.TCoupon; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; /** @@ -24,10 +30,71 @@ @Service public class TAppCouponServiceImpl extends ServiceImpl<TAppCouponMapper, TAppCoupon> implements TAppCouponService { + @Autowired + private OrderClient orderClient; @Override public PageInfo<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) { + 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); + // 订单ids + StringBuilder stringBuilder = new StringBuilder(); + for (ExchangeRecordVO exchangeRecordVO : list) { + switch (exchangeRecordVO.getWaysToObtain()){ + case 1: + if (exchangeRecordVO.getOrderId()!=null){ + stringBuilder.append(exchangeRecordVO.getOrderId()).append(","); + }else{ + stringBuilder.append("0").append(","); + } + break; + case 2: + if (exchangeRecordVO.getOrderId()!=null){ + stringBuilder.append("-").append(exchangeRecordVO.getOrderId()).append(","); + }else{ + stringBuilder.append("-").append("0").append(","); + } + break; + } + Date date = DateUtils.toDate(exchangeRecordVO.getEndTime()); + Date date1 = DateUtils.toDate(exchangeRecordVO.getCreateTime()); + exchangeRecordVO.setEndTime1(format.format(date)); + exchangeRecordVO.setCreateTime1(format.format(date1)); + if (exchangeRecordVO.getStatus()==1){ + if (exchangeRecordVO.getDelFlag() == 1){ + // 删除了 就是已取消状态 + exchangeRecordVO.setStatus(4); + }else{ + // 未删除 判断endTime是否过期 + // 设置了过期时间 + if (exchangeRecordVO.getEndTime().isBefore(java.time.LocalDateTime.now())){ + exchangeRecordVO.setStatus(3); + }else{ + // 没过期 + exchangeRecordVO.setStatus(1); + } + } + } + if (exchangeRecordVO.getStatus()==2){ + if (exchangeRecordVO.getDelFlag() == 1){ + // 删除了 就是已取消状态 + exchangeRecordVO.setStatus(4); + }else{ + exchangeRecordVO.setStatus(2); + } + } + } + + // 去除最后一个字符 + if (StringUtils.hasText(stringBuilder.toString())){ + String string = stringBuilder.deleteCharAt(stringBuilder.length() - 1).toString(); + // 远程调用 查询关联的订单编号 + List<String> data = orderClient.getCodeByOrderId(string).getData(); + for (int i = 0; i < list.size(); i++) { + list.get(i).setOrderId(data.get(i)); + } + } + pageInfo.setRecords(list); return pageInfo; } -- Gitblit v1.7.1