From dccf96f22efad58f24fe496391c13339bd840d35 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 八月 2023 14:58:20 +0800
Subject: [PATCH] 新增加司机端接口
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 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 761c3da..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;
+
@@ -91,14 +100,11 @@
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