From 4bb903c3eb6b78b77a87da914b6cc882d8092e79 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 20 十一月 2024 11:38:58 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder.html | 2 +-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml | 4 ++--
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java | 2 +-
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayUtil.java | 3 ++-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 1 +
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayUtil.java | 5 ++++-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java | 8 ++++----
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 8 +++-----
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java | 10 +++++++---
9 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayUtil.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayUtil.java
index 9cd03e3..f4494d7 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayUtil.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayUtil.java
@@ -6,6 +6,7 @@
import com.stylefeng.guns.modular.system.util.Tingg.model.CheckoutRequest;
import io.cellulant.model.Payload;
import io.cellulant.service.CheckoutEncryption;
+import lombok.extern.slf4j.Slf4j;
import javax.servlet.http.HttpServletRequest;
import java.io.BufferedReader;
@@ -18,6 +19,7 @@
/**
* Tingg支付工具类
*/
+@Slf4j
public class TinggPayUtil {
private static String accessKey = "8rc1gTV9n91Tc1Sy9oVWry99fgrgrVV8concf9onWooWSg9TVW8nSgo98g88";
@@ -36,9 +38,10 @@
try {
CheckoutEncryption checkoutEncrption = new CheckoutEncryption(ivKey, secretKey);
Payload payload = getPayload(checkoutRequest);
+ log.info("支付请求参数：{}", JSON.toJSONString(payload));
String param = checkoutEncrption.encrypt(payload);
- System.out.println("Encrpted payload=" + param);
String url = "https://checkout.tingg.africa/express/checkout?encrypted_payload=" + param + "&access_key=" + accessKey;
+ log.info("支付链接：{}", url);
return ResultUtil.success(url);
}catch (Exception e){
e.printStackTrace();
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
index 14017f5..c6bb3d7 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
@@ -36,10 +36,10 @@
}
-// @PostConstruct
-// void started() {
-// TimeZone.setDefault(TimeZone.getTimeZone("GMT+0"));
-// }
+ @PostConstruct
+ void started() {
+ TimeZone.setDefault(TimeZone.getTimeZone("GMT+0"));
+ }
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
index c2c5c50..a2dada8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
@@ -173,9 +173,13 @@
for(TDriver driver : tDrivers){
keys += "DRIVER" + driver.getId() + ",";
}
- String value = redisUtil.getValues(keys.substring(0, keys.length() - 1));
- JSONArray jsonArray = JSON.parseArray(value);
- map1.put("netcardriver", jsonArray.size()); //在线司机
+ if(keys.length() > 1){
+ String value = redisUtil.getValues(keys.substring(0, keys.length() - 1));
+ JSONArray jsonArray = JSON.parseArray(value);
+ map1.put("netcardriver", jsonArray.size()); //在线司机
+ }else{
+ map1.put("netcardriver", 0); //在线司机
+ }
Wrapper<TOrderTaxi> travelTime1 = new EntityWrapper<TOrderTaxi>().between("travelTime", calendar1.getTime(), calendar2.getTime());
if(companyId != null){
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
index d5c8d90..8bf2313 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -990,6 +990,7 @@
car.setCommercialInsuranceTime(DateUtil.parseDate(fifteen));
car.setInsertTime(new Date());
car.setState(1);
+ car.setAuthState(2);
if (ShiroKit.getUser().getRoleType() == 1){
car.setAddType(2);
}else if (ShiroKit.getUser().getRoleType() == 2){
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index dcd9667..c0a9898 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -1891,8 +1891,8 @@
}else{
shellList.add("-");
}
- if(SinataUtil.isNotEmpty(object.get("name"))){
- shellList.add(object.get("name").toString());
+ if(SinataUtil.isNotEmpty(object.get("firstName"))){
+ shellList.add(object.get("firstName").toString() + " " + object.get("lastName").toString());
}else{
shellList.add("-");
}
@@ -1902,7 +1902,7 @@
shellList.add("-");
}
if(SinataUtil.isNotEmpty(object.get("sex"))){
- shellList.add(object.get("sex").toString() == "1"?"男":"女");
+ shellList.add(object.get("sex").toString().equals("1")?"男":"女");
}else{
shellList.add("-");
}
@@ -1969,8 +1969,6 @@
}
if(SinataUtil.isNotEmpty(object.get("authState"))){
shellList.add(object.get("authState").toString().equals("1")?"待审核":(object.get("authState").toString().equals("2")?"正常":(object.get("authState").toString().equals("3")?"冻结":(object.get("authState").toString().equals("4")?"已拒绝":""))));
-
- shellList.add(object.get("authState").toString());
}else{
shellList.add("-");
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
index 0a8a7dd..9cb7328 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
@@ -77,7 +77,7 @@
@RequestMapping("/lookDetail/{id}")
public String lookDetail(@PathVariable Integer id, Model model) {
TIntegralOrder tIntegralOrder = tIntegralOrderService.selectById(id);
- model.addAttribute("str",tIntegralOrder.getRemark());
+ model.addAttribute("str",tIntegralOrder.getManageRemark());
return "/system/tComplaint/lookDetail.html";
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
index fd22eb4..5e6f2c4 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
@@ -337,7 +337,7 @@
tc1.name as companyName,
tc2.name as franchiseeName,
<if test="1 == type">
- topc1.num as privateCarTotalNum,
+ IFNULL(topc1.num, 0) as privateCarTotalNum,
IFNULL(topc2.num, 0) as privateCarNotPayNum,
IFNULL(topc3.num, 0) as privateCarcancelNum,
IFNULL(topc4.taxiMoney, 0) as privateCarTotalMoney,
@@ -350,7 +350,7 @@
LEFT JOIN (SELECT id,name FROM t_company WHERE FIND_IN_SET(type, '1,2') AND flag != 3 ) AS tc1 ON td.companyId=tc1.id
LEFT JOIN ( SELECT id,name FROM t_company WHERE type = 3 AND flag != 3 ) AS tc2 ON tc2.id = td.franchiseeId
<if test="1 == type">
- INNER JOIN ( SELECT COUNT(id) AS num, driverId FROM t_order_private_car WHERE FIND_IN_SET(state, '7,8,9,10,12')
+ LEFT JOIN ( SELECT COUNT(id) AS num, driverId FROM t_order_private_car WHERE FIND_IN_SET(state, '7,8,9,10,12')
<if test="null != start and '' != start and null != end and '' != end">
and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
</if>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder.html
index 8d1842e..dd58c99 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder.html
@@ -3,7 +3,7 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
- <h5>积分兑换订单管理</h5>
+ <h5>积分兑换管理</h5>
</div>
<div class="ibox-content">
<div class="row row-lg">
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayUtil.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayUtil.java
index 340fb6b..49f4762 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayUtil.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayUtil.java
@@ -38,9 +38,10 @@
try {
CheckoutEncryption checkoutEncrption = new CheckoutEncryption(ivKey, secretKey);
Payload payload = getPayload(checkoutRequest);
+ log.info("支付请求参数：{}", JSON.toJSONString(payload));
String param = checkoutEncrption.encrypt(payload);
- log.error("调起支付：" + checkoutRequest.getMerchantTransactionId() + "\nEncrpted payload=" + param);
String url = "https://checkout.tingg.africa/express/checkout?encrypted_payload=" + param + "&access_key=" + accessKey;
+ log.info("支付链接：{}", url);
return ResultUtil.success(url);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1