diff --git a/src/main/java/com/peanut/config/Constants.java b/src/main/java/com/peanut/config/Constants.java index b9b09bec..6ebbf167 100644 --- a/src/main/java/com/peanut/config/Constants.java +++ b/src/main/java/com/peanut/config/Constants.java @@ -19,17 +19,14 @@ public class Constants { */ public static final String ORDER_STATUS_SHIPPED = "2"; /** - * 订单状态 - 已发货 + * 订单状态 - 已完成 */ public static final String ORDER_STATUS_FINISHED = "3"; /** * 订单状态 - 交易失败 */ public static final String ORDER_STATUS_FAIL = "4"; - /** - * 订单状态 - 已部分发货 - */ - public static final String ORDER_STATUS_PART_SHIPPED = "5"; + /** * 订单状态 - 全部 */ 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 b623c9db..f082a366 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -89,9 +89,9 @@ public class BuyOrderController { @Autowired private CountyService countyService; - @RequestMapping(value = "/decomposeShipment", method = RequestMethod.GET) - public R decomposeShipment(@RequestParam("userId") Integer userId) { - Map> result = buyOrderService.decomposeShipment(userId); + @RequestMapping(value = "/decomposeShipment", method = RequestMethod.POST) + public R decomposeShipment(@RequestBody BuyOrderListRequestVo requestVo) { + Map result = buyOrderService.decomposeShipment(requestVo); return R.ok().put("result", result); } diff --git a/src/main/java/com/peanut/modules/book/controller/ExpressController.java b/src/main/java/com/peanut/modules/book/controller/ExpressController.java index 472ed012..fd17b25b 100644 --- a/src/main/java/com/peanut/modules/book/controller/ExpressController.java +++ b/src/main/java/com/peanut/modules/book/controller/ExpressController.java @@ -10,11 +10,9 @@ import com.peanut.modules.book.service.ExpressCompanyService; import com.peanut.modules.book.service.ExpressOrderService; import com.peanut.modules.book.vo.ExpressCompanyVo; import com.peanut.modules.book.vo.response.PrintTemplateVo; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.HashMap; @@ -83,11 +81,11 @@ public class ExpressController { return R.ok().put("result", result); } - @RequestMapping(value = "/printTemplate", method = RequestMethod.GET) - public R printTemplate(@RequestParam("expressOrderId") Integer expressOrderId) { + @RequestMapping(value = "/printTemplate", method = RequestMethod.POST) + public R printTemplate(@RequestBody List expressOrderIdList) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.set("template_printed", 1); - updateWrapper.eq("id", expressOrderId); + updateWrapper.in("id", expressOrderIdList); expressOrderService.update(updateWrapper); return R.ok(); } diff --git a/src/main/java/com/peanut/modules/book/service/BuyOrderService.java b/src/main/java/com/peanut/modules/book/service/BuyOrderService.java index 53050113..ddb4a0f9 100644 --- a/src/main/java/com/peanut/modules/book/service/BuyOrderService.java +++ b/src/main/java/com/peanut/modules/book/service/BuyOrderService.java @@ -40,7 +40,7 @@ public interface BuyOrderService extends IService { * @param requestVo * @return */ - Map orderList(BuyOrderListRequestVo requestVo); + Map orderList(BuyOrderListRequestVo requestVo); /** * 订单拆分发货 @@ -52,7 +52,7 @@ public interface BuyOrderService extends IService { BuyOrderResponseVo orderDetail(String orderSn); - Map> decomposeShipment(Integer userId); + Map decomposeShipment(BuyOrderListRequestVo requestVo); } \ No newline at end of file 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 364e2c53..6f6b24e5 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 @@ -236,24 +236,35 @@ public class BuyOrderServiceImpl extends ServiceImpl impl return userOrderVoList; } - public Map> decomposeShipment(Integer userId) { + @Override + public Map decomposeShipment(BuyOrderListRequestVo requestVo) { + Page buyOrderPage = new Page<>(); + List data = new ArrayList<>(); + BuyOrder requestBuyOrder = getById(requestVo.getOrderId()); + Integer addressId = requestBuyOrder.getAddressId(); + Integer userId = requestBuyOrder.getUserId(); QueryWrapper 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 buyOrderList = list(queryWrapper); - Map> result = new HashMap<>(); + Integer totalSize = count(queryWrapper); + Integer totalPage = totalSize / requestVo.getPageSize() + 1; + Page page = page(buyOrderPage, queryWrapper); + List buyOrderList = page.getRecords(); for (BuyOrder buyOrder : buyOrderList) { - if (result.containsKey(buyOrder.getAddressId())) { - List orderSnList = result.get(buyOrder.getAddressId()); - orderSnList.add(buyOrder.getOrderSn()); - } else { - List orderSnList = new ArrayList<>(); - result.put(buyOrder.getAddressId(), orderSnList); - } + BuyOrderResponseVo responseVo = setBuyOrderInfo(buyOrder); + data.add(responseVo); } + Map 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 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 diff --git a/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java b/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java index eecab5f1..a7a3ec4c 100644 --- a/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java +++ b/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java @@ -11,6 +11,10 @@ import java.util.Date; */ @Data public class BuyOrderListRequestVo { + /** + * id + */ + private Integer orderId; /** * 页号 */