提交代码

hai-bweb/src/main/java/com/bweb/controller/HighGasController.java

@@ -158,6 +158,7 @@ public class HighGasController {
     @ResponseBody
     @ApiOperation(value = "查询油站订单列表")
     public ResponseData getGasOrderList(@RequestParam(name = "orderNo", required = false) String orderNo,
+                                        @RequestParam(name = "storeId", required = false) Long storeId,
                                         @RequestParam(name = "status", required = false) Integer status,
                                         @RequestParam(name = "createTimeS", required = false) Long createTimeS,
                                         @RequestParam(name = "createTimeE", required = false) Long createTimeE,
@@ -165,12 +166,22 @@ public class HighGasController {
                                         @RequestParam(name = "pageSize", required = true) Integer pageSize) {
         try {
             UserInfoModel userInfoModel = userCenter.getSessionModel(UserInfoModel.class);
-            if (userInfoModel == null || userInfoModel.getMerchantStore() == null) {
+            if (userInfoModel == null) {
                 log.error("HighGasController -> disabledOil() error!","");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, "");
             }
             Map<String, Object> param = new HashMap<>();;
-            param.put("storeId", userInfoModel.getMerchantStore().getId());
+            // 用户来源 0：超级管理员  1：公司  2：商户  3：门店 4. 代理商 5.充值后台工商  6.团油代理商   7.团油业务员   8. 加油站员工
+            if (userInfoModel.getSecUser().getObjectType().equals(2)) {
+                param.put("storeId", storeId);
+            } else if (userInfoModel.getSecUser().getObjectType().equals(3)) {
+                param.put("storeId", userInfoModel.getMerchantStore().getId());
+            } else if (userInfoModel.getSecUser().getObjectType().equals(8)) {
+                param.put("storeId", userInfoModel.getMerchantStore().getId());
+            } else {
+                log.error("HighGasController -> disabledOil() error!","");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMPETENCE_INSUFFICIENT, "");
+            }
             param.put("orderNo", orderNo);
             param.put("createTimeS", createTimeS);
             param.put("createTimeE", createTimeE);