BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

pull/1121/head
梁宇奇 2025-05-13 17:58:55 +08:00
parent cdc6f2dbeb
commit 289f48ef2d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreOrderController.java
View File

@ -131,7 +131,7 @@ public class StoreOrderController extends XktBaseController {
@Log(title = "订单", businessType = BusinessType.OTHER)
@ApiOperation("发货-平台物流")
@PostMapping("ship-platform")
@PostMapping("ship/platform")
public R<List<StoreOrderShipRespVO>> 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<List<StoreOrderShipRespVO>> 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<List<StoreOrderPrintRespVO>> print(@Valid @RequestBody StoreOrderPrintReqVO vo) {
//TODO 权限
List<ExpressPrintDTO> dtoList = storeOrderService.printOrder(vo.getStoreOrderDetailIds());

2
xkt/src/main/java/com/ruoyi/xkt/manager/impl/ZtoExpressManagerImpl.java
View File

@ -66,7 +66,7 @@ public class ZtoExpressManagerImpl implements ExpressManager, InitializingBean {
@Override
public EExpressChannel channel() {
return EExpressChannel.YTO;
return EExpressChannel.ZTO;
}
@Override

12
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java
View File

@ -805,10 +805,10 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
.eq(SimpleEntity::getDelFlag, Constants.UNDELETED));
List<Long> 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<Long> 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());