|
|
@@ -19,6 +19,7 @@ import com.fs.erp.dto.ErpOrderQueryResponse;
|
|
|
import com.fs.erp.service.IErpOrderService;
|
|
|
import com.fs.framework.security.LoginUser;
|
|
|
import com.fs.framework.security.SecurityUtils;
|
|
|
+import com.fs.framework.service.TokenService;
|
|
|
import com.fs.his.config.FsSysConfig;
|
|
|
import com.fs.his.domain.*;
|
|
|
import com.fs.his.dto.ExpressInfoDTO;
|
|
|
@@ -44,6 +45,7 @@ import com.fs.hisStore.dto.StoreOrderProductDTO;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
@@ -82,6 +84,12 @@ public class FsStoreOrderController extends BaseController
|
|
|
@Autowired
|
|
|
private IFsStoreOrderItemScrmService orderItemScrmService;
|
|
|
|
|
|
+ @Value("${cloud_host.company_name}")
|
|
|
+ private String signProjectName;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private TokenService tokenService;
|
|
|
+
|
|
|
/**
|
|
|
* 查询直播/点播订单列表（fs_store_order_scrm 中 order_type=2 直播订单，order_type=3 点播订单）
|
|
|
* 如果前端传了 orderType，则按指定类型查询；如果没传（null），则查询所有直播和点播订单（orderType IN (2,3)）
|
|
|
@@ -298,6 +306,7 @@ public class FsStoreOrderController extends BaseController
|
|
|
public AjaxResult healthExportItems(com.fs.hisStore.param.FsStoreOrderParam param) {
|
|
|
normalizeExportParam(param);
|
|
|
applyHealthLiveFilter(param);
|
|
|
+ LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
|
if (fsStoreOrderScrmService.isEntityNull(param)) {
|
|
|
return AjaxResult.error("请筛选数据导出");
|
|
|
}
|
|
|
@@ -410,6 +419,7 @@ public class FsStoreOrderController extends BaseController
|
|
|
public AjaxResult healthExportItemsDetails(com.fs.hisStore.param.FsStoreOrderParam param) {
|
|
|
normalizeExportParam(param);
|
|
|
applyHealthLiveFilter(param);
|
|
|
+ LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
|
if (fsStoreOrderScrmService.isEntityNull(param)) {
|
|
|
return AjaxResult.error("请筛选数据导出");
|
|
|
}
|
