From 2e366b939271b6ea338641f8a72d1bcd2182dbe7 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 19 四月 2024 17:56:18 +0800
Subject: [PATCH] 新增加功能
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index d55c9d2..c58e30b 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -110,7 +110,7 @@
}
query = reassignMapper.query(uid, null, reassign.getOrderId(), reassign.getOrderType(), 2);
if(null != query){
- return ResultUtil.error(language == 1 ? "您提交的申请正在处理中" : language == 2 ? "our application is being processed" : "Votre demande est en cours de traitement");
+ return ResultUtil.error(language == 1 ? "您提交的申请正在处理中" : language == 2 ? "Your application is being processed." : "Votre demande est en cours de traitement.");
}
//获取支付金额
@@ -151,7 +151,9 @@
orderLogisticsService.updateById(orderLogistics1);
break;
}
- systemNoticeService.addSystemNotice(2, language == 1 ? "您的改派申请已成功提交，我们会尽快为你处理！" : language == 2 ? "Your reassignment application has been successfully submitted, we will process it for you as soon as possible!" : "Votre demande de réaffectation a été soumise avec succès. Nous la traiterons pour vous dès que possible!", uid);
+ systemNoticeService.addSystemNotice(2, language == 1 ? "您的改派申请已成功提交，我们会尽快为你处理！" : language == 2 ?
+ "Your request for reassignment was submitted, we shall handle it for you as soon as possible." :
+ "Votre demande de réaffectation a été soumise. Nous la traiterons pour vous dans les plus brefs délais.", uid);
return resultUtil;
}
@@ -195,7 +197,7 @@
}
query = reassignMapper.query(uid, null, Integer.valueOf(id), 3, 2);
if(null != query){
- return ResultUtil.error(language == 1 ? "您提交的申请正在处理中" : language == 2 ? "Your application is being processed" : "Votre demande est en cours de traitement");
+ return ResultUtil.error(language == 1 ? "您提交的申请正在处理中" : language == 2 ? "Your application is being processed." : "Votre demande est en cours de traitement.");
}
reassign.setMoney(aDouble);
@@ -209,7 +211,9 @@
ids += reassign.getId() + ",";
}
ids = ids.substring(0, ids.length() - 1);
- systemNoticeService.addSystemNotice(2, language == 1 ? "您的改派申请已成功提交，我们会尽快为你处理！" : language == 2 ? "Your reassignment application has been successfully submitted, we will process it for you as soon as possible!" : "Votre demande de réaffectation a été soumise avec succès. Nous la traiterons pour vous dès que possible!", uid);
+ systemNoticeService.addSystemNotice(2, language == 1 ? "您的改派申请已成功提交，我们会尽快为你处理！" : language == 2 ?
+ "Your request for reassignment was submitted, we shall handle it for you as soon as possible." :
+ "Votre demande de réaffectation a été soumise. Nous la traiterons pour vous dans les plus brefs délais.", uid);
//开始支付
if(null != reassign.getPayType()){
@@ -223,7 +227,7 @@
}
resultUtil = resultUtil;
}else{
- resultUtil = ResultUtil.error(language == 1 ? "获取支付信息失败" : language == 2 ? "Failed to obtain payment information" : "Échec à obtenir les informations de paiement", "");
+ resultUtil = ResultUtil.error(language == 1 ? "获取支付信息失败" : language == 2 ? "Failed to obtain payment information" : "Impossible d’obtenir les informations de paiement", "");
}
}
if(reassign.getPayType() == 2){//支付宝
@@ -236,7 +240,7 @@
}
resultUtil = resultUtil;
}else{
- resultUtil = ResultUtil.error(language == 1 ? "获取支付信息失败" : language == 2 ? "Failed to obtain payment information" : "Échec à obtenir les informations de paiement", "");
+ resultUtil = ResultUtil.error(language == 1 ? "获取支付信息失败" : language == 2 ? "Failed to obtain payment information" : "Impossible d’obtenir les informations de paiement", "");
}
}
if(reassign.getPayType() == 3){//余额
@@ -250,7 +254,7 @@
}
Double balance = driver.getBalance();
if(null == balance || balance < totalMoney){
- throw new SystemException(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde insuffisant du compte");
+ throw new SystemException(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient balance" : "Solde insuffisant");
}
driver.setBalance(new BigDecimal(balance).subtract(new BigDecimal(totalMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driverService.updateById(driver);
@@ -267,7 +271,8 @@
//添加已收入明细
incomeService.saveData(1, orderCrossCity.getCompanyId(), 4, orderCrossCity.getId(), 3, reassign.getMoney());
}
- systemNoticeService.addSystemNotice(2, "您已使用余额成功支付改派申请费用！", uid);
+ systemNoticeService.addSystemNotice(2, language == 1 ? "您已使用余额成功支付改派申请费用！" : language == 2 ?
+ "You have paid for reassignment with the balance." : "Vous avez payé la réaffectation avec le solde.", uid);
//开始推送调度单
Map<String, String> map = new HashMap<>();
map.put("orderId", reassign.getOrderId().toString());
@@ -293,9 +298,16 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryList(Integer uid, Integer pageNum, Integer size) throws Exception {
+ public List<Map<String, Object>> queryList(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception {
pageNum = (pageNum - 1) * size;
- return reassignMapper.queryList(uid, pageNum, size);
+ List<Map<String, Object>> list = reassignMapper.queryList(uid, pageNum, size);
+ for (Map<String, Object> map : list) {
+ if(null != map.get("day")){
+ String day = map.get("day").toString();
+ map.put("day", DateUtil.conversionFormat(language, day));
+ }
+ }
+ return list;
}
--
Gitblit v1.7.1