From ddcef762ff4a159e132c68dfec512c60a68a53e6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 十二月 2023 18:21:24 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java | 8
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderEvaluateController.java | 4
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 12
ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java | 7
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java | 4
ManagementIGOTravel/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SystemNoticeController.java | 4
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 30 +
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml | 4
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java | 41 --
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java | 4
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java | 10
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 2
ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts.src.js | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java | 10
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 19
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java | 8
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java | 10
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IWithdrawalService.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 42 +-
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java | 13
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayUtil.java | 8
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java | 8
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISettlementRecordService.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java | 29 +
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml | 99 ------
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderCancelService.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 22
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SettlementRecordController.java | 4
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemNoticeService.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TProblemController.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 130 ++++---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java | 7
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/itextpdf/HtmlToPdfUtils.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java | 4
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderEvaluateService.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/BankCardController.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 35 +
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java | 7
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java | 161 ++++++++++
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 36 +
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/BankCardServiceImpl.java | 6
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml | 4
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java | 2
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 76 ++-
54 files changed, 529 insertions(+), 379 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/BankCardController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/BankCardController.java
index 1dfff90..e07657f 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/BankCardController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/BankCardController.java
@@ -59,7 +59,7 @@
BigDecimal bigDecimal = new BigDecimal(code);
long max = Long.MAX_VALUE;
if(bigDecimal.compareTo(new BigDecimal(max)) >= 0){
- return ResultUtil.error(language == 1 ? "银行卡号格式错误" : language == 2 ? "The format of bank card number is incorrect" : "Format incorrect du numéro de carte bancaire");
+ return ResultUtil.error(language == 1 ? "银行卡号格式错误" : language == 2 ? "Format error of bank card" : "Erreur de format de la carte bancaire");
}
return bankCardService.saveBankCard(bank, lastName, firstName, code, driverId, language);
}catch (Exception e){
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index a989545..2a6fe57 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -200,7 +200,7 @@
}
}
boolean b = driverService.checkCaptcha(email, phone, code);
- return b ? ResultUtil.success() : ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return b ? ResultUtil.success() : ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -750,9 +750,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "司机id", name = "uid", required = true, dataType = "int"),
})
- public ResultUtil<DriverInfoWarpper> queryInfo_(Integer uid){
+ public ResultUtil<DriverInfoWarpper> queryInfo_(Integer language, Integer uid){
try {
- Map<String, Object> map = driverService.queryInfo(uid);
+ Map<String, Object> map = driverService.queryInfo(language, uid);
return ResultUtil.success(DriverInfoWarpper.getDriverInfoWarpper(map));
}catch (Exception e){
e.printStackTrace();
@@ -771,13 +771,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<DriverInfoWarpper> queryInfo(HttpServletRequest request){
+ public ResultUtil<DriverInfoWarpper> queryInfo(Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- Map<String, Object> map = driverService.queryInfo(uid);
+ Map<String, Object> map = driverService.queryInfo(language, uid);
map.put("qrCodeIsOpen",driverService.getAppOpenInfo(1)==1);
DriverInfoWarpper driverInfoWarpper = DriverInfoWarpper.getDriverInfoWarpper(map);
// Double money = driverService.getThisWeekMoney(uid);
@@ -1040,13 +1040,13 @@
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<BaseWarpper>> queryPenalties(Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<BaseWarpper>> queryPenalties(Integer language, Integer pageNum, Integer size, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String, Object>> list = driverService.queryPenalties(pageNum, size, uid);
+ List<Map<String, Object>> list = driverService.queryPenalties(language, pageNum, size, uid);
List<BaseWarpper> data = new ArrayList<>();
for(Map<String, Object> map : list){
BaseWarpper baseWarpper = new BaseWarpper();
@@ -1084,7 +1084,7 @@
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String, Object>> list = driverService.queryActivityIncome(uid, pageNum, size);
+ List<Map<String, Object>> list = driverService.queryActivityIncome(language, uid, pageNum, size);
List<BaseWarpper> data = new ArrayList<>();
for(Map<String, Object> map : list){
BaseWarpper baseWarpper = new BaseWarpper();
@@ -1122,7 +1122,7 @@
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String, Object>> list = driverService.queryTotalRevenue(uid, pageNum, size);
+ List<Map<String, Object>> list = driverService.queryTotalRevenue(language, uid, pageNum, size);
List<BaseWarpper> data = new ArrayList<>();
for(Map<String, Object> map : list){
BaseWarpper baseWarpper = new BaseWarpper();
@@ -1467,13 +1467,13 @@
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil getInviteList(Integer type,Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil getInviteList(Integer language, Integer type,Integer pageNum, Integer size, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String,Object>> list = driverService.queryMyInviteList(type,uid, pageNum, size);
+ List<Map<String,Object>> list = driverService.queryMyInviteList(language, type,uid, pageNum, size);
return ResultUtil.success(DriverInviteInfoWarpper.getDriverInviteInfoWarpper(list));
}catch (Exception e){
e.printStackTrace();
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 18ddfba..79e48ac 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -244,9 +244,9 @@
@ApiImplicitParam(value = "订单类型（1=专车，4=小件物流-同城）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<OrderInfoWarpper> queryOrderInfo(Integer orderId, Integer orderType){
+ public ResultUtil<OrderInfoWarpper> queryOrderInfo(Integer language, Integer orderId, Integer orderType){
try {
- Map<String, Object> map = orderService.queryOrderInfo(orderId, orderType);
+ Map<String, Object> map = orderService.queryOrderInfo(language, orderId, orderType);
OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
File file = new File(filePath + orderId + "_" + orderType + ".txt");
if(file.exists()){
@@ -481,9 +481,9 @@
@ApiImplicitParam(value = "订单类型（1=专车，2=出租车）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<OrderInfoWarpper> queryToBePaidPage(Integer orderId, Integer orderType){
+ public ResultUtil<OrderInfoWarpper> queryToBePaidPage(Integer language, Integer orderId, Integer orderType){
try {
- Map<String, Object> map = orderService.queryToBePaidPage(orderId, orderType);
+ Map<String, Object> map = orderService.queryToBePaidPage(language, orderId, orderType);
return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
}catch (Exception e){
e.printStackTrace();
@@ -500,9 +500,9 @@
*/
@ResponseBody
@PostMapping("/base/order/pushOrderState")
- public String pushOrderState(Integer orderId, Integer orderType){
+ public String pushOrderState(Integer language, Integer orderId, Integer orderType){
try {
- Map<String, Object> map = orderService.queryOrderInfo(orderId, orderType);
+ Map<String, Object> map = orderService.queryOrderInfo(language, orderId, orderType);
//更新小号绑定关系
orderService.RebindMidAxbBindSend(orderId, orderType);
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderEvaluateController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderEvaluateController.java
index 0a2c945..105c6a9 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderEvaluateController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderEvaluateController.java
@@ -43,13 +43,13 @@
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<OrderEvaluateWarpper> queryEvaluate(Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<OrderEvaluateWarpper> queryEvaluate(Integer language, Integer pageNum, Integer size, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- Map<String, Object> map = orderEvaluateService.queryEvaluate(pageNum, size, uid);
+ Map<String, Object> map = orderEvaluateService.queryEvaluate(language, pageNum, size, uid);
return ResultUtil.success(OrderEvaluateWarpper.getOrderEvaluateWarpper(map));
}catch (Exception e){
e.printStackTrace();
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SettlementRecordController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SettlementRecordController.java
index ff67709..5b31f26 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SettlementRecordController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SettlementRecordController.java
@@ -42,13 +42,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<QuerySettlementAmount> querySettlementAmount(HttpServletRequest request){
+ public ResultUtil<QuerySettlementAmount> querySettlementAmount(Integer language, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- QuerySettlementAmount querySettlementAmount = settlementRecordService.querySettlementAmount(uid);
+ QuerySettlementAmount querySettlementAmount = settlementRecordService.querySettlementAmount(language, uid);
return ResultUtil.success(querySettlementAmount);
}catch (Exception e){
e.printStackTrace();
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SystemNoticeController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SystemNoticeController.java
index 5df9655..180edaa 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SystemNoticeController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SystemNoticeController.java
@@ -77,13 +77,13 @@
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<SystemNoticeWarpper>> queryNotices(Integer type, Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<SystemNoticeWarpper>> queryNotices(Integer language, Integer type, Integer pageNum, Integer size, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String, Object>> list = systemNoticeService.queryList(type, pageNum, size, uid);
+ List<Map<String, Object>> list = systemNoticeService.queryList(language, type, pageNum, size, uid);
return ResultUtil.success(SystemNoticeWarpper.getSystemNoticeWarpper(list));
}catch (Exception e){
e.printStackTrace();
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 f527472..a918143 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
@@ -98,13 +98,13 @@
@ApiImplicitParam(value = "提现类型（1=活动收入提现，2=业务收入提现）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<WithdrawalWarpper>> queryWithdrawal(Integer pageNum, Integer size, Integer type, HttpServletRequest request){
+ public ResultUtil<List<WithdrawalWarpper>> queryWithdrawal(Integer language, Integer pageNum, Integer size, Integer type, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<Map<String, Object>> list = withdrawalService.queryWithdrawal(uid, type, pageNum, size);
+ List<Map<String, Object>> list = withdrawalService.queryWithdrawal(language, uid, type, pageNum, size);
return ResultUtil.success(WithdrawalWarpper.getWithdrawalWarpper(list));
}catch (Exception e){
e.printStackTrace();
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
index e534dfe..0f26fd1 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/controller/OrderCrossCityController.java
@@ -58,9 +58,9 @@
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<OrderWarpper> queryOrderInfo(Integer orderId){
+ public ResultUtil<OrderWarpper> queryOrderInfo(Integer language, Integer orderId){
try {
- Map<String, Object> map = orderCrossCityService.queryOrderInfo(orderId);
+ Map<String, Object> map = orderCrossCityService.queryOrderInfo(language, orderId);
return ResultUtil.success(OrderWarpper.getOrderWarpper(map));
}catch (Exception e){
e.printStackTrace();
@@ -114,9 +114,9 @@
@ApiImplicitParam(value = "跨城订单id", name = "orderId", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<OrderCrossCityInfoWrapper> queryOrderCrossCityInfo(Integer orderId){
+ public ResultUtil<OrderCrossCityInfoWrapper> queryOrderCrossCityInfo(Integer language, Integer orderId){
try {
- Map<String, Object> map = orderCrossCityService.queryOrderCrossCityInfo(orderId);
+ Map<String, Object> map = orderCrossCityService.queryOrderCrossCityInfo(language, orderId);
return ResultUtil.success(OrderCrossCityInfoWrapper.getOrderInfoWarpper(map));
}catch (Exception e){
e.printStackTrace();
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml
index 8cfe2a6..d939109 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml
@@ -207,7 +207,7 @@
a.userId as userId,
a.driverId as driverId,
a.state as orderState,
- CONCAT(DATE_FORMAT(a.travelTime, '%m月%d日'), ' ', d.startTime) as travelTime_,
+ CONCAT(DATE_FORMAT(a.travelTime, '%m-%d'), ' ', d.startTime) as travelTime_,
CONCAT(DATE_FORMAT(a.travelTime, '%Y-%m-%d'), ' ', d.startTime) as travelTime,
DATE_FORMAT(a.arriveTime, '%Y-%m-%d %H:%i:%s') as arriveTime,
a.startAddress as startAddress,
@@ -241,7 +241,7 @@
a.driverId as driverId,
a.state as orderState,
a.travelTime as travelTime,
- CONCAT(DATE_FORMAT(a.travelTime, '%m月%d日'), ' ', d.startTime) as travelTime_,
+ CONCAT(DATE_FORMAT(a.travelTime, '%m-%d'), ' ', d.startTime) as travelTime_,
CONCAT(DATE_FORMAT(a.arriveTime, '%Y-%m-%d'), ' ', d.startTime) as arriveTime,
a.startAddress as startAddress,
a.endAddress as endAddress,
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java
index 675de8c..0512cb3 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java
@@ -29,7 +29,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryOrderList(Integer state, Integer driverId) throws Exception;
+ List<Map<String, Object>> queryOrderList(Integer language, Integer state, Integer driverId) throws Exception;
@@ -40,7 +40,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception;
+ List<Map<String, Object>> queryMyAllOrder(Integer language, Integer state, Integer uid) throws Exception;
/**
@@ -49,7 +49,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryOrderInfo(Integer orderId) throws Exception;
+ Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception;
@@ -69,7 +69,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryOrderCrossCityInfo(Integer orderId) throws Exception;
+ Map<String, Object> queryOrderCrossCityInfo(Integer language, Integer orderId) throws Exception;
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 26d54db..e8a6a2e 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -152,8 +152,13 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryOrderList(Integer state, Integer driverId) throws Exception {
- return orderCrossCityMapper.queryOrderList(state, driverId);
+ public List<Map<String, Object>> queryOrderList(Integer language, Integer state, Integer driverId) throws Exception {
+ List<Map<String, Object>> list = orderCrossCityMapper.queryOrderList(state, driverId);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
/**
@@ -164,8 +169,13 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception {
- return orderCrossCityMapper.queryMyAllOrder(state, uid);
+ public List<Map<String, Object>> queryMyAllOrder(Integer language, Integer state, Integer uid) throws Exception {
+ List<Map<String, Object>> list = orderCrossCityMapper.queryMyAllOrder(state, uid);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
@@ -176,7 +186,7 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
+ public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
Map<String, Object> map = new HashMap<>();
OrderCrossCity orderCrossCity = this.selectById(orderId);
List<Map<String, Object>> order = orderCrossCityMapper.queryOrderInfo(orderCrossCity.getOrderNum());
@@ -184,6 +194,12 @@
Double serverMoney = 0D;
Double totalMoney = 0D;
for(Map<String, Object> m : order){
+ String travelTime_ = map.get("travelTime_").toString();
+ map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ String travelTime = map.get("travelTime").toString();
+ map.put("travelTime", DateUtil.conversionFormat(language, travelTime));
+ String arriveTime = map.get("arriveTime").toString();
+ map.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
num += Integer.valueOf(m.get("peopleNumber").toString());
totalMoney += Double.valueOf(m.get("payMoney").toString());
List<Income> incomes = incomeService.queryData(1, null, 2, Integer.valueOf(m.get("orderId").toString()), 3);
@@ -287,8 +303,13 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryOrderCrossCityInfo(Integer orderId) throws Exception {
- return orderCrossCityMapper.queryOrderCrossCityInfo(orderId);
+ public Map<String, Object> queryOrderCrossCityInfo(Integer language, Integer orderId) throws Exception {
+ Map<String, Object> map = orderCrossCityMapper.queryOrderCrossCityInfo(orderId);
+ String travelTime_ = map.get("travelTime_").toString();
+ map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ String arriveTime = map.get("arriveTime").toString();
+ map.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
+ return map;
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
index 3f18689..30dea3b 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
@@ -76,7 +76,7 @@
a.id as id,
a.state as orderState,
if(#{language} = 1, '包裹', if(#{language} = 2, 'Package', 'Livraison')) as orderName,
- DATE_FORMAT(a.travelTime, '%m月%d日 %H:%i') as travelTime,
+ DATE_FORMAT(a.travelTime, '%m-%d %H:%i') as travelTime,
a.startAddress as startAddress,
a.endAddress as endAddress,
a.startLon as startLon,
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
index db4f0d2..615446c 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
@@ -38,7 +38,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryOrderInfo(Integer orderId) throws Exception;
+ Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception;
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 4a5874e..e8e6fc0 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -109,7 +109,10 @@
*/
@Override
public Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception {
- return orderLogisticsMapper.queryPushOrder(orderId, language);
+ Map<String, Object> map = orderLogisticsMapper.queryPushOrder(orderId, language);
+ String travelTime = map.get("travelTime").toString();
+ map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
+ return map;
}
@@ -127,7 +130,7 @@
return ResultUtil.error(language == 1 ? "订单已取消" : language == 2 ? "Order cancelled" : "Commande annulée");
}
if(orderLogistics.getState() != 1){
- return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "A little slow. The order's been taken" : "La main est un peu lente oh l’ordre a été volé");
+ return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "Too slow, order was snatched!" : "Trop lent, l’ordre a été arraché!");
}
Driver driver = driverService.selectById(uid);
orderLogistics.setDriverId(uid);
@@ -210,8 +213,11 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
- return orderLogisticsMapper.queryOrderInfo(orderId);
+ public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
+ Map<String, Object> map = orderLogisticsMapper.queryOrderInfo(orderId);
+ String travelTime_ = map.get("travelTime_").toString();
+ map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ return map;
}
@@ -302,13 +308,13 @@
String path = templatePath + "user/receiptLogistics.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Driver driver = driverService.selectById(orderLogistics.getDriverId());
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(sdf.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
+ title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
Element xj_chinese = document.getElementById("xj_chinese");
@@ -324,7 +330,7 @@
// Element track_chinese = document.getElementById("track_chinese");
// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
+ pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_chinese = document.getElementsByClass("driver_chinese");
for (int i = 0; i < driver_chinese.size(); i++) {
Element element = driver_chinese.get(i);
@@ -342,7 +348,7 @@
document.getElementById("chinese").remove();
document.getElementById("french").remove();
Element title_english = document.getElementById("title_english");
- title_english.text(sdf.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
+ title_english.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
xcf_english.text("GHS " + orderLogistics.getOrderMoney());
Element xj_english = document.getElementById("xj_english");
@@ -358,7 +364,7 @@
// Element track_english = document.getElementById("track_english");
// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
+ pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_english = document.getElementsByClass("driver_english");
for (int i = 0; i < driver_english.size(); i++) {
Element element = driver_english.get(i);
@@ -376,7 +382,7 @@
document.getElementById("chinese").remove();
document.getElementById("english").remove();
Element title_french = document.getElementById("title_french");
- title_french.text(sdf.format(orderLogistics.getTravelTime()) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
+ title_french.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
Element xcf_french = document.getElementById("xcf_french");
xcf_french.text("GHS " + orderLogistics.getOrderMoney());
Element xj_french = document.getElementById("xj_french");
@@ -392,7 +398,7 @@
// Element track_french = document.getElementById("track_french");
// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
+ pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_french = document.getElementsByClass("driver_french");
for (int i = 0; i < driver_french.size(); i++) {
Element element = driver_french.get(i);
@@ -460,13 +466,13 @@
String path = templatePath + "user/receiptLogistics.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Driver driver = driverService.selectById(orderLogistics.getDriverId());
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(sdf.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
+ title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
Element xj_chinese = document.getElementById("xj_chinese");
@@ -482,7 +488,7 @@
// Element track_chinese = document.getElementById("track_chinese");
// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
+ pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_chinese = document.getElementsByClass("driver_chinese");
for (int i = 0; i < driver_chinese.size(); i++) {
Element element = driver_chinese.get(i);
@@ -500,7 +506,7 @@
document.getElementById("chinese").remove();
document.getElementById("french").remove();
Element title_english = document.getElementById("title_english");
- title_english.text(sdf.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
+ title_english.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
xcf_english.text("GHS " + orderLogistics.getOrderMoney());
Element xj_english = document.getElementById("xj_english");
@@ -516,7 +522,7 @@
// Element track_english = document.getElementById("track_english");
// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
+ pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_english = document.getElementsByClass("driver_english");
for (int i = 0; i < driver_english.size(); i++) {
Element element = driver_english.get(i);
@@ -534,7 +540,7 @@
document.getElementById("chinese").remove();
document.getElementById("english").remove();
Element title_french = document.getElementById("title_french");
- title_french.text(sdf.format(orderLogistics.getTravelTime()) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
+ title_french.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
Element xcf_french = document.getElementById("xcf_french");
xcf_french.text("GHS " + orderLogistics.getOrderMoney());
Element xj_french = document.getElementById("xj_french");
@@ -550,7 +556,7 @@
// Element track_french = document.getElementById("track_french");
// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
+ pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_french = document.getElementsByClass("driver_french");
for (int i = 0; i < driver_french.size(); i++) {
Element element = driver_french.get(i);
@@ -618,13 +624,13 @@
String path = templatePath + "user/receiptLogistics.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Driver driver = driverService.selectById(orderLogistics.getDriverId());
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(sdf2.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
+ title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
Element xcf_chinese = document.getElementById("xcf_chinese");
xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
Element xj_chinese = document.getElementById("xj_chinese");
@@ -640,7 +646,7 @@
// Element track_chinese = document.getElementById("track_chinese");
// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
Element pay_time_chinese = document.getElementById("pay_time_chinese");
- pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
+ pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_chinese = document.getElementsByClass("driver_chinese");
for (int i = 0; i < driver_chinese.size(); i++) {
Element element = driver_chinese.get(i);
@@ -658,7 +664,7 @@
document.getElementById("chinese").remove();
document.getElementById("french").remove();
Element title_english = document.getElementById("title_english");
- title_english.text(sdf2.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
+ title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
xcf_english.text("GHS " + orderLogistics.getOrderMoney());
Element xj_english = document.getElementById("xj_english");
@@ -674,7 +680,7 @@
// Element track_english = document.getElementById("track_english");
// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
Element pay_time_english = document.getElementById("pay_time_english");
- pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
+ pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_english = document.getElementsByClass("driver_english");
for (int i = 0; i < driver_english.size(); i++) {
Element element = driver_english.get(i);
@@ -692,7 +698,7 @@
document.getElementById("chinese").remove();
document.getElementById("english").remove();
Element title_french = document.getElementById("title_french");
- title_french.text(sdf2.format(orderLogistics.getTravelTime()) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
+ title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
Element xcf_french = document.getElementById("xcf_french");
xcf_french.text("GHS " + orderLogistics.getOrderMoney());
Element xj_french = document.getElementById("xj_french");
@@ -708,7 +714,7 @@
// Element track_french = document.getElementById("track_french");
// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
Element pay_time_french = document.getElementById("pay_time_french");
- pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
+ pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
Elements driver_french = document.getElementsByClass("driver_french");
for (int i = 0; i < driver_french.size(); i++) {
Element element = driver_french.get(i);
@@ -787,7 +793,7 @@
public ResultUtil fillInPickUpCode(Integer orderId, String pickUpCode, Integer language) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
if(!"1246".equals(pickUpCode) && !orderLogistics.getPickUpCode().equals(pickUpCode)){
- return ResultUtil.error(language == 1 ? "验证失败" : language == 2 ? "Verification failure" : "Échec de vérification");
+ return ResultUtil.error(language == 1 ? "验证失败" : language == 2 ? "Verification failed" : "Echec de la validation");
}
orderLogistics.setState(9);
this.updateById(orderLogistics);
@@ -807,7 +813,7 @@
OrderLogisticsSpread query = orderLogisticsSpreadService.query(orderId);
OrderLogistics orderLogistics = this.selectById(orderId);
if(orderLogistics.getState() != 4 && orderLogistics.getState() != 8){
- return ResultUtil.error(language == 1 ? "不允许设置差价" : language == 2 ? "Price difference is not allowed" : "Les spreads ne sont pas autorisés");
+ return ResultUtil.error(language == 1 ? "不允许设置差价" : language == 2 ? "To set price difference is not allowed." : "Il n’est pas permis de définir une différence de prix.");
}
if(query != null){
query.setPrice(difference);
@@ -832,7 +838,12 @@
@Override
public List<Map<String, Object>> queryOrderList(Integer driverId, Integer language) throws Exception {
- return orderLogisticsMapper.queryOrderList(driverId, language);
+ List<Map<String, Object>> list = orderLogisticsMapper.queryOrderList(driverId, language);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
/**
@@ -844,7 +855,12 @@
*/
@Override
public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception {
- return orderLogisticsMapper.queryMyAllOrder(state, uid, language);
+ List<Map<String, Object>> list = orderLogisticsMapper.queryMyAllOrder(state, uid, language);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
@@ -862,7 +878,7 @@
return ResultUtil.error(language == 1 ? "订单已取消" : language == 2 ? "Order cancelled" : "Commande annulée");
}
if(orderLogistics.getState() != 1){
- return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦！" : language == 2 ? "Hand speed is a little slow oh, the order has been robbed!" : "La main est un peu lente oh, l’ordre a été volé!");
+ return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "Too slow, order was snatched!" : "Trop lent, l’ordre a été arraché!");
}
Driver driver = driverService.selectById(uid);
orderLogistics.setDriverId(uid);
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
index 0d934d6..7b93b3d 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
@@ -63,7 +63,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryOrderInfo(Integer orderId) throws Exception;
+ Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception;
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 78b11d2..2eccc49 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -102,7 +102,12 @@
*/
@Override
public List<Map<String, Object>> queryOrderList(Integer state, Integer driverId, Integer language) throws Exception {
- return orderPrivateCarMapper.queryOrderList(state, driverId, language);
+ List<Map<String, Object>> list = orderPrivateCarMapper.queryOrderList(state, driverId, language);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
/**
@@ -114,7 +119,12 @@
*/
@Override
public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception {
- return orderPrivateCarMapper.queryMyAllOrder(state, uid, language);
+ List<Map<String, Object>> list = orderPrivateCarMapper.queryMyAllOrder(state, uid, language);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
@@ -126,7 +136,10 @@
*/
@Override
public Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception {
- return orderPrivateCarMapper.queryPushOrder(orderId, language);
+ Map<String, Object> map = orderPrivateCarMapper.queryPushOrder(orderId, language);
+ String travelTime = map.get("travelTime").toString();
+ map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
+ return map;
}
@@ -161,7 +174,7 @@
.eq("place", orderPrivateCar.getPlace())
);
if(list.size() > 0 || list1.size() > 0){
- return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "A little slow. The order's been taken" : "La main est un peu lente oh l’ordre a été volé");
+ return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "Too slow, order was snatched!" : "Trop lent, l’ordre a été arraché!");
}
}
@@ -169,7 +182,7 @@
return ResultUtil.error(language == 1 ? "订单已取消" : language == 2 ? "Order cancelled" : "Commande annulée");
}
if(orderPrivateCar.getState() != 1){
- return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "A little slow. The order's been taken" : "La main est un peu lente oh l’ordre a été volé");
+ return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "Too slow, order was snatched!" : "Trop lent, l’ordre a été arraché!");
}
Driver driver = driverService.selectById(uid);
orderPrivateCar.setDriverId(uid);
@@ -239,8 +252,11 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
- return orderPrivateCarMapper.queryOrderInfo(orderId);
+ public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
+ Map<String, Object> map = orderPrivateCarMapper.queryOrderInfo(orderId);
+ String travelTime_ = map.get("travelTime_").toString();
+ map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ return map;
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
index 675c7bb..bcb6a79 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
@@ -10,46 +10,5 @@
public interface UserCouponRecordMapper extends BaseMapper<UserCouponRecord> {
- /**
- * 获取可用优惠券数量
- * @param uid
- * @param companyId
- * @param state
- * @param couponUseType
- * @return
- */
- int queryAvailable(@Param("uid") Integer uid, @Param("companyId") Integer companyId,
- @Param("state") Integer state, @Param("couponUseType") Integer couponUseType,
- @Param("money") Double money);
-
- /**
- * 获取优惠券列表
- * @param uid
- * @param companyId
- * @param state
- * @param couponUseType
- * @return
- */
- List<Map<String, Object>> queryCoupon(@Param("uid") Integer uid, @Param("companyId") Integer companyId,
- @Param("state") Integer state, @Param("couponUseType") Integer couponUseType,
- @Param("money") Double money, @Param("pageNum") Integer pageNum,
- @Param("size") Integer size);
-
- /**
- * 获取优惠券列表
- * @param state
- * @param pageNum
- * @param size
- * @param uid
- * @return
- */
- List<Map<String, Object>> queryMyCoupons(@Param("state") Integer state, @Param("pageNum") Integer pageNum,
- @Param("size") Integer size, @Param("uid") Integer uid);
-
-
- /**
- * 修改过期状态
- */
- void updateTimeOut();
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index c3612d6..4d9ac6d 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -801,7 +801,7 @@
phone as phone,
CONCAT(firstName, " ", lastName) as name,
headImgUrl as avatar,
- DATE_FORMAT(insertTime,'%Y/%m/%d %H:%i') as insertTime
+ DATE_FORMAT(insertTime,'%Y-%m-%d %H:%i') as insertTime
from
t_driver
where uid=#{uid}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml
index 34d1f95..6ab69e8 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml
@@ -19,103 +19,4 @@
<result column="activityType" property="activityType"/>
</resultMap>
-
-
- <select id="queryAvailable" resultType="int">
- select
- count(a.id)
- from t_user_coupon_record a
- left join t_company b on (a.companyId = b.id)
- where a.expirationTime >= now()
- <if test="null != uid">
- and a.userId = #{uid}
- </if>
- <if test="null != companyId">
- and a.companyId = #{companyId}
- </if>
- <if test="null != state">
- and a.state = #{state}
- </if>
- <if test="null != couponUseType">
- and a.couponUseType = #{couponUseType}
- </if>
- <if test="null != money">
- and if(a.couponType = 1, a.money < #{money}, a.fullMoney < #{money})
- </if>
- </select>
-
- <select id="queryCoupon" resultType="map">
- select
- a.id as id,
- a.money as money,
- a.couponUseType as userType,
- DATE_FORMAT(a.expirationTime, '%Y-%m-%d') as time,
- a.couponType as `type`,
- a.fullMoney as fullMoney,
- a.state as state,
- b.`name` as `name`
- from t_user_coupon_record a
- left join t_company b on (a.companyId = b.id)
- where a.expirationTime >= now()
- <if test="null != uid">
- and a.userId = #{uid}
- </if>
- <if test="null != companyId">
- and a.companyId = #{companyId}
- </if>
- <if test="null != state">
- and a.state = #{state}
- </if>
- <if test="null != couponUseType">
- and a.couponUseType = #{couponUseType}
- </if>
- <if test="null != money">
- and if(a.couponType = 1, a.money < #{money}, a.fullMoney < #{money})
- </if>
- order by a.insertTime desc
- <if test="null != pageNum and null != size">
- limit #{pageNum}, #{size}
- </if>
- </select>
-
-
-
-
-
-
- <select id="queryMyCoupons" resultType="map">
- select
- a.id as id,
- a.money as money,
- a.couponUseType as userType,
- DATE_FORMAT(a.expirationTime, '%Y-%m-%d') as time,
- a.couponType as `type`,
- a.fullMoney as fullMoney,
- a.state as state,
- b.`name` as `name`
- from t_user_coupon_record a
- left join t_company b on (a.companyId = b.id)
- where 1 = 1
- <if test="null != uid">
- and a.userId = #{uid}
- </if>
- <if test="null != state">
- <if test="state == 1">
- and a.state = 1
- </if>
- <if test="state == 2">
- and a.state in (2,3)
- </if>
- </if>
- order by a.insertTime desc
- <if test="null != pageNum and null != size">
- limit #{pageNum}, #{size}
- </if>
- </select>
-
-
-
- <update id="updateTimeOut">
- update t_user_coupon_record set state = 3 where now() > expirationTime and state = 1
- </update>
</mapper>
\ No newline at end of file
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
index 653906e..8353e70 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
@@ -195,7 +195,7 @@
phone as phone,
IFNULL(lastName ,nickName) as name,
avatar as avatar,
- DATE_FORMAT(insertTime,'%Y/%m/%d %H:%i') as insertTime
+ DATE_FORMAT(insertTime,'%Y-%m-%d %H:%i') as insertTime
from t_user
where uid=#{uid}
and uType=#{uType}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
index 0067a7c..ced9ff2 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java
@@ -170,7 +170,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryInfo(Integer uid) throws Exception;
+ Map<String, Object> queryInfo(Integer language, Integer uid) throws Exception;
/**
@@ -238,7 +238,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryPenalties(Integer pageNum, Integer size, Integer uid) throws Exception;
+ List<Map<String, Object>> queryPenalties(Integer language, Integer pageNum, Integer size, Integer uid) throws Exception;
/**
@@ -249,7 +249,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryActivityIncome(Integer uid, Integer pageNum, Integer size) throws Exception;
+ List<Map<String, Object>> queryActivityIncome(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception;
/**
@@ -260,7 +260,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryTotalRevenue(Integer uid, Integer pageNum, Integer size) throws Exception;
+ List<Map<String, Object>> queryTotalRevenue(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception;
/**
@@ -384,7 +384,7 @@
* @param size
* @return java.util.List<Map<String,Object>>
*/
- List<Map<String,Object>> queryMyInviteList(Integer type,Integer uid, Integer pageNum, Integer size) throws Exception;
+ List<Map<String,Object>> queryMyInviteList(Integer language, Integer type,Integer uid, Integer pageNum, Integer size) throws Exception;
/**
*
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java
index 7e41e53..840ee8a 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java
@@ -30,7 +30,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> query(Integer userType, Integer objectId, Integer type, Integer pageNum, Integer size) throws Exception;
+ List<Map<String, Object>> query(Integer language, Integer userType, Integer objectId, Integer type, Integer pageNum, Integer size) throws Exception;
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderCancelService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderCancelService.java
index 7df13cd..6d7d06c 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderCancelService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderCancelService.java
@@ -44,5 +44,5 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryCancel(Integer uid, Integer isPay) throws Exception;
+ List<Map<String, Object>> queryCancel(Integer language, Integer uid, Integer isPay) throws Exception;
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderEvaluateService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderEvaluateService.java
index a0dc45b..c602812 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderEvaluateService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderEvaluateService.java
@@ -16,5 +16,5 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryEvaluate(Integer pageNum, Integer size, Integer uid) throws Exception;
+ Map<String, Object> queryEvaluate(Integer language, Integer pageNum, Integer size, Integer uid) throws Exception;
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java
index cac8617..2d08ac3 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderService.java
@@ -80,7 +80,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryOrderInfo(Integer orderId, Integer orderType) throws Exception;
+ Map<String, Object> queryOrderInfo(Integer language, Integer orderId, Integer orderType) throws Exception;
/**
@@ -153,7 +153,7 @@
* @param orderType
* @return
*/
- Map<String, Object> queryToBePaidPage(Integer orderId, Integer orderType) throws Exception;
+ Map<String, Object> queryToBePaidPage(Integer language, Integer orderId, Integer orderType) throws Exception;
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java
index 83a7b70..c227798 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IReassignService.java
@@ -37,7 +37,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryList(Integer uid, Integer pageNum, Integer size) throws Exception;
+ List<Map<String, Object>> queryList(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception;
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISettlementRecordService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISettlementRecordService.java
index 4793e2d..d72c9b1 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISettlementRecordService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISettlementRecordService.java
@@ -20,7 +20,7 @@
* @param driverId
* @return
*/
- QuerySettlementAmount querySettlementAmount(Integer driverId);
+ QuerySettlementAmount querySettlementAmount(Integer language, Integer driverId);
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemNoticeService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemNoticeService.java
index 189ad9e..e800fee 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemNoticeService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISystemNoticeService.java
@@ -35,7 +35,7 @@
* @param uid
* @return
*/
- List<Map<String, Object>> queryList(Integer type, Integer pageNum, Integer size, Integer uid);
+ List<Map<String, Object>> queryList(Integer language, Integer type, Integer pageNum, Integer size, Integer uid);
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IWithdrawalService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IWithdrawalService.java
index 2de1b6f..dd1f2ef 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IWithdrawalService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IWithdrawalService.java
@@ -25,7 +25,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryWithdrawal(Integer uid, Integer type, Integer pageNum, Integer size) throws Exception;
+ List<Map<String, Object>> queryWithdrawal(Integer language, Integer uid, Integer type, Integer pageNum, Integer size) throws Exception;
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/BankCardServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/BankCardServiceImpl.java
index a8fd699..5d90f3c 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/BankCardServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/BankCardServiceImpl.java
@@ -30,7 +30,7 @@
public ResultUtil saveBankCard(String bank, String lastName,String firstName, String code, Integer driverId, Integer language) throws Exception {
BankCard query = bankCardMapper.query(driverId, code);
if(null != query){
- return ResultUtil.error(language == 1 ? "银行卡号已存在" : language == 2 ? "The bank card number already exists" : "Le numéro de carte bancaire existe déjà");
+ return ResultUtil.error(language == 1 ? "银行卡号已存在" : language == 2 ? "Bank card number is already existent." : "Le numéro de carte bancaire existe déjà.");
}
BankCard bankCard = new BankCard();
bankCard.setBank(bank);
@@ -47,7 +47,7 @@
public ResultUtil updateBankCard(Integer id, String bank, String lastName,String firstName, String code, Integer driverId, Integer language) throws Exception {
BankCard query = bankCardMapper.query(driverId, code);
if(null != query && !id.equals(query.getId())){
- return ResultUtil.error(language == 1 ? "银行卡号已存在" : language == 2 ? "The bank card number already exists" : "Le numéro de carte bancaire existe déjà");
+ return ResultUtil.error(language == 1 ? "银行卡号已存在" : language == 2 ? "Bank card number is already existent." : "Le numéro de carte bancaire existe déjà.");
}
BankCard bankCard = query;
bankCard.setBank(bank);
@@ -71,7 +71,7 @@
public ResultUtil delBankCard(Integer id, Integer driverId, Integer language) throws Exception {
BankCard bankCard = this.selectById(id);
if(bankCard.getUserId().compareTo(driverId) != 0){
- return ResultUtil.error(language == 1 ? "你无权删除此卡号" : language == 2 ? "You have no right to delete this card number" : "Vous n’êtes pas autorisé à supprimer ce numéro de carte");
+ return ResultUtil.error(language == 1 ? "你无权删除此卡号" : language == 2 ? "You have no clearance to cancel the card number." : "Vous n’avez pas l’autorisation d’annuler le numéro de carte.");
}
this.deleteById(id);
return ResultUtil.success();
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
index d2f48c8..c22a6a8 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CarServiceImpl.java
@@ -132,11 +132,11 @@
Car query = carMapper.query(licensePlate);
if(id==null){
if(null != query){
- return ResultUtil.error(language == 1 ? "车牌号已经使用" : language == 2 ? "License plate number has been used" : "Plaque d’immatriculation déjà utilisée");
+ return ResultUtil.error(language == 1 ? "车牌号已经使用" : language == 2 ? "Plate number is already in use" : "Le numéro de plaque est déjà utilisé");
}
}else{
if(null != query && !id.equals(query.getId())){
- return ResultUtil.error(language == 1 ? "车牌号已经使用" : language == 2 ? "License plate number has been used" : "Plaque d’immatriculation déjà utilisée");
+ return ResultUtil.error(language == 1 ? "车牌号已经使用" : language == 2 ? "Plate number is already in use" : "Le numéro de plaque est déjà utilisé");
}
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java
index ead6fe8..6e6d519 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOrdersServiceImpl.java
@@ -59,7 +59,7 @@
//判断当前业务是否已经出车
DriverWork driverWork = driverWorkMapper.queryNewWork(uid, type, 1);
if(null != driverWork){
- return ResultUtil.error(language == 1 ? "该业务已经出车，无法取消设置" : language == 2 ? "This service has been deployed and cannot be canceled" : "Cette entreprise est déjà hors du véhicule et ne peut pas être désactivée");
+ return ResultUtil.error(language == 1 ? "该业务已经出车，无法取消设置" : language == 2 ? "The driver is on the way, no way to cancel." : "Le chauffeur est en route, pas moyen de l’annuler.");
}
this.deleteById(query.getId());
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 24269b7..f677fb2 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -177,13 +177,13 @@
Driver driver1 = driverMapper.queryByPhone(phone);
if(null != driver1){
if(driver1.getAuthState() == 1){
- return ResultUtil.error(language == 1 ? "该司机正在审核中" : language == 2 ? "The driver is currently under review" : "The driver is currently under review");
+ return ResultUtil.error(language == 1 ? "该司机正在审核中" : language == 2 ? "The driver is being reviewed." : "Le chauffeur est en cours d’examen.");
}
if(driver1.getAuthState() == 2){
- return ResultUtil.error(language == 1 ? "该司机已存在" : language == 2 ? "The driver already exists" : "Les Driver already exists");
+ return ResultUtil.error(language == 1 ? "该司机已存在" : language == 2 ? "The driver is already existent." : "Le chauffeur existe déjà.");
}
if(driver1.getAuthState() == 3){
- return ResultUtil.error(language == 1 ? "该司机账号已被冻结" : language == 2 ? "The driver's account has been frozen" : "Le compte du conducteur a été froid");
+ return ResultUtil.error(language == 1 ? "该司机账号已被冻结" : language == 2 ? "Driver account is frozen." : "Le compte du chauffeur est gelé.");
}
}
}
@@ -481,7 +481,7 @@
public ResultUtil<LoginWarpper> registeredDriver(String phoneOperator, String phone, String code, String password,Integer uid,Integer uType, Integer language) throws Exception {
boolean b = this.checkCaptcha("", phone, code);
if(!b){
- return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
Driver driver1 = driverMapper.queryByPhone_(phone, 4);//获取审核不通过的数据
@@ -555,7 +555,7 @@
String[] city = new String[]{city1.getEnglishName()};
Company query = companyCityService.query(city);
if(null == query){
- return ResultUtil.error(language == 1 ? "选择从业地暂未开通业务" : language == 2 ? "The selected place of employment has not yet opened business" : "Choisir un lieu de pratique pas encore ouvert");
+ return ResultUtil.error(language == 1 ? "选择从业地暂未开通业务" : language == 2 ? "Not yet to commence business at the workplace selected." : "N’a pas encore commencé ses activités sur le lieu de travail sélectionné.");
}
if(null != query){
switch (query.getType()){
@@ -726,11 +726,11 @@
public ResultUtil resetPassword(String phone, String code, String password, Integer language) throws Exception {
boolean b = this.checkCaptcha("", phone, code);
if(!b){
- return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
Driver driver = driverMapper.queryByPhone(phone);
if(null == driver){
- return ResultUtil.error(language == 1 ? "电话号码未注册" : language == 2 ? "The phone number is not registered" : "Numéro de téléphone non enregistré");
+ return ResultUtil.error(language == 1 ? "电话号码未注册" : language == 2 ? "Mobile phone number was not registered." : "Le numéro de téléphone portable n’a pas été enregistré.");
}
driver.setPassword(ShiroKit.md5(password, salt));
driverMapper.updateById(driver);
@@ -877,16 +877,16 @@
public ResultUtil<LoginWarpper> driverLogin(String phone, String password, Integer language) throws Exception {
Driver driver = driverMapper.queryByPhone(phone);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账号未注册" : language == 2 ? "Account not registered" : "Compte non enregistré");
+ return ResultUtil.error(language == 1 ? "账号未注册" : language == 2 ? "Account unregistered" : "Compte non enregistré");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
}
if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){
- return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
+ return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
}
String value = redisUtil.getValue("DEVICE_" + driver.getId());
@@ -1005,20 +1005,20 @@
}
//判断是否存在审核中的资料
if(driver.getAuthState()==1){
- return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data review, can't get out of the car" : "Données en cours de vérification, pas de voiture disponible");
+ return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data is being reviewed, unable to drive." : "Les données sont en cours d’examen, il est impossible de conduire.");
}
if(driver.getAuthState()==4){
- return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
+ return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
}
Car car = carService.selectById(driver.getCarId());
if(car==null){
- return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
+ return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
}
if(car.getAuthState()==1){
- return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data review, can't get out of the car" : "Données en cours de vérification, pas de voiture disponible");
+ return ResultUtil.error(language == 1 ? "资料审核中，不能出车" : language == 2 ? "Data is being reviewed, unable to drive." : "Les données sont en cours d’examen, il est impossible de conduire.");
}
if(car.getAuthState()==4){
- return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete the information before leaving the car" : "Veuillez compléter vos données avant de sortir");
+ return ResultUtil.error(language == 1 ? "请完善资料后再出车" : language == 2 ? "Please complete data before driving." : "Veuillez compléter les données avant de conduire.");
}
driverWork = new DriverWork();
driverWork.setState(1);
@@ -1110,9 +1110,9 @@
public Map<String, Object> queryHomeNum(Integer uid, Integer language) throws Exception {
Map<String, Object> map = new HashMap<>();
//出租车
- List<Map<String, Object>> list = orderTaxiService.queryOrderList(1, uid);
+ List<Map<String, Object>> list = orderTaxiService.queryOrderList(language, 1, uid);
map.put("service", list.size());//服务中
- list = orderTaxiService.queryOrderList(2, uid);
+ list = orderTaxiService.queryOrderList(language, 2, uid);
map.put("reservation", list.size());//预约
List<Map<String, Object>> list1 = orderLogisticsService.queryOrderList(uid, language);
map.put("small", list1.size());//小件
@@ -1137,7 +1137,7 @@
baseWarpper.setId(d.getType());
switch (d.getType()){
case 1:
- baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course ");
+ baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
break;
case 2:
baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "taxi" : "taxi");
@@ -1146,7 +1146,7 @@
baseWarpper.setName(language == 1 ? "跨城出行" : language == 2 ? "Cross-town travel" : "Se déplacer à travers la ville");
break;
case 4:
- baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
+ baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison");
break;
case 5:
baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "Cross-city small parts logistics" : "Logistique des petites pièces à travers la ville");
@@ -1172,8 +1172,14 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryInfo(Integer uid) throws Exception {
+ public Map<String, Object> queryInfo(Integer language, Integer uid) throws Exception {
Map<String, Object> map = driverMapper.queryInfo(uid);
+ String birthday = map.get("birthday").toString();
+ map.put("birthday", DateUtil.conversionFormat(language, birthday));
+ String networkCarlssueDate = map.get("networkCarlssueDate").toString();
+ map.put("networkCarlssueDate", DateUtil.conversionFormat(language, networkCarlssueDate));
+ String getDriverLicenseDate = map.get("getDriverLicenseDate").toString();
+ map.put("getDriverLicenseDate", DateUtil.conversionFormat(language, getDriverLicenseDate));
if(ToolUtil.isEmpty(map.get("qrCode"))){
//获取小程序二维码
Driver driver = new Driver();
@@ -1198,11 +1204,11 @@
public ResultUtil updatePhone(String phoneOperator, String phone, String code, Integer uid, Integer language) throws Exception {
Driver driver = driverMapper.queryByPhone(phone);
if(null != driver){
- return ResultUtil.error(language == 1 ? "电话号码已被注册" : language == 2 ? "he phone number is registered" : "Le numéro de téléphone a été enregistré");
+ return ResultUtil.error(language == 1 ? "电话号码已被注册" : language == 2 ? "Mobile phone number has been registered." : "Le numéro de téléphone portable a été enregistré.");
}
boolean b = this.checkCaptcha("", phone, code);
if(!b){
- return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid captcha" : "Code de vérification invalide");
+ return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
}
Driver driver1 = this.selectById(uid);
driver1.setAccount(phone);
@@ -1355,24 +1361,24 @@
public ResultUtil replaceCar(Integer carId, Integer uid, Integer language) throws Exception {
Driver driver = this.selectById(uid);
if(driver.getState() == 3){
- return ResultUtil.error(language == 1 ? "还在服务中，不能更换" : language == 2 ? "It is still in service and cannot be replaced" : "Toujours en service, non échangeable");
+ return ResultUtil.error(language == 1 ? "还在服务中，不能更换" : language == 2 ? "On trip, unable to change." : "En service, il est impossible de se changer.");
}
Car car = carService.selectById(carId);
if(null == car){
return ResultUtil.error(language == 1 ? "车辆无效" : language == 2 ? "Invalid vehicle" : "Véhicule non valide");
}
if(car.getAuthState() == 1){
- return ResultUtil.error(language == 1 ? "车辆正在审核中" : language == 2 ? "The vehicle is under review" : "Véhicule en révision");
+ return ResultUtil.error(language == 1 ? "车辆正在审核中" : language == 2 ? "Vehicle is being reviewed." : "Le véhicule est en cours d’examen.");
}
if(car.getAuthState() == 3){
- return ResultUtil.error(language == 1 ? "车辆已冻结" : language == 2 ? "Vehicle frozen" : "Le véhicule a été gelé");
+ return ResultUtil.error(language == 1 ? "车辆已冻结" : language == 2 ? "Vehicle is frozen." : "Le véhicule est gelé.");
}
if(car.getAuthState() == 4){
- return ResultUtil.error(language == 1 ? "车辆审核不通过" : language == 2 ? "Vehicle audit failed" : "Échec de l’audit du véhicule");
+ return ResultUtil.error(language == 1 ? "车辆审核不通过" : language == 2 ? "Vehicle is not verified and qualified." : "Le véhicule n’est pas vérifié ni qualifié.");
}
boolean idle = carService.idle(carId);
if(!idle){
- return ResultUtil.error(language == 1 ? "车辆已被绑定了" : language == 2 ? "The vehicle has been bound" : "e véhicule a été lié");
+ return ResultUtil.error(language == 1 ? "车辆已被绑定了" : language == 2 ? "Vehicle has been bound." : "Le véhicule a été connecté.");
}
driver.setCarId(carId);
this.updateById(driver);
@@ -1444,8 +1450,8 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryPenalties(Integer pageNum, Integer size, Integer uid) throws Exception {
- List<Map<String, Object>> list = reassignService.queryList(uid, pageNum, size);
+ public List<Map<String, Object>> queryPenalties(Integer language, Integer pageNum, Integer size, Integer uid) throws Exception {
+ List<Map<String, Object>> list = reassignService.queryList(language, uid, pageNum, size);
return list;
}
@@ -1459,8 +1465,8 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryActivityIncome(Integer uid, Integer pageNum, Integer size) throws Exception {
- List<Map<String, Object>> query = incomeService.query(2, uid, 1, pageNum, size);
+ public List<Map<String, Object>> queryActivityIncome(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception {
+ List<Map<String, Object>> query = incomeService.query(language,2, uid, 1, pageNum, size);
return query;
}
@@ -1474,8 +1480,8 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryTotalRevenue(Integer uid, Integer pageNum, Integer size) throws Exception {
- List<Map<String, Object>> query = incomeService.query(2, uid, 2, pageNum, size);
+ public List<Map<String, Object>> queryTotalRevenue(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception {
+ List<Map<String, Object>> query = incomeService.query(language, 2, uid, 2, pageNum, size);
return query;
}
@@ -1522,7 +1528,7 @@
}
switch (driverActivityOnline.getType()){
case 1:
- sb.append(language == 1 ? "打车" : language == 2 ? "Ride" : "Rouler");
+ sb.append(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
break;
case 2:
sb.append("出租车");
@@ -1531,7 +1537,7 @@
sb.append("城际出行");
continue;
case 4:
- sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Paquet");
+ sb.append(language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison");
break;
}
String str = language == 1 ? "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元" :
@@ -2365,13 +2371,13 @@
public ResultUtil loginByJobNumber(String jobNum, Integer language) {
Driver driver = driverMapper.queryByJobNum(jobNum);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
+ return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte.");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
}
List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
boolean b = true;
@@ -2382,7 +2388,7 @@
}
}
if(b){
- return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
+ return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
}
//开始自动设置接单类型，出车类型，上班状态
@@ -2463,13 +2469,13 @@
public ResultUtil loginByIdentification(String identification, Integer language) throws Exception {
Driver driver = driverMapper.queryByIdentification(identification);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
+ return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte.");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
}
List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
boolean b = true;
@@ -2480,7 +2486,7 @@
}
}
if(b){
- return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
+ return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
}
//开始自动设置接单类型，出车类型，上班状态
@@ -2549,13 +2555,13 @@
public ResultUtil loginByTaxiAptitudeCard(String taxiAptitudeCard, Integer language) throws Exception {
Driver driver = driverMapper.queryByTaxiAptitudeCard(taxiAptitudeCard);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account is not registered, please register an account first" : "Le compte n’est pas enregistré. Veuillez d’abord créer un compte");
+ return ResultUtil.error(language == 1 ? "账号未注册，请先注册账号" : language == 2 ? "Account unregistered, please register account first." : "Compte non enregistré, veuillez d’abord enregistrer le compte.");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "The account is under review, please wait patiently" : "Le compte est en cours d’examen, veuillez patienter");
+ return ResultUtil.error(language == 1 ? "账号正在审核中，请耐心等待" : language == 2 ? "Account is being reviewed, please wait." : "Le compte est en cours d’examen, veuillez patienter.");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "The account has been frozen. Please contact the administrator" : "Le compte a été bloqué, veuillez contacter l’administrateur");
+ return ResultUtil.error(language == 1 ? "账号已被冻结，请联系管理员" : language == 2 ? "Account is frozen,please contact admin." : "Le compte est gelé, veuillez contacter l’administrateur.");
}
List<DriverService> list = driverServiceMapper.queryMyBusiness(driver.getId());
boolean b = true;
@@ -2566,7 +2572,7 @@
}
}
if(b){
- return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No taxi service authority" : "Pas d’accès aux affaires de taxi");
+ return ResultUtil.error(language == 1 ? "没有出租车业务权限" : language == 2 ? "No clearance for ride service" : "Pas d’autorisation pour le service de course");
}
//开始自动设置接单类型，出车类型，上班状态
@@ -2655,10 +2661,10 @@
public ResultUtil verificationPassword(String password, Integer driverId, Integer language) throws Exception {
Driver driver = this.selectById(driverId);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
+ return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau.");
}
if(!driver.getPassword().equals(ShiroKit.md5(password, salt))){
- return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
+ return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
}
return ResultUtil.success();
}
@@ -2674,7 +2680,7 @@
public ResultUtil setWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception {
Driver driver = this.selectById(driverId);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
+ return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau.");
}
driver.setWithdrawPassword(ShiroKit.md5(withdrawPassword, salt));
this.updateById(driver);
@@ -2693,13 +2699,13 @@
public ResultUtil verificationWithdrawPassword(String withdrawPassword, Integer driverId, Integer language) throws Exception {
Driver driver = this.selectById(driverId);
if(null == driver){
- return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Account is invalid, please login again" : "Compte invalide, veuillez vous reconnecter");
+ return ResultUtil.error(language == 1 ? "账户无效，请重新登录" : language == 2 ? "Invalid account, please log in again." : "Compte invalide, veuillez vous connecter à nouveau.");
}
if(null == driver.getWithdrawPassword()){
- return ResultUtil.error(language == 1 ? "请先设置提现密码" : language == 2 ? "Please set the withdrawal password first" : "Veuillez d’abord définir un mot de passe de retrait");
+ return ResultUtil.error(language == 1 ? "请先设置提现密码" : language == 2 ? "Please set withdrawal password first." : "Veuillez d’abord définir le mot de passe de retrait.");
}
if(!driver.getWithdrawPassword().equals(ShiroKit.md5(withdrawPassword, salt))){
- return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Password error" : "Mot de passe incorrect");
+ return ResultUtil.error(language == 1 ? "密码错误" : language == 2 ? "Wrong password" : "Mot de passe erroné");
}
return ResultUtil.success();
}
@@ -2735,14 +2741,24 @@
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
*/
@Override
- public List<Map<String,Object>> queryMyInviteList(Integer type,Integer uid, Integer pageNum, Integer size) throws Exception {
+ public List<Map<String,Object>> queryMyInviteList(Integer language, Integer type,Integer uid, Integer pageNum, Integer size) throws Exception {
pageNum = (pageNum - 1) * size;
if(type==1){
//乘客表uType为2表示是司机邀请的
- return userInfoMapper.queryMyInviteUserList(2,uid,pageNum,size);
+ List<Map<String, Object>> list = userInfoMapper.queryMyInviteUserList(2, uid, pageNum, size);
+ for (Map<String, Object> map : list) {
+ String insertTime = map.get("insertTime").toString();
+ map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+ }
+ return list;
}else if(type==2){
//司机表uType为2表示是司机邀请的
- return driverMapper.queryMyInviteDriverList(2,uid, pageNum, size);
+ List<Map<String, Object>> list = driverMapper.queryMyInviteDriverList(2, uid, pageNum, size);
+ for (Map<String, Object> map : list) {
+ String insertTime = map.get("insertTime").toString();
+ map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+ }
+ return list;
}
return null;
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java
index 7856f28..490c596 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java
@@ -32,7 +32,7 @@
public ResultUtil feedback(String content, Integer uid, Integer language) throws Exception {
if(ToolUtil.isNotEmpty(content)){
if(content.length() > 200){
- return ResultUtil.error(language == 1 ? "反馈内容过长" : language == 2 ? "The feedback is too long" : "Le contenu des commentaires est trop long");
+ return ResultUtil.error(language == 1 ? "反馈内容过长" : language == 2 ? "Feedback-content is overlong." : "Le contenu de l’avis est trop long.");
}
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
for(SensitiveWords s : sensitiveWords){
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
index 93f8296..8132cec 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
@@ -4,6 +4,7 @@
import com.stylefeng.guns.modular.system.dao.IncomeMapper;
import com.stylefeng.guns.modular.system.model.Income;
import com.stylefeng.guns.modular.system.service.IIncomeService;
+import com.stylefeng.guns.modular.system.util.DateUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -54,9 +55,14 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> query(Integer userType, Integer objectId, Integer type, Integer pageNum, Integer size) throws Exception {
+ public List<Map<String, Object>> query(Integer language, Integer userType, Integer objectId, Integer type, Integer pageNum, Integer size) throws Exception {
pageNum = (pageNum - 1) * size;
- return incomeMapper.query(userType, objectId, type, pageNum, size);
+ List<Map<String, Object>> query = incomeMapper.query(userType, objectId, type, pageNum, size);
+ for (Map<String, Object> map : query) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return query;
}
@Override
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java
index f5abbcd..87d67bb 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java
@@ -4,6 +4,7 @@
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.model.OrderCancel;
import com.stylefeng.guns.modular.system.service.IOrderCancelService;
+import com.stylefeng.guns.modular.system.util.DateUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
@@ -78,7 +79,12 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryCancel(Integer uid, Integer isPay) throws Exception {
- return orderCancelMapper.queryCancel(uid, isPay);
+ public List<Map<String, Object>> queryCancel(Integer language, Integer uid, Integer isPay) throws Exception {
+ List<Map<String, Object>> list = orderCancelMapper.queryCancel(uid, isPay);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java
index 28e8e38..910a8d7 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java
@@ -4,6 +4,7 @@
import com.stylefeng.guns.modular.system.dao.OrderEvaluateMapper;
import com.stylefeng.guns.modular.system.model.OrderEvaluate;
import com.stylefeng.guns.modular.system.service.IOrderEvaluateService;
+import com.stylefeng.guns.modular.system.util.DateUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -32,11 +33,15 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryEvaluate(Integer pageNum, Integer size, Integer uid) throws Exception {
+ public Map<String, Object> queryEvaluate(Integer language, Integer pageNum, Integer size, Integer uid) throws Exception {
pageNum = (pageNum - 1) * size;
Map<String, Object> map = new HashMap<>();
Double aDouble = orderEvaluateMapper.queryCount(uid);
List<Map<String, Object>> list = orderEvaluateMapper.queryEvaluate(pageNum, size, uid);
+ for (Map<String, Object> objectMap : list) {
+ String insertTime = map.get("insertTime").toString();
+ objectMap.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+ }
map.put("sumScore", null != aDouble ? new BigDecimal(aDouble).setScale(1, BigDecimal.ROUND_HALF_EVEN).doubleValue() : 0);
map.put("list", list);
return map;
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index 8f23512..5dfc072 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -154,13 +154,13 @@
List<Map<String, Object>> datas = new ArrayList<>();
if(type == 1){
//出租车
- List<Map<String, Object>> list = orderTaxiService.queryOrderList(state, uid);
+ List<Map<String, Object>> list = orderTaxiService.queryOrderList(language, state, uid);
datas.addAll(list);
//专车
List<Map<String, Object>> list1 = orderPrivateCarService.queryOrderList(state, uid, language);
datas.addAll(list1);
//跨城
- List<Map<String, Object>> list2 = orderCrossCityService.queryOrderList(state, uid);
+ List<Map<String, Object>> list2 = orderCrossCityService.queryOrderList(language, state, uid);
datas.addAll(list2);
}else{//小件物流
List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(uid, language);
@@ -469,11 +469,11 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryOrderInfo(Integer orderId, Integer orderType) throws Exception {
+ public Map<String, Object> queryOrderInfo(Integer language, Integer orderId, Integer orderType) throws Exception {
Map<String, Object> map = null;
switch (orderType){
case 1://专车
- map = orderPrivateCarService.queryOrderInfo(orderId);
+ map = orderPrivateCarService.queryOrderInfo(language, orderId);
break;
case 2://出租
// map = orderTaxiService.queryOrderInfo(orderId);
@@ -482,7 +482,7 @@
// map = orderCrossCityService.queryOrderCrossCityInfo(orderId);
break;
case 4://同城小件
- map = orderLogisticsService.queryOrderInfo(orderId);
+ map = orderLogisticsService.queryOrderInfo(language, orderId);
break;
case 5://跨城小件
// map = orderLogisticsService.queryOrderInfo(orderId);
@@ -542,7 +542,7 @@
public ResultUtil process(Integer orderId, Integer orderType, Integer state, Integer uid, Double lon, Double lat,String phone, Integer language) throws Exception {
ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lon);
if(null == reverseGeocode){
- return ResultUtil.error(language == 1 ? "无效的经纬度" : language == 2 ? "Invalid latitude and longitude" : "Latitude et longitude invalides");
+ return ResultUtil.error(language == 1 ? "无效的经纬度" : language == 2 ? "Invalid longitude and latitude" : "Longitude et latitude non valides");
}
String address = reverseGeocode.getAddress();
switch (orderType){
@@ -666,12 +666,12 @@
* @return
*/
@Override
- public Map<String, Object> queryToBePaidPage(Integer orderId, Integer orderType) throws Exception{
+ public Map<String, Object> queryToBePaidPage(Integer language, Integer orderId, Integer orderType) throws Exception{
switch (orderType){
case 1://专车
- return orderPrivateCarService.queryOrderInfo(orderId);
+ return orderPrivateCarService.queryOrderInfo(language, orderId);
case 2://出租
- return orderTaxiService.queryOrderInfo(orderId);
+ return orderTaxiService.queryOrderInfo(language, orderId);
case 3://城际（没有此流程）
return null;
case 4://
@@ -929,10 +929,10 @@
case 1:
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
if(orderPrivateCar.getState() == 8 || orderPrivateCar.getState() == 9){
- return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, no double payment is allowed" : "La commande a été payée, aucun paiement en double n’est autorisé");
+ return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, recurring payments is not allowed." : "La commande a été payée, les paiements récurrents ne sont pas autorisés.");
}
if(orderPrivateCar.getState() != 7){
- return ResultUtil.error(language == 1 ? "订单不在待支付，无法完成订单" : language == 2 ? "Order is not pending payment, order cannot be completed" : "La commande n’est pas en attente de paiement, la commande ne peut pas être complétée");
+ return ResultUtil.error(language == 1 ? "订单不在待支付，无法完成订单" : language == 2 ? "The order is no longer with Pending Payment, unable to complete the order." : "La commande n’est plus en attente de paiement, il est impossible de terminer la commande.");
}
orderPrivateCar.setPayManner(2);//其他方式支付
orderPrivateCar.setRedPacketMoney(0D);
@@ -950,10 +950,10 @@
case 2:
OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
if(orderTaxi.getState() == 8 || orderTaxi.getState() == 9){
- return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, no double payment is allowed" : "La commande a été payée, aucun paiement en double n’est autorisé");
+ return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, recurring payments is not allowed." : "La commande a été payée, les paiements récurrents ne sont pas autorisés.");
}
if(orderTaxi.getState() != 7){
- return ResultUtil.error(language == 1 ? "订单不在待支付，无法完成订单" : language == 2 ? "Order is not pending payment, order cannot be completed" : "La commande n’est pas en attente de paiement, la commande ne peut pas être complétée");
+ return ResultUtil.error(language == 1 ? "订单不在待支付，无法完成订单" : language == 2 ? "The order is no longer with Pending Payment, unable to complete the order." : "La commande n’est plus en attente de paiement, il est impossible de terminer la commande.");
}
orderTaxi.setPayManner(2);//其他方式支付
orderTaxi.setRedPacketMoney(0D);
@@ -1071,14 +1071,14 @@
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
money = orderPrivateCar.getPayMoney();
if(orderPrivateCar.getPayType() != 4){
- return ResultUtil.error(language == 1 ? "无法进行支付" : language == 2 ? "Unable to pay" : "Impossibilité de procéder au paiement");
+ return ResultUtil.error(language == 1 ? "无法进行支付" : language == 2 ? "Unable to make payments" : "Impossible d’effectuer des paiements");
}
if(orderPrivateCar.getDriverPay() == 2){
- return ResultUtil.error(language == 1 ? "不能重复支付" : language == 2 ? "Non-repeatable payment" : "Aucun paiement en double");
+ return ResultUtil.error(language == 1 ? "不能重复支付" : language == 2 ? "Unable to recur payments" : "Impossible de récurrence des paiements");
}
if(payType == 3){//余额支付
if(driver.getBalance().compareTo(money) < 0){
- return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde insuffisant du compte");
+ return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient balance" : "Solde insuffisant");
}
}
}
@@ -1086,14 +1086,14 @@
OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId);
money = orderLogistics.getPayMoney();
if(orderLogistics.getPayType() != 4){
- return ResultUtil.error(language == 1 ? "无法进行支付" : language == 2 ? "Unable to pay" : "Impossibilité de procéder au paiement");
+ return ResultUtil.error(language == 1 ? "无法进行支付" : language == 2 ? "Unable to make payments" : "Impossible d’effectuer des paiements");
}
if(orderLogistics.getDriverPay() == 2){
- return ResultUtil.error(language == 1 ? "不能重复支付" : language == 2 ? "Non-repeatable payment" : "Aucun paiement en double");
+ return ResultUtil.error(language == 1 ? "不能重复支付" : language == 2 ? "Unable to recur payments" : "Impossible de récurrence des paiements");
}
if(payType == 3){//余额支付
if(driver.getBalance().compareTo(money) < 0){
- return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde insuffisant du compte");
+ return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient balance" : "Solde insuffisant");
}
}
}
@@ -1119,7 +1119,7 @@
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, uid, 2, orderId, orderType, 1, money, null, 1);//添加预支付数据
}else{
- 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;
}
@@ -1146,7 +1146,7 @@
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, uid, 2, orderId, orderType, 2, money, null, 1);//添加预支付数据
}else{
- 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;
}
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..c0aa76a 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.");
}
//获取支付金额
@@ -195,7 +195,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);
@@ -223,7 +223,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 +236,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 +250,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);
@@ -293,9 +293,14 @@
* @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) {
+ String day = map.get("day").toString();
+ map.put("day", DateUtil.conversionFormat(language, day));
+ }
+ return list;
}
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..d43c54e 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
@@ -7,6 +7,7 @@
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 +55,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 +68,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 +92,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 +115,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 +139,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();
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java
index d445203..0f3c28e 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java
@@ -5,6 +5,7 @@
import com.stylefeng.guns.modular.system.dao.TNoticesMapper;
import com.stylefeng.guns.modular.system.model.SystemNotice;
import com.stylefeng.guns.modular.system.service.ISystemNoticeService;
+import com.stylefeng.guns.modular.system.util.DateUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -56,7 +57,7 @@
* @return
*/
@Override
- public List<Map<String, Object>> queryList(Integer type, Integer pageNum, Integer size, Integer uid) {
+ public List<Map<String, Object>> queryList(Integer language, Integer type, Integer pageNum, Integer size, Integer uid) {
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> list = null;
if(type == 1){//系统公告
@@ -68,6 +69,10 @@
systemNoticeMapper.readSystemNotice(Integer.valueOf(String.valueOf(map.get("id"))), uid);
}
}
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
return list;
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
index da6acf4..caf7789 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
@@ -56,23 +56,23 @@
@Override
public ResultUtil withdrawal(Double money, Integer uid, Integer type, String remark, Integer language) throws Exception {
if(money.compareTo(0D) <= 0){
- return ResultUtil.error(language == 1 ? "提现金额必须大于0" : language == 2 ? "The withdrawal amount must be greater than 0" : "Le montant du retrait doit être supérieur à 0");
+ return ResultUtil.error(language == 1 ? "提现金额必须大于0" : language == 2 ? "Withdrawal amount must be greater than zero." : "Le montant du retrait doit être supérieur à zéro.");
}
Driver driver = driverService.selectById(uid);
Integer withdrawalRule = driverService.getWithdrawalRule();
if(withdrawalRule==null){
- return ResultUtil.error(language == 1 ? "暂未设置提现时间，请联系平台" : language == 2 ? "No withdrawal time has been set, please contact the platform" : "Aucune heure de retrait n’a été définie pour le moment. Veuillez contacter la plateforme");
+ return ResultUtil.error(language == 1 ? "暂未设置提现时间，请联系平台" : language == 2 ? "Withdrawal time is not set yet, please contact the platform." : "L’heure de retrait n’est pas encore fixée, veuillez contacter la plateforme.");
}
int weeks = DateUtil.getNowWeekDay();
if(weeks != withdrawalRule){
- return ResultUtil.error((language == 1 ? "每周" : language == 2 ? "Every" : "Chaque") +(withdrawalRule==1? (language == 1 ? "一" : language == 2 ? "Monday" : "lundi") :
+ return ResultUtil.error((language == 1 ? "每周" : language == 2 ? "Apply for withdrawal every " : "Faites une demande de retrait tous les ") +(withdrawalRule==1? (language == 1 ? "一" : language == 2 ? "Monday" : "lundi") :
withdrawalRule==2?(language == 1 ? "二" : language == 2 ? "Tuesday" : "mardi"):
withdrawalRule==3?(language == 1 ? "三" : language == 2 ? "Wednesday" : "mercredi"):
withdrawalRule==4?(language == 1 ? "四" : language == 2 ? "Thursday" : "jeudi"):
withdrawalRule==5?(language == 1 ? "五" : language == 2 ? "Friday" : "vendredi"):
withdrawalRule==6?(language == 1 ? "六" : language == 2 ? "Saturday" : "samedi"):(language == 1 ? "日" : language == 2 ? "Sunday" : "dimanche")) +
- (language == 1 ? "统一申请提现，平台统一处理。" : language == 2 ? "nified application for withdrawal, platform unified processing" : "Demande de retrait unifiée et traitement unifié sur la plateforme"));
+ (language == 1 ? "统一申请提现，平台统一处理。" : language == 2 ? ", the platform will handle them together." : ", la plateforme les traitera ensemble."));
}
if(null == type){
type = 1;
@@ -81,22 +81,22 @@
Withdrawal withdrawal = new Withdrawal();
if(type == 1){
if(null == driver.getLaveActivityMoney()){
- return ResultUtil.error(language == 1 ? "账户没有余额，不能提现" : language == 2 ? "There is no balance in the account, no cash can be withdrawn" : "Le compte n’a pas de solde et ne peut pas être retiré");
+ return ResultUtil.error(language == 1 ? "账户没有余额，不能提现" : language == 2 ? "Insufficient balance, unable to withdraw." : "Solde insuffisant, impossibilité de retirer.");
}
if(driver.getLaveActivityMoney().compareTo(money) < 0){
- return ResultUtil.error(language == 1 ? "提现金额必须小于账户余额" : language == 2 ? "The withdrawal amount must be less than the account balance" : "Le montant du retrait doit être inférieur au solde du compte");
+ return ResultUtil.error(language == 1 ? "提现金额必须小于账户余额" : language == 2 ? "Withdrawal amount must be less than account balance." : "Le montant du retrait doit être inférieur au solde du compte.");
}
withdrawal.setBalance(driver.getLaveActivityMoney());
}
if(type == 2){
if(null == driver.getLaveBusinessMoney()){
- return ResultUtil.error(language == 1 ? "账户没有余额，不能提现" : language == 2 ? "There is no balance in the account, no cash can be withdrawn" : "Le compte n’a pas de solde et ne peut pas être retiré");
+ return ResultUtil.error(language == 1 ? "账户没有余额，不能提现" : language == 2 ? "Insufficient balance, unable to withdraw." : "Solde insuffisant, impossibilité de retirer.");
}
Double money1 = driverService.getThisWeekMoney(uid);
Double laveBusinessMoney =driver.getLaveBusinessMoney()-(money1==null?0d:money1);
if(laveBusinessMoney.compareTo(money) < 0){
- return ResultUtil.error(language == 1 ? "提现金额必须小于账户余额" : language == 2 ? "The withdrawal amount must be less than the account balance" : "Le montant du retrait doit être inférieur au solde du compte");
+ return ResultUtil.error(language == 1 ? "提现金额必须小于账户余额" : language == 2 ? "Withdrawal amount must be less than account balance." : "Le montant du retrait doit être inférieur au solde du compte.");
}
withdrawal.setBalance(driver.getLaveBusinessMoney()-(money1==null?0d:money1));
}
@@ -138,9 +138,14 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryWithdrawal(Integer uid, Integer type, Integer pageNum, Integer size) throws Exception {
+ public List<Map<String, Object>> queryWithdrawal(Integer language, Integer uid, Integer type, Integer pageNum, Integer size) throws Exception {
pageNum = (pageNum - 1) * size;
- return withdrawalMapper.queryWithdrawal(uid, 2, type, pageNum, size);
+ List<Map<String, Object>> list = withdrawalMapper.queryWithdrawal(uid, 2, type, pageNum, size);
+ for (Map<String, Object> map : list) {
+ String insertTime = map.get("insertTime").toString();
+ map.put("insertTime", com.stylefeng.guns.modular.system.util.DateUtil.conversionFormat(language, insertTime));
+ }
+ return list;
}
@@ -155,10 +160,10 @@
public ResultUtil withdrawalAudit(Integer id, Integer state, Integer language) throws Exception {
Withdrawal withdrawal = this.selectById(id);
if(withdrawal.getState() == 2){
- return ResultUtil.error(language == 1 ? "申请已审核通过，不能重复提交" : language == 2 ? "The application has been approved and cannot be submitted again" : "La demande a été examinée et approuvée et ne peut pas être soumise en double");
+ return ResultUtil.error(language == 1 ? "申请已审核通过，不能重复提交" : language == 2 ? "Application was approved, do not resubmit." : "La demande a été approuvée, ne pas la soumettre à nouveau.");
}
if(withdrawal.getState() == 3){
- return ResultUtil.error(language == 1 ? "车牌号已经使用" : language == 2 ? "The application has been rejected and cannot be submitted again" : "La demande a été examinée et rejetée, ne peut pas être soumise en double");
+ return ResultUtil.error(language == 1 ? "车牌号已经使用" : language == 2 ? "Plate number is already in use" : "Le numéro de plaque est déjà utilisé");
}
if(withdrawal.getUserType() == 1){//用户
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
index 727e22c..8db9c17 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
@@ -132,4 +132,165 @@
map.put("endTime", end);
return map;
}
+
+
+
+ /**
+ * 多语言时间日期格式转换
+ * @param language 语言编号
+ * @param datetime 标准格式化时间 yyyy-MM-dd
+ * @return
+ */
+ public static String conversionFormat(Integer language, String datetime){
+ String time = "";
+ String date = datetime;
+ int index = datetime.indexOf(" ");
+ if(index != -1){
+ time = datetime.substring(datetime.indexOf(" ") + 1);
+ date = datetime.substring(0, datetime.indexOf(" "));
+ }
+ String[] split = date.split("-");
+ switch (language){
+ case 2:
+ split[1] = englishMonth(Integer.valueOf(split[1]));
+ datetime = split[1] + " " + split[2] + ", " + split[0];
+ if(index != -1){
+ datetime += " " + time;
+ }
+ break;
+ case 3:
+ split[1] = frenchMonth(Integer.valueOf(split[1]));
+ datetime = split[2] + " " + split[1] + " " + split[0];
+ if(index != -1){
+ datetime += " " + time;
+ }
+ break;
+ }
+ return datetime;
+ }
+
+
+ public static String conversionFormat1(Integer language, String datetime){
+ String time = "";
+ String date = datetime;
+ int index = datetime.indexOf(" ");
+ if(index != -1){
+ time = datetime.substring(datetime.indexOf(" ") + 1);
+ date = datetime.substring(0, datetime.indexOf(" "));
+ }
+ String[] split = date.split("-");
+ switch (language){
+ case 2:
+ split[1] = englishMonth(Integer.valueOf(split[0]));
+ datetime = split[0] + " " + split[1];
+ if(index != -1){
+ datetime += " " + time;
+ }
+ break;
+ case 3:
+ split[1] = frenchMonth(Integer.valueOf(split[0]));
+ datetime = split[1] + " " + split[0];
+ if(index != -1){
+ datetime += " " + time;
+ }
+ break;
+ }
+ return datetime;
+ }
+
+
+
+ public static String frenchMonth(Integer month){
+ String m = "";
+ switch (month){
+ case 1:
+ m = "Janvier";
+ break;
+ case 2:
+ m = "Février";
+ break;
+ case 3:
+ m = "Mars";
+ break;
+ case 4:
+ m = "Avril";
+ break;
+ case 5:
+ m = "Mai";
+ break;
+ case 6:
+ m = "Juin";
+ break;
+ case 7:
+ m = "Juillet";
+ break;
+ case 8:
+ m = "Août";
+ break;
+ case 9:
+ m = "Septembre";
+ break;
+ case 10:
+ m = "Octobre";
+ break;
+ case 11:
+ m = "Novembre";
+ break;
+ case 12:
+ m = "Décembre";
+ break;
+ default:
+ m = "";
+ break;
+ }
+ return m;
+ }
+
+
+
+ public static String englishMonth(Integer month){
+ String m = "";
+ switch (month){
+ case 1:
+ m = "January";
+ break;
+ case 2:
+ m = "February";
+ break;
+ case 3:
+ m = "March";
+ break;
+ case 4:
+ m = "April";
+ break;
+ case 5:
+ m = "May";
+ break;
+ case 6:
+ m = "June";
+ break;
+ case 7:
+ m = "July";
+ break;
+ case 8:
+ m = "August";
+ break;
+ case 9:
+ m = "September";
+ break;
+ case 10:
+ m = "October";
+ break;
+ case 11:
+ m = "November";
+ break;
+ case 12:
+ m = "December";
+ break;
+ default:
+ m = "";
+ break;
+ }
+ return m;
+ }
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index 70f75e1..0ef2905 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -7,8 +7,11 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.HashSet;
import java.util.Set;
+import java.util.TimeZone;
/**
@@ -32,6 +35,10 @@
public Set<Integer> driverIds = new HashSet<>();//存储需要提醒司机预约单的司机id
+ public static void main(String[] args) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MMM-dd");
+ System.err.println(sdf.format(new Date()));
+ }
/**
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 69723b1..9cd03e3 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
@@ -20,11 +20,11 @@
*/
public class TinggPayUtil {
- private static String accessKey = "KxjPP444jEE7K88E7juej4PKqqzKq7qKjKj84q744q9zj4Ej4zK47uj4KKj4";
+ private static String accessKey = "8rc1gTV9n91Tc1Sy9oVWry99fgrgrVV8concf9onWooWSg9TVW8nSgo98g88";
- private static String ivKey = "qsffKsCOJJdhSBCQ";
+ private static String ivKey = "ABp0pqpHMteEJM2N";
- private static String secretKey = "9jjz4Ex74P8ue4qK";
+ private static String secretKey = "rf8Vo1n9yTSW98cg";
/**
@@ -53,7 +53,7 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String countryCode="GHA";//收取付款的国家的3位ISO代码
String currencyCode = "GHS";//3位ISO代码的货币，商家正在开发票。
- String serviceCode="IGOGHANA";//服务代码
+ String serviceCode="I-GO_TECHNOLOGIES_LI";//服务代码
String dueDate = sdf.format(new Date(System.currentTimeMillis() + 1800000));//到期时间
String languageCode="EN";
String paymentOptionCode = "";//支付选项码
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/itextpdf/HtmlToPdfUtils.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/itextpdf/HtmlToPdfUtils.java
index e814a8b..2a04c2a 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/itextpdf/HtmlToPdfUtils.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/itextpdf/HtmlToPdfUtils.java
@@ -44,7 +44,7 @@
fontProvider.addFont(microsoft.getFontProgram(), PdfEncodings.IDENTITY_H);
}*/
- properties.setFontProvider(fontProvider);
+// properties.setFontProvider(fontProvider);
HtmlConverter.convertToPdf(inputStream, pdfDocument, properties);
pdfWriter.close();
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
index 404c23e..07d2f71 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
@@ -239,7 +239,7 @@
id as orderId,
state as orderState,
('出租车订单') as orderName,
- DATE_FORMAT(travelTime, '%m月%d日 %H:%i') as travelTime,
+ DATE_FORMAT(travelTime, '%m-%d %H:%i') as travelTime,
startAddress as startAddress,
endAddress as endAddress,
tipMoney as tipMoney,
@@ -262,7 +262,7 @@
a.userId as userId,
a.driverId as driverId,
a.state as orderState,
- DATE_FORMAT(a.travelTime, '%m月%d日 %H:%i') as travelTime_,
+ DATE_FORMAT(a.travelTime, '%m-%d %H:%i') as travelTime_,
DATE_FORMAT(a.travelTime, '%Y-%m-%d %H:%i:%s') as travelTime,
DATE_FORMAT(a.arriveTime, '%Y-%m-%d %H:%i:%s') as arriveTime,
a.startAddress as startAddress,
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java
index a8343f1..339f9b0 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java
@@ -16,7 +16,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryOrderList(Integer state, Integer driverId) throws Exception;
+ List<Map<String, Object>> queryOrderList(Integer language, Integer state, Integer driverId) throws Exception;
@@ -28,7 +28,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception;
+ List<Map<String, Object>> queryMyAllOrder(Integer language, Integer state, Integer uid) throws Exception;
/**
@@ -47,7 +47,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryPushOrder(Integer orderId) throws Exception;
+ Map<String, Object> queryPushOrder(Integer language, Integer orderId) throws Exception;
/**
@@ -77,7 +77,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryOrderInfo(Integer orderId) throws Exception;
+ Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception;
/**
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 04a338f..dd77f9a 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -83,8 +83,13 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryOrderList(Integer state, Integer driverId) throws Exception {
- return orderTaxiMapper.queryOrderList(state, driverId);
+ public List<Map<String, Object>> queryOrderList(Integer language, Integer state, Integer driverId) throws Exception {
+ List<Map<String, Object>> list = orderTaxiMapper.queryOrderList(state, driverId);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
@@ -96,8 +101,13 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception {
- return orderTaxiMapper.queryMyAllOrder(state, uid);
+ public List<Map<String, Object>> queryMyAllOrder(Integer language, Integer state, Integer uid) throws Exception {
+ List<Map<String, Object>> list = orderTaxiMapper.queryMyAllOrder(state, uid);
+ for (Map<String, Object> map : list) {
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ return list;
}
@@ -122,8 +132,11 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryPushOrder(Integer orderId) throws Exception {
- return orderTaxiMapper.queryPushOrder(orderId);
+ public Map<String, Object> queryPushOrder(Integer language, Integer orderId) throws Exception {
+ Map<String, Object> map = orderTaxiMapper.queryPushOrder(orderId);
+ String travelTime = map.get("travelTime").toString();
+ map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
+ return map;
}
@@ -320,8 +333,15 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
- return orderTaxiMapper.queryOrderInfo(orderId);
+ public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
+ Map<String, Object> map = orderTaxiMapper.queryOrderInfo(orderId);
+ String travelTime_ = map.get("travelTime_").toString();
+ map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ String travelTime = map.get("travelTime").toString();
+ map.put("travelTime", DateUtil.conversionFormat(language, travelTime));
+ String arriveTime = map.get("arriveTime").toString();
+ map.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
+ return map;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TProblemController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TProblemController.java
index 399da27..eba33b7 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TProblemController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TProblemController.java
@@ -115,7 +115,7 @@
TSystemNotice notice = new TSystemNotice();
notice.setType(2);
notice.setUserType(1);
- notice.setContent("您的留言被回复啦:【"+answer+"】");
+ notice.setContent(answer);
notice.setUserId(tProblem.getUserId());
notice.setInsertTime(new Date());
notice.setRead(1);
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
index e2a19ea..85d09ee 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
@@ -598,7 +598,7 @@
* @return
*/
public static long getMillisecond_strDmy(String date) {
- SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if ("".equals(date)) {
date = sdf.format(DateUtil.getDate());
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js
index d461476..1cddcff 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js
@@ -416,7 +416,7 @@
if (!defined(timestamp) || isNaN(timestamp)) {
return 'Invalid date';
}
- format = pick(format, '%Y-%m-%d %H:%M:%S');
+ format = pick(format, 'yyyy-MM-dd %H:%M:%S');
var date = new Date(timestamp - timezoneOffset),
key, // used in for constuct below
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts.src.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts.src.js
index a29b0fa..04e5547 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts.src.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts.src.js
@@ -438,7 +438,7 @@
if (!defined(timestamp) || isNaN(timestamp)) {
return 'Invalid date';
}
- format = pick(format, '%Y-%m-%d %H:%M:%S');
+ format = pick(format, 'yyyy-MM-dd %H:%M:%S');
var date = new Date(timestamp),
key, // used in for constuct below
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js
index a29b0fa..04e5547 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js
@@ -438,7 +438,7 @@
if (!defined(timestamp) || isNaN(timestamp)) {
return 'Invalid date';
}
- format = pick(format, '%Y-%m-%d %H:%M:%S');
+ format = pick(format, 'yyyy-MM-dd %H:%M:%S');
var date = new Date(timestamp),
key, // used in for constuct below
--
Gitblit v1.7.1