From 657d9812259a5c100b2afb71a9eae1769d9432cb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 29 八月 2024 15:38:50 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java
index d554e24..554db1a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java
+++ b/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();
@@ -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 = "";
@@ -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;
}
--
Gitblit v1.7.1