From 387f61d55a8e20bc772b026cba4f8c34dfce5665 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 07 二月 2024 11:20:28 +0800
Subject: [PATCH] 更新代码
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java
index 1f791cd..662c4eb 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java
@@ -4,9 +4,11 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.SettlementRecordMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.Tingg.TinggPayUtil;
import com.stylefeng.guns.modular.system.util.Tingg.model.CheckoutRequest;
@@ -54,7 +56,7 @@
* @return
*/
@Override
- public QuerySettlementAmount querySettlementAmount(Integer driverId) {
+ public QuerySettlementAmount querySettlementAmount(Integer language, Integer driverId) {
QuerySettlementAmount querySettlementAmount = new QuerySettlementAmount();
SettlementRecord settlementRecord = this.selectOne(new EntityWrapper<SettlementRecord>().eq("driverId", driverId).eq("paymentStatus", 1));
if(null != settlementRecord){
@@ -67,7 +69,7 @@
QuerySettlementAmountDetails querySettlementAmountDetails = new QuerySettlementAmountDetails();
querySettlementAmountDetails.setOrderMoney(s.getOrderMoney());
querySettlementAmountDetails.setPayMoney(s.getPrice());
- querySettlementAmountDetails.setOrderTime(sdf.format(s.getCreateTime()));
+ querySettlementAmountDetails.setOrderTime(DateUtil.conversionFormat(language, sdf.format(s.getCreateTime())));
list.add(querySettlementAmountDetails);
});
querySettlementAmount.setList(list);
@@ -91,7 +93,7 @@
Driver driver1 = driverService.selectById(driverId);
SettlementRecord settlementRecord = this.selectOne(new EntityWrapper<SettlementRecord>().eq("driverId", driverId).eq("paymentStatus", 1));
if(null == settlementRecord){
- return ResultUtil.error(language == 1 ? "暂无需支付" : language == 2 ? "No need to pay" : "Pas besoin de payer");
+ return ResultUtil.error(language == 1 ? "暂无需支付" : language == 2 ? "No need to make payments for the time being" : "Pas besoin d’effectuer de paiements pour le moment");
}
Double payMoney = settlementRecord.getPayMoney();
ResultUtil resultUtil = ResultUtil.success("");
@@ -114,7 +116,7 @@
resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()!=200){
- resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
+ resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Échec de paiement", "");
}
return resultUtil;
}
@@ -138,13 +140,13 @@
resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()!=200){
- resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
+ resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Échec de paiement", "");
}
return resultUtil;
}
if(payType == 3){//余额支付
if(driver1.getBalance() == null || driver1.getBalance() < payMoney){
- return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde de compte insuffisant", "");
+ return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient balance" : "Solde insuffisant", "");
}
Double laveActivityMoney = driver1.getLaveActivityMoney();
@@ -178,9 +180,16 @@
* @return
*/
@Override
- public List<QueryHistoricalSettlement> queryHistoricalSettlement(Integer driverId, Integer pageNum, Integer size) {
+ public List<QueryHistoricalSettlement> queryHistoricalSettlement(Integer language, Integer driverId, Integer pageNum, Integer size) {
pageNum = (pageNum - 1) * size;
- return this.baseMapper.queryHistoricalSettlement(driverId, pageNum, size);
+ List<QueryHistoricalSettlement> list = this.baseMapper.queryHistoricalSettlement(driverId, pageNum, size);
+ for (QueryHistoricalSettlement queryHistoricalSettlement : list) {
+ if(ToolUtil.isNotEmpty(queryHistoricalSettlement.getCreateTime())){
+ String createTime = queryHistoricalSettlement.getCreateTime();
+ queryHistoricalSettlement.setCreateTime(DateUtil.conversionFormat(language, createTime));
+ }
+ }
+ return list;
}
--
Gitblit v1.7.1