|
|
@@ -116,6 +116,10 @@ public class LiveOrderController extends BaseController
|
|
|
@Autowired
|
|
|
private PayService ybPayService;
|
|
|
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private FsStoreDeliversService fsStoreDeliversService;
|
|
|
+
|
|
|
/**
|
|
|
* 查询订单列表
|
|
|
*/
|
|
|
@@ -422,6 +426,7 @@ public class LiveOrderController extends BaseController
|
|
|
return liveOrderService.finishOrder(param.getOrderId());
|
|
|
}
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 修改物流
|
|
|
* @param deliveryDTO
|
|
|
@@ -431,7 +436,8 @@ public class LiveOrderController extends BaseController
|
|
|
@PreAuthorize("@ss.hasPermi('live:liveOrder:editDeliveryId')")
|
|
|
@PutMapping("/editDeliveryId")
|
|
|
public AjaxResult editDeliveryId(@RequestBody FsStoreDelivers deliveryDTO) {
|
|
|
- liveOrderService.editLiveOrderDeliveryId(deliveryDTO);
|
|
|
+ deliveryDTO.setType(1);
|
|
|
+ fsStoreDeliversService.editDeliveryId(deliveryDTO);
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
|
|