Merge remote-tracking branch 'origin/master'

luodangjia

2024-09-12 e9dcc1d3da82d6de18a81279c3f87773de7b4cfa

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

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserAddressClient;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.api.model.TAppUserAddress;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
@@ -51,8 +53,9 @@
   
   @Resource
   private AppUserAddressClient appUserAddressClient;
	
	

   @Resource
   private AppUserClient appUserClient;
   
   
   
@@ -72,8 +75,7 @@
         wrapper.eq(TExchangeOrder::getStatus, query.getStatus());
      }
      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<TExchangeOrder> list = this.list(wrapper.orderByDesc(TExchangeOrder::getCreateTime).last(" limit " + query.getPageCurr() + "," + query.getPageSize()));
      List<MyExchangeOrderList> pageList = new ArrayList<>();
      for (TExchangeOrder tExchangeOrder : list) {
         MyExchangeOrderList exchangeOrderList = new MyExchangeOrderList();
@@ -168,7 +170,29 @@
      }
      PageInfo<TExchangeOrder> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
      List<TExchangeOrder> list = this.baseMapper.pageList(pageInfo,query,startTime1,startTime2);

      for (TExchangeOrder tShoppingOrder : list) {
         tShoppingOrder.setUid(tShoppingOrder.getId().toString());
         switch (tShoppingOrder.getOrderType()){
            case 1:
               TGoods data = goodsClient.getGoodsById(tShoppingOrder.getGoodsId()).getData();
               if (data!=null){
                  tShoppingOrder.setName(data.getName());
               }
               break;
            case 2:
               TCoupon data1 = couponClient.getCouponById1(tShoppingOrder.getCouponId()).getData();
               if (data1!=null){
                  tShoppingOrder.setName(data1.getName());
               }
               break;
         }
         if (tShoppingOrder.getAppUserId() != null){
            TAppUser data = appUserClient.getUserById(tShoppingOrder.getAppUserId()).getData();
            if (data!=null){
               tShoppingOrder.setPhone(data.getPhone());
            }
         }
      }
      pageInfo.setRecords(list);
      return pageInfo;
    }