Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

puzhibing

2024-08-31 02382a97294be4bff8b7139ea3ebb663fa48fa7c

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

@@ -25,7 +25,9 @@
import javax.annotation.Resource;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -61,7 +63,7 @@
    * @return
    */
   @Override
   public List<MyExchangeOrderList> getMyExchangeOrder(GetMyExchangeOrder query) {
   public Map<String, Object> getMyExchangeOrder(GetMyExchangeOrder query) {
      Long userid = tokenService.getLoginUserApplet().getUserId();
      LambdaQueryWrapper<TExchangeOrder> wrapper = new LambdaQueryWrapper<TExchangeOrder>().eq(TExchangeOrder::getDelFlag, 0).eq(TExchangeOrder::getAppUserId, userid);
      if(query.getStatus() == 0){
@@ -69,7 +71,9 @@
      }else{
         wrapper.eq(TExchangeOrder::getStatus, query.getStatus());
      }
      List<TExchangeOrder> list = this.list(wrapper.orderByDesc(TExchangeOrder::getCreateTime).last(" limit " + query.getPageCurr() + "," + query.getPageSize()));
      long count = this.count(wrapper);
      Integer pageCurr = (query.getPageCurr() - 1) * query.getPageSize();
      List<TExchangeOrder> list = this.list(wrapper.orderByDesc(TExchangeOrder::getCreateTime).last(" limit " + pageCurr + "," + query.getPageSize()));
      List<MyExchangeOrderList> pageList = new ArrayList<>();
      for (TExchangeOrder tExchangeOrder : list) {
         MyExchangeOrderList exchangeOrderList = new MyExchangeOrderList();
@@ -86,7 +90,7 @@
            name = goods.getName();
            imgUrl = goods.getCoverPicture();
         }else{
            TCoupon coupon = couponClient.getCouponById1(tExchangeOrder.getGoodsId()).getData();
            TCoupon coupon = couponClient.getCouponById1(tExchangeOrder.getCouponId()).getData();
            name = coupon.getName();
            imgUrl = coupon.getCoverPicture();
         }
@@ -94,7 +98,10 @@
         exchangeOrderList.setImgUrl(imgUrl);
         pageList.add(exchangeOrderList);
      }
      return pageList;
      Map<String, Object> map = new HashMap<>();
      map.put("list", pageList);
      map.put("total", count);
      return map;
   }
   
   
@@ -109,10 +116,12 @@
      ExchangeOrderGoodsInfo info = new ExchangeOrderGoodsInfo();
      info.setId(id);
      info.setStatus(exchangeOrder.getStatus());
      TAppUserAddress userAddress = appUserAddressClient.getAppUserAddressById(exchangeOrder.getAppUserAddressId()).getData();
      info.setConsignee(userAddress.getName());
      info.setPhone(userAddress.getPhone());
      info.setAddress(userAddress.getAddress());
      if(null != exchangeOrder.getAppUserAddressId()){
         TAppUserAddress userAddress = appUserAddressClient.getAppUserAddressById(exchangeOrder.getAppUserAddressId()).getData();
         info.setConsignee(userAddress.getName());
         info.setPhone(userAddress.getPhone());
         info.setAddress(userAddress.getAddress());
      }
      info.setExpressCompany(exchangeOrder.getExpressCompany());
      info.setExpressNumber(exchangeOrder.getExpressNumber());
      String name = "";
@@ -122,7 +131,7 @@
         name = goods.getName();
         imgUrl = goods.getCoverPicture();
      }else{
         TCoupon coupon = couponClient.getCouponById1(exchangeOrder.getGoodsId()).getData();
         TCoupon coupon = couponClient.getCouponById1(exchangeOrder.getCouponId()).getData();
         info.setCouponType(coupon.getType());
         info.setDays(coupon.getDays());
         info.setEndTime(coupon.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -137,8 +146,12 @@
      info.setCreateTime(exchangeOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
      info.setPoints(exchangeOrder.getPoints());
      info.setRemark(exchangeOrder.getRemark());
      info.setDeliveryTime(exchangeOrder.getConsignerTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
      info.setFinishTime(exchangeOrder.getReceivingTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
      if(null != exchangeOrder.getConsignerTime()){
         info.setDeliveryTime(exchangeOrder.getConsignerTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
      }
      if(null != exchangeOrder.getReceivingTime()){
         info.setFinishTime(exchangeOrder.getReceivingTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
      }
      return info;
   }

@@ -155,7 +168,9 @@
      }
      PageInfo<TExchangeOrder> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
      List<TExchangeOrder> list = this.baseMapper.pageList(pageInfo,query,startTime1,startTime2);

      for (TExchangeOrder tExchangeOrder : list) {
         tExchangeOrder.setUid(tExchangeOrder.getId().toString());
      }
      pageInfo.setRecords(list);
      return pageInfo;
    }