From a1d7b7b122f92f7de47f7f35212f029f01e3e71a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 25 七月 2024 18:01:13 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 11 +++++
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java | 4 +-
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 17 +++++++-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 16 ++++++-
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js | 2
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js | 2
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 4 +-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 11 +++--
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js | 4 ++
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java | 6 +-
13 files changed, 60 insertions(+), 23 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
index 4ef08d7..191fed6 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
@@ -692,8 +692,6 @@
break;
}
-
-
// 司机提现
for (TPubWithdrawal tPubWithdrawal : driver) {
if(payType!=null && payType == 1){
@@ -721,7 +719,9 @@
break;
}
WaterVO waterVO = new WaterVO();
- waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
+ if (tPubWithdrawal.getHandleTime()!=null){
+ waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
+ }
waterVO.setCode(tPubWithdrawal.getCode());
TUser user2 = appUserService.selectById(tPubWithdrawal.getUserId());
if (user2!=null){
@@ -741,6 +741,10 @@
Integer orderId = tPubTransactionDetail.getOrderId();
PaymentRecord paymentRecord = paymentRecordService.selectById(orderId);
if (paymentRecord!=null){
+ if (paymentRecord.getState() == 1){
+ // 临时数据
+ continue;
+ }
waterVO.setInsertTime(format.format(paymentRecord.getInsertTime()));
waterVO.setCode(paymentRecord.getCode());
if (paymentRecord.getPayType()!=null){
@@ -911,6 +915,8 @@
break;
}
}
+ // 过滤掉res中insertTime未空的数据
+ res.removeIf(waterVO -> waterVO.getInsertTime() == null);
Collections.sort(res, Comparator.comparing(WaterVO::getInsertTime).reversed());
WaterMoneyVO waterMoneyVO = new WaterMoneyVO();
BigDecimal add = userRecharge.add(userConsume).add(balance).subtract(driverWithdrawal).subtract(userWithdrawal);
@@ -1256,6 +1262,10 @@
Integer orderId = tPubTransactionDetail.getOrderId();
PaymentRecord paymentRecord = paymentRecordService.selectById(orderId);
if (paymentRecord!=null){
+ if (paymentRecord.getState() == 1){
+ // 临时数据
+ continue;
+ }
waterVO.setInsertTime(format.format(paymentRecord.getInsertTime()));
waterVO.setCode(paymentRecord.getCode());
if (paymentRecord.getPayType()!=null){
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
index 313d3ba..d46fcdc 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
@@ -276,7 +276,7 @@
between4 = new EntityWrapper<BalanceUsageRecord>()
.ne("purpose", 6)
.between("createTime", start, end);
- // 司机提现
+
}
// 司机提现wrapper
@@ -586,13 +586,14 @@
Wrapper<BalanceUsageRecord> between4 = new EntityWrapper<BalanceUsageRecord>()
;
// 司机提现
- Wrapper<TPubWithdrawal> between44 = new EntityWrapper<TPubWithdrawal>()
+ Wrapper<BalanceUsageRecord> between44 = new EntityWrapper<BalanceUsageRecord>()
;
if (time == 5 && !StringUtils.hasLength(insertTime)){
driverWrapper = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
+ .eq("type",1)
.eq("userType", 2)
- ;
+ .between("insertTime", start, end);
// 专车wrapper
between = new EntityWrapper<TOrderPrivateCar>()
.isNotNull("activityId")
@@ -622,6 +623,7 @@
}else{
driverWrapper = new EntityWrapper<TPubWithdrawal>()
.eq("state", 2)
+ .eq("type",1)
.eq("userType", 2)
.between("insertTime", start, end);
// 专车wrapper
@@ -674,6 +676,7 @@
// 司机消费记录
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
+ // 司机提现记录
driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
break;
case 4:
@@ -697,7 +700,7 @@
// 消费
balanceUsageRecords = balanceUsageRecordService.selectList(between4);
// 提现
- driverWithdrawal = pubWithdrawalService.selectList(between44);
+ driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
}
// 已发放补贴总额
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index 576f4ff..8086944 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -26,6 +26,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 系统设置控制器
@@ -120,7 +121,8 @@
@RequestMapping(value = "/redSet/list")
@ResponseBody
public Object redSetList() {
-
+ List<String> strings = new ArrayList<>();
+ strings.add("updateTime");
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
if (ShiroKit.getUser().getRoleType() != 1){
page.setRecords(null);
@@ -129,7 +131,16 @@
for (Map<String, Object> stringObjectMap : list) {
stringObjectMap.put(stringObjectMap.get("deductionRatio").toString(),stringObjectMap.get("deductionRatio")+"%");
}
- page.setRecords(list);
+ List<Map<String, Object>> sortedList = list.stream()
+ .sorted((map1, map2) -> {
+ // 获取 updateTime 字段
+ String time1 = map1.get("updateTime").toString();
+ String time2 = map2.get("updateTime").toString();
+ // 倒序排列
+ return time2.compareTo(time1);
+ })
+ .collect(Collectors.toList());
+ page.setRecords(sortedList);
}
return super.packForBT(page);
}
@@ -172,7 +183,7 @@
String s = replace + ":00";
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = dateFormat.parse(s);
- tSysRedSet.setInsertTime(date);
+ tSysRedSet.setEffectiveDate(date);
tSysRedSet.setUpdateTime(new Date());
redEnvelopePaymentSettingsService.updateById(tSysRedSet);
return SUCCESS_TIP;
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index e96561a..0fba0af 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -253,6 +253,7 @@
@Resource
private TSystemPriceMapper systemPriceMapper;
public TOrderPrivateCar setMoney(TOrderPrivateCar orderPrivateCar, Double parkingFee, Double crossingFee) throws Exception {
+ System.err.println("计算金额:"+orderPrivateCar);
Map<String, Object> query1 = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId());
//开始根据不同的方式计算金额
double amount = 0;
@@ -290,7 +291,15 @@
Date date = new Date();
double d = (null == orderPrivateCar.getMileage() ? 0D : orderPrivateCar.getMileage()) / 1000;//实际公里
- double t = ((orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()) / 60000) + 1;//实际时间（不满一分钟按一分钟算）
+ if (orderPrivateCar.getEndServiceTime() == null){
+ orderPrivateCar.setEndServiceTime(new Date());
+ }
+ double t=1;
+ if (orderPrivateCar.getStartServiceTime() == null){
+ t = 1;//实际时间（不满一分钟按一分钟算）
+ }else{
+ t = ((orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()) / 60000) + 1;//实际时间（不满一分钟按一分钟算）
+ }
double w = ((orderPrivateCar.getStartServiceTime().getTime() - orderPrivateCar.getArriveTime().getTime()) / 60000) + 1;//等待分钟（不满一分钟按一分钟算）
double d1 = (d - num2) < 0 ? 0 : d - num2;//超出起步里程的公里
double t1 = (t - num3) < 0 ? 0 : new BigDecimal(t - num3).setScale(0, BigDecimal.ROUND_UP).doubleValue();//超过起步分钟数的时间
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java
index 873a3c3..57246c2 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java
@@ -40,7 +40,7 @@
/**
* 在线小时
*/
- private String online;
+ private Double online;
/**
* 奖励金额
*/
@@ -93,11 +93,11 @@
this.type = type;
}
- public String getOnline() {
+ public Double getOnline() {
return online;
}
- public void setOnline(String online) {
+ public void setOnline(Double online) {
this.online = online;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
index 7e30785..e61dc8c 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
@@ -81,7 +81,7 @@
driverActivityOnline.setEndTime(endTimes);
driverActivityOnline.setInsertTime(nowDay);
driverActivityOnline.setType(1);
- driverActivityOnline.setOnline(num4);
+ driverActivityOnline.setOnline(Double.valueOf(num4));
driverActivityOnline.setMoney(num5);
driverActivityOnline.setOfflineTime(Double.valueOf(num12));
driverActivityOnline.insertOrUpdate();
@@ -168,7 +168,7 @@
driverActivityOnline.setStartTime(startTimes);
driverActivityOnline.setEndTime(endTimes);
driverActivityOnline.setType(1);
- driverActivityOnline.setOnline(num4);
+ driverActivityOnline.setOnline(Double.valueOf(num4));
driverActivityOnline.setMoney(num5);
driverActivityOnline.setOfflineTime(Double.valueOf(num12));
driverActivityOnline.insertOrUpdate();
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
index 01d352e..51f0366 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
@@ -61,7 +61,7 @@
@}else{
value=""
@}
- name="num12" class="form-control newWidth"/> 小时不接单 则强制更改司机账号状态为:下班,并且累计的在线时长清零;
+ id="num12" class="form-control newWidth"/> 小时不接单 则强制更改司机账号状态为:下班,并且累计的在线时长清零;
<br/>
<!--
<br/>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
index 75b0041..adf6a26 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -78,7 +78,7 @@
<label class="col-sm-3 control-label">经营业务：</label>
<div class="col-sm-9">
<div class="checkbox checkbox-success checkbox-inline" >
- <input type="checkbox" checked name="serverBox" disabled id="serverBox1" value="1">
+ <input type="checkbox" name="serverBox" id="serverBox1" value="1">
<label for="serverBox1"> 专车 </label>
</div><!--
<div class="checkbox checkbox-success checkbox-inline">
@@ -90,7 +90,7 @@
<label for="serverBox3"> 跨城出行 </label>
</div>-->
<div class="checkbox checkbox-success checkbox-inline" >
- <input type="checkbox" checked name="serverBox" disabled id="serverBox4" value="4">
+ <input type="checkbox" name="serverBox" id="serverBox4" value="4">
<label for="serverBox4"> 市内小件物流 </label>
</div><!--
<div class="checkbox checkbox-success checkbox-inline">
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js
index ff72118..6f6d33a 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js
@@ -212,6 +212,8 @@
return;
}
if (!re1.test($("#num12").val())) {
+ console.log("11111")
+ console.log($("#num12").val())
Feng.error("请输入正确小时数!");
return;
}
@@ -229,6 +231,8 @@
}
if (!re1.test($("#num4").val())) {
+ console.log("2222")
+ console.log($("#num4").val())
Feng.error("请输入正确小时数!");
return;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js
index e318329..187d1ca 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js
@@ -237,7 +237,7 @@
TUser.getCount();
};
TUser.resetSearch = function () {
- $("#time").val("5");
+ $("#time").val("1");
$("#insertTime").val("");
$("#state").val("");
TUser.search();
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js
index 260d473..622b38f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js
@@ -229,7 +229,7 @@
TUser.getCount();
};
TUser.resetSearch = function () {
- $("#time").val("5");
+ $("#time").val("1");
$("#insertTime").val("");
$("#type").val("");
$("#payType").val("");
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js
index c92458c..3a73cdf 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js
@@ -212,7 +212,7 @@
TUser.getCount();
};
TUser.resetSearch = function () {
- $("#time").val("5");
+ $("#time").val("1");
$("#insertTime").val("");
$("#type").val("");
TUser.search();
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js
index 813f524..64b7301 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js
@@ -216,7 +216,7 @@
TUser.getCount();
};
TUser.resetSearch = function () {
- $("#time").val("5");
+ $("#time").val("1");
$("#insertTime").val("");
$("#type").val("");
TUser.search();
--
Gitblit v1.7.1