From 2a498d9f65f873cedb74ab5bcb48ad4b845d0622 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 八月 2023 10:01:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java
index b8fbbb1..10c71f4 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java
@@ -68,6 +68,15 @@
@Autowired
private ISystemConfigService systemConfigService;
+ @Autowired
+ private IRechargeRecordService rechargeRecordService;
+
+ @Autowired
+ private IAccountChangeDetailService accountChangeDetailService;
+
+ @Autowired
+ private IDivisionRecordService divisionRecordService;
+
@@ -86,19 +95,16 @@
Integer i =0; // 0为不能接单 1为恶劣天气 2为节假日 3为恶劣+节假日
District geocode = MapUtil.geocode(lon, lat);
String districtCode = geocode.getDistrictCode();
- List<BranchOffice> districtCode1 = branchOfficeService.selectList(new EntityWrapper<BranchOffice>().eq("districtCode", districtCode));
+ List<BranchOffice> districtCode1 = branchOfficeService.selectList(new EntityWrapper<BranchOffice>().eq("districtCode", districtCode).eq("status",1));
if(districtCode1.size()>0){
BranchOffice branchOffice = districtCode1.get(0);
Integer id = branchOffice.getId();
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8).eq("companyId", id));
- SystemConfig systemConfig9 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 9).eq("companyId", id));
- if(systemConfig!=null && systemConfig9!=null){
+ if(systemConfig!=null){
String content = systemConfig.getContent();
JSONObject jsonObject = JSONObject.parseObject(content);
String num1 = jsonObject.get("num1").toString();
- String content9 = systemConfig9.getContent();
- JSONObject jsonObject9 = JSONObject.parseObject(content9);
- String num9 = jsonObject9.get("num1").toString();
+ String num9 = jsonObject.get("num3").toString();
if("1".equals(num1)){
i=1;
}
@@ -109,6 +115,9 @@
i=3;
}
}
+ if(i == 0){
+ i = 4;
+ }
}
return ResponseWarpper.success(i);
}catch (Exception e){
@@ -116,14 +125,6 @@
return new ResponseWarpper(500, e.getMessage());
}
}
- @Autowired
- private IRechargeRecordService rechargeRecordService;
-
- @Autowired
- private IAccountChangeDetailService accountChangeDetailService;
-
- @Autowired
- private IDivisionRecordService divisionRecordService;
--
Gitblit v1.7.1