From 32f02d85b75f94ae0b704c7be059c5b0ff043095 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 15 四月 2024 09:48:17 +0800
Subject: [PATCH] 修改配置
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 548 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 403 insertions(+), 145 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 52d817f..722b037 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -321,13 +321,8 @@
if(query.size() == 0){
return ResultUtil.error(language == 1 ? "该司机不能服务此业务" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
}
-
- int count = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driverId).eq("driverPay", 1).in("state", Arrays.asList(7, 8, 9)).eq("isDelete", 1));
+ int count = settlementRecordService.selectCount(new EntityWrapper<SettlementRecord>().eq("driverId", driverId).eq("paymentStatus", 1));
if(count > 0){
- return ResultUtil.error(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
- }
- int count1 = orderLogisticsService.selectCount(new EntityWrapper<OrderLogistics>().eq("driverId", driverId).eq("driverPay", 1).ne("state", 10).eq("isDelete", 1));
- if(count1 > 0){
return ResultUtil.error(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
}
@@ -707,11 +702,11 @@
orderCancel.setPayType(3);
orderCancelService.updateById(orderCancel);
- //添加已收入明细
- incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getMoney());
- //添加已收入明细
- Company company = companyService.selectById(orderPrivateCar.getCompanyId());
- Double taxi = company.getSpeMoney();
+// //添加已收入明细
+// incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getMoney());
+// //添加已收入明细
+// Company company = companyService.selectById(orderPrivateCar.getCompanyId());
+// Double taxi = company.getSpeMoney();
BigDecimal c =new BigDecimal(query.getMoney());//司机收入
incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, orderPrivateCar.getId(), 1, c.doubleValue());
Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
@@ -827,8 +822,19 @@
UserInfo userInfo = userInfoService.selectById(uid);
map.put("balance", userInfo.getBalance());
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney());
- i = i + userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney());
+ UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
+ double v = orderPrivateCar.getOrderMoney();
+ if(null != query2){
+ Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
+ if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
+ Double special = query2.getSpecial();
+ orderPrivateCar.setDiscount(special);
+ Double orderMoney = orderPrivateCar.getOrderMoney();
+ v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ }
+ }
+ int i = userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 1, v);
+ i = i + userCouponRecordService.queryAvailable(uid, orderPrivateCar.getCompanyId(), 1, 0, v);
map.put("coupon", i);
return map;
}
@@ -836,8 +842,19 @@
@Override
public List<Map<String, Object>> queryCoupon(Integer language, Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- List<Map<String, Object>> list = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 1, orderPrivateCar.getOrderMoney(), pageNum, size);
- List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 0, orderPrivateCar.getOrderMoney(), pageNum, size);
+ UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
+ double v = orderPrivateCar.getOrderMoney();
+ if(null != query2){
+ Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
+ if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
+ Double special = query2.getSpecial();
+ orderPrivateCar.setDiscount(special);
+ Double orderMoney = orderPrivateCar.getOrderMoney();
+ v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ }
+ }
+ List<Map<String, Object>> list = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 1, v, pageNum, size);
+ List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(language, uid, orderPrivateCar.getCompanyId(), 1, 0, v, pageNum, size);
list.addAll(list1);
return list;
}
@@ -861,11 +878,27 @@
orderPrivateCar.setCouponMoney(0D);//初始化历史数据
orderPrivateCar.setCouponId(null);
+ //计算折扣
+ UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
+ if(null != query2){
+ Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
+ if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
+ Double special = query2.getSpecial();
+ orderPrivateCar.setDiscount(special);
+ double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ if(orderMoney.compareTo(v) > 0){
+ orderPrivateCar.setDiscountMoney(orderMoney - v);
+ orderPrivateCar.setActivityId(query2.getId());
+ orderMoney = v;
+ }
+ }
+ }
+
//计算优惠券
UserCouponRecord userCouponRecord = null;
if(null != couponId){
userCouponRecord = userCouponRecordService.selectById(couponId);
- if(userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()){
+ if(!userCouponRecord.getCompanyId().equals(orderPrivateCar.getCompanyId())){
return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupon cannot be used for this order." : "Le coupon ne peut pas être utilisé pour cette commande.", "");
}
if(userCouponRecord.getState() == 2){
@@ -892,22 +925,6 @@
orderMoney = orderMoney - query.getMoney();
orderPrivateCar.setRedPacketMoney(query.getMoney());
orderPrivateCar.setRedPacketId(query.getId());
- }
- //计算折扣
- UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
- if(null != query2){
- Integer orderNum=this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId",orderPrivateCar.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
- if(query2.getDistance()*1000>orderPrivateCar.getMileage() && query2.getOrderNum()>orderNum){
- Double special = query2.getSpecial();
- orderPrivateCar.setDiscount(special);
- double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
- if(orderMoney.compareTo(v) > 0){
- orderPrivateCar.setDiscountMoney(orderMoney - v);
- orderPrivateCar.setActivityId(query2.getId());
- orderMoney = v;
- }
- }
-
}
if(payType == 1){//手机支付
@@ -1034,16 +1051,38 @@
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("I-GO电子收据");
Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+ title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+ xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+ Element yhq_chinese = document.getElementById("yhq_chinese");
+ yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
+ yhq_chinese_div.remove();
+ }
+ if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+ Element zk_chinese = document.getElementById("zk_chinese");
+ zk_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_chinese_div = document.getElementById("zk_chinese_div");
+ zk_chinese_div.remove();
+ }
+ if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+ Element hb_chinese = document.getElementById("hb_chinese");
+ hb_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_chinese_div = document.getElementById("hb_chinese_div");
+ hb_chinese_div.remove();
+ }
Element xj_chinese = document.getElementById("xj_chinese");
- xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+ xj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pay_type_chinese = document.getElementById("pay_type_chinese");
- pay_type_chinese.text("余额");
+ pay_type_chinese.text("余额支付");
Element pay_money_chinese = document.getElementById("pay_money_chinese");
- pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+ pay_money_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pdf_chinese = document.getElementById("pdf_chinese");
pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
Element lost_item_chinese = document.getElementById("lost_item_chinese");
@@ -1055,7 +1094,7 @@
Elements driver_chinese = document.getElementsByClass("driver_chinese");
for (int i = 0; i < driver_chinese.size(); i++) {
Element element = driver_chinese.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
}
Element cp_chinese = document.getElementById("cp_chinese");
cp_chinese.text("车牌：" + car.getCarLicensePlate());
@@ -1078,16 +1117,38 @@
if(2 == language){
document.getElementById("chinese").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("Receipt");
Element title_english = document.getElementById("title_english");
- title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+ title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+ xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+ Element yhq_english = document.getElementById("yhq_english");
+ yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_english_div = document.getElementById("yhq_english_div");
+ yhq_english_div.remove();
+ }
+ if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+ Element zk_english = document.getElementById("zk_english");
+ zk_english.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_english_div = document.getElementById("zk_english_div");
+ zk_english_div.remove();
+ }
+ if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+ Element hb_english = document.getElementById("hb_english");
+ hb_english.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_english_div = document.getElementById("hb_english_div");
+ hb_english_div.remove();
+ }
Element xj_english = document.getElementById("xj_english");
- xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
+ xj_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pay_type_english = document.getElementById("pay_type_english");
- pay_type_english.text("Balance");
+ pay_type_english.text("I-GO Wallet");
Element pay_money_english = document.getElementById("pay_money_english");
- pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
+ pay_money_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pdf_english = document.getElementById("pdf_english");
pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
Element lost_item_english = document.getElementById("lost_item_english");
@@ -1099,7 +1160,7 @@
Elements driver_english = document.getElementsByClass("driver_english");
for (int i = 0; i < driver_english.size(); i++) {
Element element = driver_english.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
}
Element cp_english = document.getElementById("cp_english");
cp_english.text("Number Plate：" + car.getCarLicensePlate());
@@ -1122,16 +1183,38 @@
if(3 == language){
document.getElementById("chinese").remove();
document.getElementById("english").remove();
+ document.getElementsByTag("title").get(0).text("Reçu");
Element title_french = document.getElementById("title_french");
- title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
+ title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+ xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+ Element yhq_french = document.getElementById("yhq_french");
+ yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_french_div = document.getElementById("yhq_french_div");
+ yhq_french_div.remove();
+ }
+ if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+ Element zk_french = document.getElementById("zk_french");
+ zk_french.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_french_div = document.getElementById("zk_french_div");
+ zk_french_div.remove();
+ }
+ if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+ Element hb_french = document.getElementById("hb_french");
+ hb_french.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_french_div = document.getElementById("hb_french_div");
+ hb_french_div.remove();
+ }
Element xj_french = document.getElementById("xj_french");
- xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
+ xj_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text("Le solde");
+ pay_type_french.text("Portefeuille I-GO");
Element pay_money_french = document.getElementById("pay_money_french");
- pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
+ pay_money_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pdf_french = document.getElementById("pdf_french");
pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
Element lost_item_french = document.getElementById("lost_item_french");
@@ -1143,7 +1226,7 @@
Elements driver_french = document.getElementsByClass("driver_french");
for (int i = 0; i < driver_french.size(); i++) {
Element element = driver_french.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
}
Element cp_french = document.getElementById("cp_french");
cp_french.text("Plaque: GS " + car.getCarLicensePlate());
@@ -1163,7 +1246,7 @@
Element server_tel_french = document.getElementById("server_tel_french");
server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -1178,7 +1261,7 @@
fileWriter.write(document.html());
fileWriter.flush();
fileWriter.close();
- FileInputStream fileInputStream = new FileInputStream(file);
+
File file1 = new File("/usr/local/nginx/html/files/pdf/");
if(!file1.exists()){
file1.mkdirs();
@@ -1187,15 +1270,19 @@
if(!file1.exists()){
file1.createNewFile();
}
- FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
-
+ try {
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
+ }catch (Exception e){
+ e.printStackTrace();
+ System.out.println("html转pdf异常");
+ }
String link ="http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(uid);
- tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course");
+ tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
tEmail.setType(1);
tEmail.setOrderId(orderId);
tEmail.setCreateTime(new Date());
@@ -1203,9 +1290,9 @@
tEmail.setWeek(EmailUtil.getWeek(language,i));
boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
}else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
@@ -1249,17 +1336,43 @@
orderPrivateCar.setPayMoney(orderMoney);
orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney()+orderPrivateCar.getFreeMoney().doubleValue());
+ Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
+
//处理优惠券和红包
if(null != userCouponRecord){
userCouponRecord.setState(2);
userCouponRecord.setEndTime(new Date());
userCouponRecordService.updateById(userCouponRecord);
+ //添加优惠收入补贴
+ Double money = userCouponRecord.getMoney();
+ incomeService.saveData(2, orderPrivateCar.getDriverId(), 5, orderPrivateCar.getId(), 1, money);
+ driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
}
if(null != query){
query.setState(2);
query.setEndTime(new Date());
userRedPacketRecordService.updateById(query);
+
+ Double money = query.getMoney();
+ incomeService.saveData(2, orderPrivateCar.getDriverId(), 7, orderPrivateCar.getId(), 1, money);
+ driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
}
+ if(null != orderPrivateCar.getDiscountMoney() && 0 < orderPrivateCar.getDiscountMoney()){
+ Double money = orderPrivateCar.getDiscountMoney();
+ incomeService.saveData(2, orderPrivateCar.getDriverId(), 6, orderPrivateCar.getId(), 1, money);
+ driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ }
+
+
if(orderPrivateCar.getIsplatPay()==1){
//添加已收入明细
Company company = companyService.selectById(orderPrivateCar.getCompanyId());
@@ -1277,7 +1390,7 @@
}
// incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
// incomeService.saveData(2, orderPrivateCar.getDriverId(), 2, orderPrivateCar.getId(), 1, c.doubleValue());
- Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
+
// driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
// driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
// driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -1299,24 +1412,33 @@
if(null != settlementAllocation){
JSONObject jsonObject = JSON.parseObject(settlementAllocation.getContent());
Double maxPrice = jsonObject.getDouble("maxPrice");
- List<SettlementDetail> settlementDetailList = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>().eq("driverId", driver.getId()).isNull("settlementRecordId").last(" and DATE_FORMAT(now(), '%Y-%m-%d') = DATE_FORMAT(createTime, '%Y-%m-%d')"));
- BigDecimal total = new BigDecimal(0);
- for (SettlementDetail detail : settlementDetailList) {
- total = total.add(new BigDecimal(detail.getPrice()));
- }
- if(maxPrice.compareTo(total.doubleValue()) <= 0){
- SettlementRecord settlementRecord = new SettlementRecord();
- settlementRecord.setDay(new Date());
- settlementRecord.setDriverId(driver.getId());
- settlementRecord.setType(1);
- settlementRecord.setPaymentStatus(1);
- settlementRecord.setPayMoney(total.doubleValue());
- settlementRecord.setInsertTime(new Date());
- settlementRecordService.insert(settlementRecord);
-
+ Integer type1 = jsonObject.getInteger("type");
+ if(1 == type1){
+ List<SettlementDetail> settlementDetailList = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>().eq("driverId", driver.getId()).isNull("settlementRecordId").last(" and DATE_FORMAT(now(), '%Y-%m-%d') = DATE_FORMAT(createTime, '%Y-%m-%d')"));
+ BigDecimal total = new BigDecimal(0);
for (SettlementDetail detail : settlementDetailList) {
- detail.setSettlementRecordId(settlementRecord.getId());
- settlementDetailService.updateById(detail);
+ total = total.add(new BigDecimal(detail.getPrice()));
+ }
+ if(maxPrice.compareTo(total.doubleValue()) <= 0){
+ SettlementRecord settlementRecord = settlementRecordService.selectOne(new EntityWrapper<SettlementRecord>().eq("driverId", orderPrivateCar.getDriverId())
+ .eq("type", type1).eq("paymentStatus", 1).last(" and day = DATE_FORMAT(now(), '%Y-%m-%d')"));
+ if(null == settlementRecord){
+ settlementRecord = new SettlementRecord();
+ settlementRecord.setDay(new Date());
+ settlementRecord.setDriverId(orderPrivateCar.getDriverId());
+ settlementRecord.setType(type1);
+ settlementRecord.setPaymentStatus(1);
+ settlementRecord.setPayMoney(total.doubleValue());
+ settlementRecord.setInsertTime(new Date());
+ settlementRecordService.insert(settlementRecord);
+ }else{
+ settlementRecord.setPayMoney(total.doubleValue());
+ settlementRecordService.updateById(settlementRecord);
+ }
+ for (SettlementDetail detail : settlementDetailList) {
+ detail.setSettlementRecordId(settlementRecord.getId());
+ settlementDetailService.updateById(detail);
+ }
}
}
}
@@ -1343,16 +1465,38 @@
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("I-GO电子收据");
Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+ title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+ xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+ Element yhq_chinese = document.getElementById("yhq_chinese");
+ yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
+ yhq_chinese_div.remove();
+ }
+ if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+ Element zk_chinese = document.getElementById("zk_chinese");
+ zk_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_chinese_div = document.getElementById("zk_chinese_div");
+ zk_chinese_div.remove();
+ }
+ if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+ Element hb_chinese = document.getElementById("hb_chinese");
+ hb_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_chinese_div = document.getElementById("hb_chinese_div");
+ hb_chinese_div.remove();
+ }
Element xj_chinese = document.getElementById("xj_chinese");
- xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+ xj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pay_type_chinese = document.getElementById("pay_type_chinese");
pay_type_chinese.text("现金");
Element pay_money_chinese = document.getElementById("pay_money_chinese");
- pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+ pay_money_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pdf_chinese = document.getElementById("pdf_chinese");
pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
Element lost_item_chinese = document.getElementById("lost_item_chinese");
@@ -1364,7 +1508,7 @@
Elements driver_chinese = document.getElementsByClass("driver_chinese");
for (int i = 0; i < driver_chinese.size(); i++) {
Element element = driver_chinese.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
}
Element cp_chinese = document.getElementById("cp_chinese");
cp_chinese.text("车牌：" + car.getCarLicensePlate());
@@ -1387,16 +1531,38 @@
if(2 == language){
document.getElementById("chinese").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("Receipt");
Element title_english = document.getElementById("title_english");
- title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+ title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+ xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+ Element yhq_english = document.getElementById("yhq_english");
+ yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_english_div = document.getElementById("yhq_english_div");
+ yhq_english_div.remove();
+ }
+ if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+ Element zk_english = document.getElementById("zk_english");
+ zk_english.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_english_div = document.getElementById("zk_english_div");
+ zk_english_div.remove();
+ }
+ if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+ Element hb_english = document.getElementById("hb_english");
+ hb_english.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_english_div = document.getElementById("hb_english_div");
+ hb_english_div.remove();
+ }
Element xj_english = document.getElementById("xj_english");
- xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
+ xj_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pay_type_english = document.getElementById("pay_type_english");
pay_type_english.text("Cash");
Element pay_money_english = document.getElementById("pay_money_english");
- pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
+ pay_money_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pdf_english = document.getElementById("pdf_english");
pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
Element lost_item_english = document.getElementById("lost_item_english");
@@ -1408,7 +1574,7 @@
Elements driver_english = document.getElementsByClass("driver_english");
for (int i = 0; i < driver_english.size(); i++) {
Element element = driver_english.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
}
Element cp_english = document.getElementById("cp_english");
cp_english.text("Number Plate：" + car.getCarLicensePlate());
@@ -1431,16 +1597,38 @@
if(3 == language){
document.getElementById("chinese").remove();
document.getElementById("english").remove();
+ document.getElementsByTag("title").get(0).text("Reçu");
Element title_french = document.getElementById("title_french");
- title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
+ title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+ xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+ Element yhq_french = document.getElementById("yhq_french");
+ yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_french_div = document.getElementById("yhq_french_div");
+ yhq_french_div.remove();
+ }
+ if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+ Element zk_french = document.getElementById("zk_french");
+ zk_french.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_french_div = document.getElementById("zk_french_div");
+ zk_french_div.remove();
+ }
+ if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+ Element hb_french = document.getElementById("hb_french");
+ hb_french.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_french_div = document.getElementById("hb_french_div");
+ hb_french_div.remove();
+ }
Element xj_french = document.getElementById("xj_french");
- xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
+ xj_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text("Espèces");
+ pay_type_french.text("En espèces");
Element pay_money_french = document.getElementById("pay_money_french");
- pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
+ pay_money_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pdf_french = document.getElementById("pdf_french");
pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=1");
Element lost_item_french = document.getElementById("lost_item_french");
@@ -1452,7 +1640,7 @@
Elements driver_french = document.getElementsByClass("driver_french");
for (int i = 0; i < driver_french.size(); i++) {
Element element = driver_french.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
}
Element cp_french = document.getElementById("cp_french");
cp_french.text("Plaque: GS " + car.getCarLicensePlate());
@@ -1473,7 +1661,7 @@
server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -1488,7 +1676,7 @@
fileWriter.write(document.html());
fileWriter.flush();
fileWriter.close();
- FileInputStream fileInputStream = new FileInputStream(file);
+
File file1 = new File("/usr/local/nginx/html/files/pdf/");
if(!file1.exists()){
file1.mkdirs();
@@ -1497,13 +1685,18 @@
if(!file1.exists()){
file1.createNewFile();
}
- FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+ try {
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
+ }catch (Exception e){
+ e.printStackTrace();
+ System.out.println("html转pdf异常");
+ }
String link ="http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(uid);
- tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course");
+ tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
tEmail.setType(1);
tEmail.setOrderId(orderId);
tEmail.setCreateTime(new Date());
@@ -1511,9 +1704,9 @@
tEmail.setWeek(EmailUtil.getWeek(language,i));
boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
}else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
@@ -1630,26 +1823,29 @@
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("红包活动");
Element user_chinese = document.getElementById("user_chinese");
user_chinese.text("您好 " + userInfo.getNickName() + "，");
Element time_chinese = document.getElementById("time_chinese");
- time_chinese.text("此活动有效期在" + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + "至" + DateUtil.conversionFormat(language, sdf.format(query.getEndTime())) + "，详情请查看I-GO平台");
+ time_chinese.text("此活动有效期在 " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " 至 " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + "，详情请查看I-GO平台");
}
if(2 == language){
document.getElementById("chinese").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("Lucky-promo activities");
Element user_english = document.getElementById("user_english");
user_english.text("Hello " + userInfo.getNickName() + "，");
Element time_english = document.getElementById("time_english");
- time_english.text("You could use it from" + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + "to" + DateUtil.conversionFormat(language, sdf.format(query.getEndTime())) + "，check more details on the app.");
+ time_english.text("You could use it from " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " to " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + "，check more details on the app.");
}
if(3 == language){
document.getElementById("chinese").remove();
document.getElementById("english").remove();
+ document.getElementsByTag("title").get(0).text("Activités bonus");
Element user_french = document.getElementById("user_french");
user_french.text("Bonjour " + userInfo.getNickName() + "，");
Element time_french = document.getElementById("time_french");
- time_french.text("Cette promotion est valable du" + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + "au" + DateUtil.conversionFormat(language, sdf.format(query.getEndTime())) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
+ time_french.text("Cette promotion est valable du " + DateUtil.conversionFormat(language, sdf.format(query.getInsertTime())) + " au " + DateUtil.conversionFormat(language, sdf.format(query.getExpirationTime())) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus", document.html());
@@ -1666,17 +1862,6 @@
fileWriter.write(document.html());
fileWriter.flush();
fileWriter.close();
- FileInputStream fileInputStream = new FileInputStream(file);
- File file1 = new File("/usr/local/nginx/html/files/pdf/");
- if(!file1.exists()){
- file1.mkdirs();
- }
- file1 = new File("/usr/local/nginx/html/files/pdf/redpacket_" + orderId + ".pdf");
- if(!file1.exists()){
- file1.createNewFile();
- }
- FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
String link ="http://182.160.16.251:81/files/html/redpacket_" + orderId + ".html";
TEmail tEmail = new TEmail();
@@ -1690,9 +1875,9 @@
tEmail.setWeek(EmailUtil.getWeek(language,i));
boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
}else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
@@ -1735,11 +1920,11 @@
orderCancelService.updateById(query1);
}
- //添加已收入明细
- incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getAmount());
- //添加已收入明细
- Company company = companyService.selectById(orderPrivateCar.getCompanyId());
- Double taxi = company.getSpeMoney();
+// //添加已收入明细
+// incomeService.saveData(1, orderPrivateCar.getCompanyId(), 3, orderPrivateCar.getId(), 1, query.getAmount());
+// //添加已收入明细
+// Company company = companyService.selectById(orderPrivateCar.getCompanyId());
+// Double taxi = company.getSpeMoney();
BigDecimal c =new BigDecimal(query.getAmount());//司机收入
incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, orderPrivateCar.getId(), 1, c.doubleValue());
Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
@@ -1847,16 +2032,38 @@
if(1 == language){
document.getElementById("english").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("I-GO电子收据");
Element title_chinese = document.getElementById("title_chinese");
- title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+ title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element xcf_chinese = document.getElementById("xcf_chinese");
- xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+ xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+ Element yhq_chinese = document.getElementById("yhq_chinese");
+ yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
+ yhq_chinese_div.remove();
+ }
+ if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+ Element zk_chinese = document.getElementById("zk_chinese");
+ zk_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_chinese_div = document.getElementById("zk_chinese_div");
+ zk_chinese_div.remove();
+ }
+ if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+ Element hb_chinese = document.getElementById("hb_chinese");
+ hb_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_chinese_div = document.getElementById("hb_chinese_div");
+ hb_chinese_div.remove();
+ }
Element xj_chinese = document.getElementById("xj_chinese");
- xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+ xj_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pay_type_chinese = document.getElementById("pay_type_chinese");
- pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机" : "银行卡");
+ pay_type_chinese.text(orderPrivateCar.getPayType() == 1 ? "手机支付" : (orderPrivateCar.getPayType() == 2?"银行卡支付":(orderPrivateCar.getPayType() == 3?"余额支付":"现金支付")));
Element pay_money_chinese = document.getElementById("pay_money_chinese");
- pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+ pay_money_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pdf_chinese = document.getElementById("pdf_chinese");
pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1");
Element lost_item_chinese = document.getElementById("lost_item_chinese");
@@ -1868,7 +2075,7 @@
Elements driver_chinese = document.getElementsByClass("driver_chinese");
for (int i = 0; i < driver_chinese.size(); i++) {
Element element = driver_chinese.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
}
Element cp_chinese = document.getElementById("cp_chinese");
cp_chinese.text("车牌：" + car.getCarLicensePlate());
@@ -1891,16 +2098,38 @@
if(2 == language){
document.getElementById("chinese").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("Receipt");
Element title_english = document.getElementById("title_english");
- title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+ title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
Element xcf_english = document.getElementById("xcf_english");
- xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+ xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+ Element yhq_english = document.getElementById("yhq_english");
+ yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_english_div = document.getElementById("yhq_english_div");
+ yhq_english_div.remove();
+ }
+ if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+ Element zk_english = document.getElementById("zk_english");
+ zk_english.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_english_div = document.getElementById("zk_english_div");
+ zk_english_div.remove();
+ }
+ if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+ Element hb_english = document.getElementById("hb_english");
+ hb_english.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_english_div = document.getElementById("hb_english_div");
+ hb_english_div.remove();
+ }
Element xj_english = document.getElementById("xj_english");
- xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
+ xj_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pay_type_english = document.getElementById("pay_type_english");
- pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile" : "Bank card");
+ pay_type_english.text(orderPrivateCar.getPayType() == 1 ? "Mobile money" :(orderPrivateCar.getPayType() == 2?"Bank card":(orderPrivateCar.getPayType() == 3?"I-GO Wallet":"Cash")));
Element pay_money_english = document.getElementById("pay_money_english");
- pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
+ pay_money_english.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pdf_english = document.getElementById("pdf_english");
pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1");
Element lost_item_english = document.getElementById("lost_item_english");
@@ -1912,7 +2141,7 @@
Elements driver_english = document.getElementsByClass("driver_english");
for (int i = 0; i < driver_english.size(); i++) {
Element element = driver_english.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
}
Element cp_english = document.getElementById("cp_english");
cp_english.text("Number Plate：" + car.getCarLicensePlate());
@@ -1935,16 +2164,38 @@
if(3 == language){
document.getElementById("chinese").remove();
document.getElementById("english").remove();
+ document.getElementsByTag("title").get(0).text("Reçu");
Element title_french = document.getElementById("title_french");
- title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + orderPrivateCar.getPayMoney() + " sur le voyage");
+ title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
Element xcf_french = document.getElementById("xcf_french");
- xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+ xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
+ Element yhq_french = document.getElementById("yhq_french");
+ yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element yhq_french_div = document.getElementById("yhq_french_div");
+ yhq_french_div.remove();
+ }
+ if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
+ Element zk_french = document.getElementById("zk_french");
+ zk_french.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element zk_french_div = document.getElementById("zk_french_div");
+ zk_french_div.remove();
+ }
+ if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
+ Element hb_french = document.getElementById("hb_french");
+ hb_french.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
+ }else{
+ Element hb_french_div = document.getElementById("hb_french_div");
+ hb_french_div.remove();
+ }
Element xj_french = document.getElementById("xj_french");
- xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
+ xj_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pay_type_french = document.getElementById("pay_type_french");
- pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Mobile" : "Carte bancaire");
+ pay_type_french.text(orderPrivateCar.getPayType() == 1 ? "Argent mobile" : (orderPrivateCar.getPayType() == 2?"Carte bancaire":(orderPrivateCar.getPayType() == 3?"Portefeuille I-GO":"En espèces")));
Element pay_money_french = document.getElementById("pay_money_french");
- pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
+ pay_money_french.text("GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
Element pdf_french = document.getElementById("pdf_french");
pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=1");
Element lost_item_french = document.getElementById("lost_item_french");
@@ -1956,7 +2207,7 @@
Elements driver_french = document.getElementsByClass("driver_french");
for (int i = 0; i < driver_french.size(); i++) {
Element element = driver_french.get(i);
- element.text(driver.getFirstName() + "." + driver.getLastName());
+ element.text(" " + driver.getFirstName() + "." + driver.getLastName());
}
Element cp_french = document.getElementById("cp_french");
cp_french.text("Plaque: GS " + car.getCarLicensePlate());
@@ -1977,7 +2228,7 @@
server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
//开始生成pdf收据和html收据
File file = new File("/usr/local/nginx/html/files/html/");
@@ -1992,7 +2243,7 @@
fileWriter.write(document.html());
fileWriter.flush();
fileWriter.close();
- FileInputStream fileInputStream = new FileInputStream(file);
+
File file1 = new File("/usr/local/nginx/html/files/pdf/");
if(!file1.exists()){
file1.mkdirs();
@@ -2001,14 +2252,19 @@
if(!file1.exists()){
file1.createNewFile();
}
- FileOutputStream fileOutputStream = new FileOutputStream(file1);
- HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
+ try {
+ FileOutputStream fileOutputStream = new FileOutputStream(file1);
+ HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/ride_receipt_" + id + ".html", "I-GO", fileOutputStream);
+ }catch (Exception e){
+ e.printStackTrace();
+ System.out.println("html转pdf异常");
+ }
String link ="http://182.160.16.251:81/files/html/ride_receipt_" + id + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
- tEmail.setName(language == 1 ? "打车收据" : language == 2 ? "Ride Receipt" : "Reçu de course");
+ tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
tEmail.setUserId(userInfo.getId());
tEmail.setType(1);
tEmail.setOrderId(id);
@@ -2017,9 +2273,9 @@
tEmail.setWeek(EmailUtil.getWeek(language,i));
boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
}else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
@@ -2086,6 +2342,7 @@
endTime = dateUtil.getStartOrEndDate(endTime, "end");
List<Map<String, Object>> list = orderPrivateCarMapper.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
for (Map<String, Object> map : list) {
+ map.put("orderName", language == 1 ? "打车订单" : language == 2 ? "Ride" : "Course");
if(null != map.get("time")){
String time = map.get("time").toString();
map.put("time", DateUtil.conversionFormat(language, time));
@@ -2268,6 +2525,7 @@
public List<Map<String, Object>> queryRedEnvelope(Integer language, Integer uid) throws Exception {
List<Map<String, Object>> list = orderPrivateCarMapper.queryRedEnvelope(uid);
for (Map<String, Object> map : list) {
+ map.put("name", language == 1 ? "打车订单" : language == 2 ? "Ride" : "Course");
if(null != map.get("time")){
String time = map.get("time").toString();
map.put("time", DateUtil.conversionFormat(language, time));
--
Gitblit v1.7.1