zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
Cauchy
2023-10-23 16:41:00 +08:00
parent 9b37d2126a
commit 3a59fdb860
5 changed files with 200 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/book/service/BuyOrderService.java
View File

@@ -40,7 +40,7 @@ public interface BuyOrderService extends IService<BuyOrder> {
* @param requestVo
* @return
*/
List<BuyOrderResponseVo> orderList(BuyOrderListRequestVo requestVo);
Map<String,Object> orderList(BuyOrderListRequestVo requestVo);
/**
* 订单拆分发货

34
src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
View File

@@ -305,20 +305,29 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
}
@Override
public List<BuyOrderResponseVo> orderList(BuyOrderListRequestVo requestVo) {
public Map<String, Object> orderList(BuyOrderListRequestVo requestVo) {
Page<BuyOrder> buyOrderPage = new Page<>(requestVo.getPageIndex(), requestVo.getPageSize());
List<BuyOrderResponseVo> result = new ArrayList<>();
List<BuyOrderResponseVo> data = new ArrayList<>();
QueryWrapper<BuyOrder> buyOrderQueryWrapper = new QueryWrapper<>();
buyOrderQueryWrapper.like(StringUtils.isNotBlank(requestVo.getSearchKeyWord()), "order_sn", requestVo.getSearchKeyWord());
buyOrderQueryWrapper.eq(StringUtils.isNotBlank(requestVo.getOrderStatus()), "order_status", requestVo.getOrderStatus());
buyOrderQueryWrapper.gt(requestVo.getStartTime() != null, "create_time", requestVo.getStartTime());
buyOrderQueryWrapper.lt(requestVo.getEndTime() != null, "create_time", requestVo.getStartTime());
Integer totalSize = list(buyOrderQueryWrapper).size();
Integer totalPage = totalSize / requestVo.getPageSize() + 1;
Page<BuyOrder> page = page(buyOrderPage, buyOrderQueryWrapper);
List<BuyOrder> buyOrderList = page.getRecords();
for (BuyOrder buyOrder : buyOrderList) {
BuyOrderResponseVo responseVo = setBuyOrderInfo(buyOrder);
result.add(responseVo);
data.add(responseVo);
}
Map<String, Object> result = new HashMap<>();
result.put("totalDataSize", totalSize);
result.put("totalPage", totalPage);
result.put("data", data);
result.put("currentPage", requestVo.getPageIndex());
result.put("pageSize", requestVo.getPageSize());
return result;
}
@@ -382,17 +391,28 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
return setBuyOrderInfo(buyOrder);
}
/**
* 设置订单信息
*
* @param buyOrder
* @return
*/
private BuyOrderResponseVo setBuyOrderInfo(BuyOrder buyOrder) {
BuyOrderResponseVo responseVo = new BuyOrderResponseVo();
Integer userId = buyOrder.getUserId();
QueryWrapper<MyUserEntity> userEntityQueryWrapper = new QueryWrapper<>();
userEntityQueryWrapper.eq("id", userId);
MyUserEntity user = myUserService.getOne(userEntityQueryWrapper);
UserResponseVo userResponseVo = new UserResponseVo();
userResponseVo.setUserPhone(user.getTel());
userResponseVo.setUserName(user.getName());
responseVo.setUserInfo(userResponseVo);
if (user != null) {
UserResponseVo userResponseVo = new UserResponseVo();
userResponseVo.setUserPhone(user.getTel());
if (user.getName() != null) {
userResponseVo.setUserName(user.getName());
}
responseVo.setUserInfo(userResponseVo);
}
responseVo.setOrderPrice(buyOrder.getOrderMoney());
responseVo.setOrderType(buyOrder.getOrderType());
BeanUtil.copyProperties(buyOrder, responseVo);
ConsigneeVo consigneeVo = new ConsigneeVo();
consigneeVo.setConsigneeName(buyOrder.getShippingUser());