|
|
@@ -3,6 +3,8 @@ package com.fs.app.controller;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.fs.app.annotation.Login;
|
|
|
|
|
|
+import com.fs.common.utils.CloudHostUtils;
|
|
|
+import com.fs.his.dto.ExpressInfoDTO;
|
|
|
import com.fs.his.param.BillListParam;
|
|
|
import com.fs.app.param.FsStoreOrderExpressParam;
|
|
|
import com.fs.app.param.FsStoreOrderFinishParam;
|
|
|
@@ -189,7 +191,13 @@ public class StoreOrderController extends AppBaseController {
|
|
|
if (order.getStatus() <3) {
|
|
|
throw new CustomException("未发货订单不能查询");
|
|
|
}
|
|
|
- return orderService.getExpress(order);
|
|
|
+ if (CloudHostUtils.hasCloudHostName("金牛明医")){
|
|
|
+ ExpressInfoDTO dto = orderService.getDfExpressInfoDTO(order);
|
|
|
+ dto.setShipperName(order.getDeliveryName());
|
|
|
+ return R.ok().put("data", dto).put("express",expressService.selectFsExpressByName(order.getDeliveryName())).put("deliverySn", order.getDeliverySn());
|
|
|
+ } else {
|
|
|
+ return orderService.getExpress(order);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@Login
|