diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java index 3c304d618..700cbc049 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java @@ -131,7 +131,7 @@ public class StoreOrderController extends XktBaseController { @Log(title = "订单", businessType = BusinessType.OTHER) @ApiOperation("发货-平台物流") - @PostMapping("ship-platform") + @PostMapping("ship/platform") public R> shipByPlatform(@Valid @RequestBody StoreOrderShipByPlatformReqVO vo) { //TODO 权限 StoreOrderExt orderExt = storeOrderService.shipOrderByPlatform(vo.getStoreOrderId(), @@ -147,7 +147,7 @@ public class StoreOrderController extends XktBaseController { @Log(title = "订单", businessType = BusinessType.OTHER) @ApiOperation("发货-档口物流") - @PostMapping("ship-store") + @PostMapping("ship/store") public R> shipByStore(@Valid @RequestBody StoreOrderShipByStoreReqVO vo) { //TODO 权限 StoreOrderExt orderExt = storeOrderService.shipOrderByStore(vo.getStoreOrderId(), @@ -163,7 +163,7 @@ public class StoreOrderController extends XktBaseController { @Log(title = "订单", businessType = BusinessType.OTHER) @ApiOperation("打印面单") - @PostMapping("print") + @PostMapping("ship/print") public R> print(@Valid @RequestBody StoreOrderPrintReqVO vo) { //TODO 权限 List dtoList = storeOrderService.printOrder(vo.getStoreOrderDetailIds()); diff --git a/xkt/src/main/java/com/ruoyi/xkt/manager/impl/ZtoExpressManagerImpl.java b/xkt/src/main/java/com/ruoyi/xkt/manager/impl/ZtoExpressManagerImpl.java index e6d37893d..70efa06fc 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/manager/impl/ZtoExpressManagerImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/manager/impl/ZtoExpressManagerImpl.java @@ -66,7 +66,7 @@ public class ZtoExpressManagerImpl implements ExpressManager, InitializingBean { @Override public EExpressChannel channel() { - return EExpressChannel.YTO; + return EExpressChannel.ZTO; } @Override diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java index d0ab4354a..f0d212699 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java @@ -805,10 +805,10 @@ public class StoreOrderServiceImpl implements IStoreOrderService { .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)); List orderDetailIdList = new ArrayList<>(orderDetails.size()); for (StoreOrderDetail orderDetail : orderDetails) { - if (!EOrderStatus.PENDING_SHIPMENT.getValue().equals(order.getOrderStatus()) - && !EOrderStatus.SHIPPED.getValue().equals(order.getOrderStatus())) { + if (!EOrderStatus.PENDING_SHIPMENT.getValue().equals(orderDetail.getDetailStatus()) + && !EOrderStatus.SHIPPED.getValue().equals(orderDetail.getDetailStatus())) { throw new ServiceException(CharSequenceUtil.format("订单明细[{}]当前状态无法确认收货", - order.getOrderNo())); + orderDetail.getId())); } //订单明细->已完成 orderDetail.setDetailStatus(EOrderStatus.COMPLETED.getValue()); @@ -888,10 +888,10 @@ public class StoreOrderServiceImpl implements IStoreOrderService { .eq(SimpleEntity::getDelFlag, Constants.UNDELETED)); List orderDetailIdList = new ArrayList<>(orderDetails.size()); for (StoreOrderDetail orderDetail : orderDetails) { - if (!EOrderStatus.PENDING_SHIPMENT.getValue().equals(order.getOrderStatus()) - && !EOrderStatus.SHIPPED.getValue().equals(order.getOrderStatus())) { + if (!EOrderStatus.PENDING_SHIPMENT.getValue().equals(orderDetail.getDetailStatus()) + && !EOrderStatus.SHIPPED.getValue().equals(orderDetail.getDetailStatus())) { throw new ServiceException(CharSequenceUtil.format("订单明细[{}]当前状态无法确认收货", - order.getOrderNo())); + orderDetail.getId())); } //订单明细->已完成 orderDetail.setDetailStatus(EOrderStatus.COMPLETED.getValue());