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

before test

Browse Source
This commit is contained in:
Cauchy
2023-10-25 13:47:06 +08:00
parent 86027f543c
commit 7792024b15
6 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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
*/
Map<String,Object> orderList(BuyOrderListRequestVo requestVo);
Map<String, Object> orderList(BuyOrderListRequestVo requestVo);
/**
* 订单拆分发货
@@ -52,7 +52,7 @@ public interface BuyOrderService extends IService<BuyOrder> {
BuyOrderResponseVo orderDetail(String orderSn);
Map<Integer, List<String>> decomposeShipment(Integer userId);
Map<String, Object> decomposeShipment(BuyOrderListRequestVo requestVo);
}

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

@@ -236,24 +236,35 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
return userOrderVoList;
}
public Map<Integer, List<String>> decomposeShipment(Integer userId) {
@Override
public Map<String, Object> decomposeShipment(BuyOrderListRequestVo requestVo) {
Page<BuyOrder> buyOrderPage = new Page<>();
List<BuyOrderResponseVo> data = new ArrayList<>();
BuyOrder requestBuyOrder = getById(requestVo.getOrderId());
Integer addressId = requestBuyOrder.getAddressId();
Integer userId = requestBuyOrder.getUserId();
QueryWrapper<BuyOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("del_flag", 0);
queryWrapper.eq("order_status",1);
queryWrapper.eq("userId", userId);
queryWrapper.eq("order_status", Constants.ORDER_STATUS_TO_BE_SHIPPED);
queryWrapper.eq("user_id", userId);
queryWrapper.eq("address_id", addressId);
queryWrapper.eq("address_modified", 0);
List<BuyOrder> buyOrderList = list(queryWrapper);
Map<Integer, List<String>> result = new HashMap<>();
Integer totalSize = count(queryWrapper);
Integer totalPage = totalSize / requestVo.getPageSize() + 1;
Page<BuyOrder> page = page(buyOrderPage, queryWrapper);
List<BuyOrder> buyOrderList = page.getRecords();
for (BuyOrder buyOrder : buyOrderList) {
if (result.containsKey(buyOrder.getAddressId())) {
List<String> orderSnList = result.get(buyOrder.getAddressId());
orderSnList.add(buyOrder.getOrderSn());
} else {
List<String> orderSnList = new ArrayList<>();
result.put(buyOrder.getAddressId(), orderSnList);
}
BuyOrderResponseVo responseVo = setBuyOrderInfo(buyOrder);
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;
}
/**
@@ -413,12 +424,9 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
int count = buyOrderProductService.count(buyOrderProductQueryWrapper);
if (count == 0) {
buyorder.setOrderStatus(Constants.ORDER_STATUS_SHIPPED);
} else {
buyorder.setOrderStatus(Constants.ORDER_STATUS_PART_SHIPPED);
}
}
updateBatchById(buyOrderList);
}
@Override