From af06cd29722f6cb1c431565c4710d9fe9b7b33a1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 19:13:07 +0800
Subject: [PATCH] 修改bug和翻译
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 2 +-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java | 2 +-
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 4 ++--
DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml | 10 +++++-----
UserIGOTravel/guns-admin/src/main/resources/logback-spring.xml | 10 +++++-----
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java | 3 +++
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java | 3 +++
ManagementIGOTravel/guns-admin/src/main/resources/logback-spring.xml | 10 +++++-----
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java | 13 +++++++++++++
9 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java
index e0554af..e272a79 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java
@@ -1,9 +1,12 @@
package com.stylefeng.guns.modular.api;
+import com.stylefeng.guns.core.util.MD5Util;
+import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.Withdrawal;
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.service.IWithdrawalService;
+import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.WithdrawalListWarpper;
import com.stylefeng.guns.modular.system.warpper.WithdrawalWarpper;
@@ -17,6 +20,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
@@ -33,6 +37,9 @@
@Autowired
private IDriverService driverService;
+
+ @Resource
+ private RedisUtil redisUtil;
/**
@@ -54,6 +61,12 @@
if(null == uid){
return ResultUtil.tokenErr();
}
+ String format = String.format("uid=%s&money=%s&type=%s", uid, money, type);
+ String key = MD5Util.encrypt(format);
+ String value = redisUtil.getValue(key);
+ if(ToolUtil.isNotEmpty(value) && (System.currentTimeMillis() - Long.valueOf(value)) <= 1000){
+ return ResultUtil.error(language == 1 ? "请勿重复操作" : language == 2 ? "Don't repeat the operation" : "Ne répétez pas l’opération");
+ }
return withdrawalService.withdrawal(money, uid, type, remark, language);
}catch (Exception e){
e.printStackTrace();
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java
index 4cb2f30..d3ee998 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java
@@ -25,6 +25,9 @@
*/
@Override
public String queryByType(Integer type, Integer language) throws Exception {
+ if(type == 16 || type == 15 || type == 13 || type == 7 || type == 4 || type == 5 || type == 8 || type == 9 || type == 10){
+ language = 1;
+ }
String s = agreementMapper.queryByType(language, type, 2);
if(ToolUtil.isEmpty(s)){
s = agreementMapper.queryByType(language, type, null);
diff --git a/DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml b/DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml
index 19d0cac..ebc2d3d 100644
--- a/DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml
+++ b/DriverIGOTravel/guns-admin/src/main/resources/logback-spring.xml
@@ -48,7 +48,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录debug级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -75,7 +75,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录info级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -101,7 +101,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录warn级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -127,7 +127,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录ERROR级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -153,7 +153,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档记录除了DEBUG级别的其它高于DEBUG的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
index ea265b0..936a699 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
@@ -347,7 +347,7 @@
chinese_go.text("寄包裹");
}
Element chinese_discount = document1.getElementById("chinese_discount");
- chinese_discount.text("每单费用折扣" + aDouble + "%");
+ chinese_discount.text("每单费用折扣" + new BigDecimal(100).subtract(new BigDecimal(aDouble)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() + "%");
EmailUtil.send(user.getEmail(), "折扣活动", document1.html());
}
if(2 == language){
diff --git a/ManagementIGOTravel/guns-admin/src/main/resources/logback-spring.xml b/ManagementIGOTravel/guns-admin/src/main/resources/logback-spring.xml
index 24eb650..a04e4ed 100644
--- a/ManagementIGOTravel/guns-admin/src/main/resources/logback-spring.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/resources/logback-spring.xml
@@ -48,7 +48,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录debug级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -75,7 +75,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录info级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -101,7 +101,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录warn级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -127,7 +127,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录ERROR级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -153,7 +153,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档记录除了DEBUG级别的其它高于DEBUG的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 586b627..e94eaed 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -1266,10 +1266,10 @@
if(null == uid){
return ResultUtil.tokenErr();
}
- String format = String.format("payType=%s&orderId=%s&orderType=%s", payType, orderId, orderType);
+ String format = String.format("uid=%s&payType=%s&orderId=%s&orderType=%s", uid, payType, orderId, orderType);
String key = MD5Util.encrypt(format);
String value = redisUtil.getValue(key);
- if(ToolUtil.isNotEmpty(value) && (System.currentTimeMillis() - Long.valueOf(value)) >= 1000){
+ if(ToolUtil.isNotEmpty(value) && (System.currentTimeMillis() - Long.valueOf(value)) <= 1000){
return ResultUtil.error(language == 1 ? "请勿重复操作" : language == 2 ? "Don't repeat the operation" : "Ne répétez pas l’opération");
}
redisUtil.setStrValue(key, System.currentTimeMillis() + "", 5);
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 22b6871..c3e9bd4 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -1774,7 +1774,7 @@
if(d.compareTo(new BigDecimal(0)) > 0){
SettlementDetail settlementDetail = new SettlementDetail();
settlementDetail.setOrderId(orderId);
- settlementDetail.setOrderType(1);
+ settlementDetail.setOrderType(4);
settlementDetail.setDriverId(driver.getId());
settlementDetail.setOrderMoney(orderLogistics.getOrderMoney());
settlementDetail.setPrice(d.doubleValue());
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java
index b0021e9..b39514c 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java
@@ -28,6 +28,9 @@
if(null == language){
language = 2;
}
+ if(type == 16 || type == 15 || type == 13 || type == 7 || type == 4 || type == 5 || type == 8 || type == 9 || type == 10){
+ language = 1;
+ }
String s = agreementMapper.queryByType(type, language, 1);
if(ToolUtil.isEmpty(s)){
s = agreementMapper.queryByType(type, language, null);
diff --git a/UserIGOTravel/guns-admin/src/main/resources/logback-spring.xml b/UserIGOTravel/guns-admin/src/main/resources/logback-spring.xml
index 2f9ad75..8abe216 100644
--- a/UserIGOTravel/guns-admin/src/main/resources/logback-spring.xml
+++ b/UserIGOTravel/guns-admin/src/main/resources/logback-spring.xml
@@ -48,7 +48,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录debug级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -75,7 +75,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录info级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -101,7 +101,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录warn级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -127,7 +127,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录ERROR级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -153,7 +153,7 @@
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
- <maxHistory>15</maxHistory>
+ <maxHistory>180</maxHistory>
</rollingPolicy>
<!-- 此日志文档记录除了DEBUG级别的其它高于DEBUG的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
--
Gitblit v1.7.1