xdd

fs-admin/src/main/java/com/fs/live/controller/LiveOrderController.java

@@ -38,6 +38,7 @@ import com.fs.store.domain.FsStoreDelivers;
 import com.fs.store.domain.FsStoreOrder;
 import com.fs.store.domain.FsStoreOrderStatus;
 import com.fs.store.domain.FsUser;
+import com.fs.store.mapper.FsStoreDeliversMapper;
 import com.fs.store.mapper.FsWarehousesMapper;
 import com.fs.store.param.*;
 import com.fs.store.service.IFsExpressService;
@@ -91,23 +92,6 @@ public class LiveOrderController extends BaseController
     @Autowired
     private LiveTask liveTask;
 
-
-//    @Autowired
-//    private IFsExpressService expressService;
-//
-//    @Autowired
-//    private ConfigUtil configUtil;
-
-//    @Autowired
-//    @Qualifier("erpOrderServiceImpl")
-//    private IErpOrderService gyOrderService;
-//
-//    @Autowired
-//    @Qualifier("wdtErpOrderServiceImpl")
-//    private IErpOrderService wdtOrderService;
-
-    @Autowired
-    private FsStoreDeliversService fsStoreDeliversService;
     /**
      * 查询订单列表
      */
@@ -264,6 +248,13 @@ public class LiveOrderController extends BaseController
         List<LiveOrderPayment> payments=orderPaymentService.selectLiveOrderPaymentByOrderId(id);
         return R.ok().put("payments",payments);
     }
+    @Autowired
+    private FsStoreDeliversMapper fsStoreDeliversMapper;
+    @GetMapping(value = "/express/{id}")
+    public R getExpress(@PathVariable("id") Long id){
+        List<FsStoreDelivers> data = fsStoreDeliversMapper.findByOrderIdWithType(id, 1);
+        return R.ok().put("data",data);
+    }
 
     @PreAuthorize("@ss.hasPermi('live:liveOrder:query')")
     @GetMapping(value = "/logs/{id}")