From e2d01b2009c30173ff8e9f77d5c065f4d38fa49d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 17:56:07 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index c0aa76a..c58e30b 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -151,7 +151,9 @@
orderLogisticsService.updateById(orderLogistics1);
break;
}
- systemNoticeService.addSystemNotice(2, language == 1 ? "您的改派申请已成功提交，我们会尽快为你处理！" : language == 2 ? "Your reassignment application has been successfully submitted, we will process it for you as soon as possible!" : "Votre demande de réaffectation a été soumise avec succès. Nous la traiterons pour vous dès que possible!", uid);
+ systemNoticeService.addSystemNotice(2, language == 1 ? "您的改派申请已成功提交，我们会尽快为你处理！" : language == 2 ?
+ "Your request for reassignment was submitted, we shall handle it for you as soon as possible." :
+ "Votre demande de réaffectation a été soumise. Nous la traiterons pour vous dans les plus brefs délais.", uid);
return resultUtil;
}
@@ -209,7 +211,9 @@
ids += reassign.getId() + ",";
}
ids = ids.substring(0, ids.length() - 1);
- systemNoticeService.addSystemNotice(2, language == 1 ? "您的改派申请已成功提交，我们会尽快为你处理！" : language == 2 ? "Your reassignment application has been successfully submitted, we will process it for you as soon as possible!" : "Votre demande de réaffectation a été soumise avec succès. Nous la traiterons pour vous dès que possible!", uid);
+ systemNoticeService.addSystemNotice(2, language == 1 ? "您的改派申请已成功提交，我们会尽快为你处理！" : language == 2 ?
+ "Your request for reassignment was submitted, we shall handle it for you as soon as possible." :
+ "Votre demande de réaffectation a été soumise. Nous la traiterons pour vous dans les plus brefs délais.", uid);
//开始支付
if(null != reassign.getPayType()){
@@ -267,7 +271,8 @@
//添加已收入明细
incomeService.saveData(1, orderCrossCity.getCompanyId(), 4, orderCrossCity.getId(), 3, reassign.getMoney());
}
- systemNoticeService.addSystemNotice(2, "您已使用余额成功支付改派申请费用！", uid);
+ systemNoticeService.addSystemNotice(2, language == 1 ? "您已使用余额成功支付改派申请费用！" : language == 2 ?
+ "You have paid for reassignment with the balance." : "Vous avez payé la réaffectation avec le solde.", uid);
//开始推送调度单
Map<String, String> map = new HashMap<>();
map.put("orderId", reassign.getOrderId().toString());
@@ -297,8 +302,10 @@
pageNum = (pageNum - 1) * 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));
+ if(null != map.get("day")){
+ String day = map.get("day").toString();
+ map.put("day", DateUtil.conversionFormat(language, day));
+ }
}
return list;
}
--
Gitblit v1.7.1