Merge remote-tracking branch 'origin/master'

xuhy

2024-08-27 b79c0fa3aa4f7dffe18ab419b6cf4ed47ebd22f9

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java

@@ -4,8 +4,11 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserAddressClient;
import com.ruoyi.account.api.model.TAppUserAddress;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.api.query.ShoppingOrderQuery;
import com.ruoyi.order.dto.ExchangeOrderGoodsInfo;
import com.ruoyi.order.dto.GetMyExchangeOrder;
import com.ruoyi.order.dto.MyExchangeOrderList;
@@ -17,6 +20,7 @@
import com.ruoyi.other.api.feignClient.GoodsClient;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.time.format.DateTimeFormatter;
@@ -58,7 +62,7 @@
    */
   @Override
   public List<MyExchangeOrderList> getMyExchangeOrder(GetMyExchangeOrder query) {
      Long userid = tokenService.getLoginUser().getUserid();
      Long userid = tokenService.getLoginUserApplet().getUserId();
      LambdaQueryWrapper<TExchangeOrder> wrapper = new LambdaQueryWrapper<TExchangeOrder>().eq(TExchangeOrder::getDelFlag, 0).eq(TExchangeOrder::getAppUserId, userid);
      if(query.getStatus() == 0){
         wrapper.ne(TExchangeOrder::getStatus, 4);
@@ -82,7 +86,7 @@
            name = goods.getName();
            imgUrl = goods.getCoverPicture();
         }else{
            TCoupon coupon = couponClient.getCouponById(tExchangeOrder.getGoodsId()).getData();
            TCoupon coupon = couponClient.getCouponById1(tExchangeOrder.getGoodsId()).getData();
            name = coupon.getName();
            imgUrl = coupon.getCoverPicture();
         }
@@ -118,7 +122,7 @@
         name = goods.getName();
         imgUrl = goods.getCoverPicture();
      }else{
         TCoupon coupon = couponClient.getCouponById(exchangeOrder.getGoodsId()).getData();
         TCoupon coupon = couponClient.getCouponById1(exchangeOrder.getGoodsId()).getData();
         info.setCouponType(coupon.getType());
         info.setDays(coupon.getDays());
         info.setEndTime(coupon.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -137,4 +141,22 @@
      info.setFinishTime(exchangeOrder.getReceivingTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
      return info;
   }

    @Override
    public PageInfo<TExchangeOrder> pageList(ShoppingOrderQuery query) {
      String startTime1 = null;
      String startTime2 = null;


      if (StringUtils.hasLength(query.getStartTime())){
         String[] split = query.getStartTime().split(" - ");
         startTime1 = split[0];
         startTime2 = split[1];
      }
      PageInfo<TExchangeOrder> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
      List<TExchangeOrder> list = this.baseMapper.pageList(pageInfo,query,startTime1,startTime2);

      pageInfo.setRecords(list);
      return pageInfo;
    }
}