diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index 169709f8..95c8c4de 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -206,7 +206,7 @@ public class BuyOrderController { Set sn_no = new HashSet(); for (BuyOrderDetail buyOrderDetail : orderDetail) { resultOrder.add(buyOrderDetail); - sn_no.add(buyOrderDetail.getExpressOrderId()); +// sn_no.add(buyOrderDetail.getExpressOrderId()); } UserRecordEntity userRecordEntity = userRecordService.getBaseMapper().selectOne(new QueryWrapper() diff --git a/src/main/java/com/peanut/modules/book/entity/BuyOrderDetail.java b/src/main/java/com/peanut/modules/book/entity/BuyOrderDetail.java index 3e202427..cf1f6a16 100644 --- a/src/main/java/com/peanut/modules/book/entity/BuyOrderDetail.java +++ b/src/main/java/com/peanut/modules/book/entity/BuyOrderDetail.java @@ -92,8 +92,4 @@ public class BuyOrderDetail implements Serializable { * 评价 ID */ private Integer recordId; - /** - * 快递订单 ID - */ - private String expressOrderId; } diff --git a/src/main/java/com/peanut/modules/book/service/ExpressOrderService.java b/src/main/java/com/peanut/modules/book/service/ExpressOrderService.java index a2827387..811cde31 100644 --- a/src/main/java/com/peanut/modules/book/service/ExpressOrderService.java +++ b/src/main/java/com/peanut/modules/book/service/ExpressOrderService.java @@ -14,7 +14,7 @@ public interface ExpressOrderService extends IService { * @param expressOrder * @throws Exception */ - void placeExpressOrder(UserAddress userAddress, ExpressOrder expressOrder) throws Exception; + String placeExpressOrder(UserAddress userAddress, ExpressOrder expressOrder); } diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index 0f567022..8e27c933 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -244,7 +244,7 @@ public class BuyOrderServiceImpl extends ServiceImpl buyOrderDetailId) throws Exception { + public void createSplitPackageOrder(String expressCompanyCode, Integer userAddressId, List buyOrderDetailId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("id", buyOrderDetailId); List buyOrderDetailList = buyOrderDetailService.list(queryWrapper); @@ -273,6 +273,10 @@ public class BuyOrderServiceImpl extends ServiceImpl