From a075cdd2f76fae321ecf95dce363141ade30f0f1 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 12 四月 2024 22:37:58 +0800
Subject: [PATCH] 新增加功能
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 515 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 330 insertions(+), 185 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 20750b6..d9f38a1 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.");
}
@@ -442,6 +437,22 @@
//推单操作
if(orderPrivateCar.getState() == 1){
this.pushOrder(orderPrivateCar);
+ }else{
+ //接单后定时任务判断司机是否去接乘客，没有则推送提醒
+ CancleOrder cancleOrder = cancleOrderService.query(orderPrivateCar.getCompanyId());
+ if(null != cancleOrder){
+ JSONObject object = JSON.parseObject(cancleOrder.getContent());
+ long time = object.getInteger("driverTimeout") * 60000L;
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ OrderPrivateCar orderPrivateCar1 = OrderPrivateCarServiceImpl.this.selectById(orderPrivateCar.getId());
+ if(orderPrivateCar1.getState() == 2){
+ pushUtil.pushDriverTimeOut(1, orderPrivateCar1.getUserId(), orderPrivateCar1.getId(), 1);
+ }
+ }
+ }, time);
+ }
}
@@ -505,28 +516,89 @@
}
return ResultUtil.success();
}
-
+
+ /**
+ * 获取取消需要支付的金额
+ * @param id
+ * @param language
+ * @return
+ * @throws Exception
+ */
@Override
public ResultUtil<BaseWarpper> queryCancleAmount(Integer id, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(id);
if(null == orderPrivateCar){
return ResultUtil.error(language == 1 ? "获取数据失败，订单信息有误" : language == 2 ? "Failed to obtain data, order-information error." : "Impossible d’obtenir les données, erreur d’information de commande. ");
}
+ BaseWarpper baseWarpper = new BaseWarpper();
double amount = 0;
- CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
- if(null != orderPrivateCar.getDriverId() && orderPrivateCar.getSnatchOrderTime()!=null &&
- (orderPrivateCar.getSnatchOrderTime().getTime() + query.getMinuteNum() * 60 * 1000) < new Date().getTime()){//收费的情况
- if(null != query){
- amount += query.getMoney();
+ CancleOrder query = cancleOrderService.query(orderPrivateCar.getCompanyId());
+ if(null == query || null == orderPrivateCar.getDriverId()){
+ baseWarpper.setAmount(amount);
+ return ResultUtil.success(baseWarpper);
+ }
+ JSONObject object = JSON.parseObject(query.getContent());
+ long t = object.getInteger("driverTimeout") * 60000L;
+ //司机超时未到达起点，免费取消
+ if(orderPrivateCar.getState() < 3 && orderPrivateCar.getSnatchOrderTime().getTime() + t < System.currentTimeMillis()){
+ baseWarpper.setAmount(amount);
+ return ResultUtil.success(baseWarpper);
+ }
+ //普通单
+ if(1 == orderPrivateCar.getOrderType()){
+ JSONObject order = object.getJSONObject("order");
+ long m = order.getInteger("orderAcceptanceTime") * 60000L;
+ //超过免费时间，计算费用
+ if(orderPrivateCar.getSnatchOrderTime().getTime() + m < System.currentTimeMillis()){
+ BigDecimal money = order.getBigDecimal("money");
+ if(null != orderPrivateCar.getSetOutTime()){
+ //里程费
+ BigDecimal mileageFee = order.getBigDecimal("mileageFee").multiply(new BigDecimal(orderPrivateCar.getMileage() / 1000));
+ //时长费
+ int s = Double.valueOf((System.currentTimeMillis() - orderPrivateCar.getSetOutTime().getTime()) / 60000).intValue();
+ BigDecimal durationFee = order.getBigDecimal("durationFee").multiply(new BigDecimal(s));
+ money = money.add(durationFee).add(mileageFee);
+ }
+ amount = money.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}
}
- BaseWarpper baseWarpper = new BaseWarpper();
+ //预约单
+ if(2 == orderPrivateCar.getOrderType()){
+ JSONObject order = object.getJSONObject("reservationOrder");
+ long m = order.getInteger("orderAcceptanceTime") * 60000L;
+ //超过免费时间，计算费用
+ if(System.currentTimeMillis() + m > orderPrivateCar.getTravelTime().getTime()){
+ BigDecimal money = order.getBigDecimal("money");
+ if(null != orderPrivateCar.getSetOutTime()){
+ //里程费
+ BigDecimal mileageFee = order.getBigDecimal("mileageFee").multiply(new BigDecimal(orderPrivateCar.getMileage() / 1000));
+ //时长费
+ int s = Double.valueOf((System.currentTimeMillis() - orderPrivateCar.getSetOutTime().getTime()) / 60000).intValue();
+ BigDecimal durationFee = order.getBigDecimal("durationFee").multiply(new BigDecimal(s));
+ //预定费用
+ BigDecimal reservationFee = order.getBigDecimal("reservationFee");
+ money = money.add(durationFee).add(mileageFee).add(reservationFee);
+ }
+ amount = money.setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }
+ }
baseWarpper.setAmount(amount);
return ResultUtil.success(baseWarpper);
}
-
+
+
+ /**
+ * 添加取消操作
+ * @param id
+ * @param reason
+ * @param remark
+ * @param uid
+ * @param language
+ * @return
+ * @throws Exception
+ */
@Override
- public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Integer language) throws Exception {
+ public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Double lon, Double lat, String address, Integer language) throws Exception {
if(ToolUtil.isNotEmpty(remark)){
if(ToolUtil.isNotEmpty(remark)){
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
@@ -545,6 +617,8 @@
if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11){
return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Failed to cancel order, illegal operation." : "Échec de l’annulation de la commande, opération illégale.");
}
+
+ //服务中也可以取消订单，所以取消订单时需要计算订单费用
if(null == orderPrivateCar.getDriverId()){//没有接单的情况
if(orderPrivateCar.getType() == 2){//摆渡车
OrderCrossCityServiceImpl.pushEndMap.remove(orderPrivateCar.getCrossCityOrderId());//删除标识数据
@@ -566,36 +640,48 @@
this.updateById(orderPrivateCar);
}
}else {
- CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
- if (null != query) {
- if ((orderPrivateCar.getSnatchOrderTime().getTime() + query.getMinuteNum() * 60 * 1000) < System.currentTimeMillis() && query.getMoney().compareTo(0D) > 0) {//收费的情况
- orderPrivateCar.setState(12);
- this.updateById(orderPrivateCar);
- integer = orderCancelService.saveData(id, 1, reason, remark, null, query.getMoney(), 1, 1, uid);
- } else {
- integer = orderCancelService.saveData(id, 1, reason, remark, null, null, 2, 1, uid);
-
+ BaseWarpper data = queryCancleAmount(id, language).getData();
+ Double amount = data.getAmount();
+ if(0 == amount){
+ integer = orderCancelService.saveData(id, 1, reason, remark, null, null, 2, 1, uid);
+ if(5 == orderPrivateCar.getState()){
+ orderPrivateCar.setState(6);
+ orderPrivateCar.setGetoffLon(lon);
+ orderPrivateCar.setGetoffLat(lat);
+ orderPrivateCar.setGetoffAddress(address);
+ orderPrivateCar.setGetoffTime(new Date());
+ orderPrivateCar.setEndServiceTime(new Date());
+ }else{
orderPrivateCar.setState(10);
- this.updateById(orderPrivateCar);
}
- this.deleteTask(id);//删除定时任务
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
- System.err.println("推送取消操作---------------------");
- }
- }).start();
-
- //修改司机为空闲
- Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
- driver.setState(2);
- driverService.updateById(driver);
+ this.updateById(orderPrivateCar);
}else{
- return ResultUtil.error(language == 1 ? "请完善后台取消规则设置" : language == 2 ? "Please complete the setting of cancellation rules from the background." : "Veuillez compléter le réglage des règles d’annulation à partir de l’arrière-plan.");
+ if(5 == orderPrivateCar.getState()){
+ orderPrivateCar.setGetoffLon(lon);
+ orderPrivateCar.setGetoffLat(lat);
+ orderPrivateCar.setGetoffAddress(address);
+ orderPrivateCar.setGetoffTime(new Date());
+ orderPrivateCar.setEndServiceTime(new Date());
+ }
+ orderPrivateCar.setOldState(6);
+ orderPrivateCar.setState(12);
+ this.updateById(orderPrivateCar);
+ integer = orderCancelService.saveData(id, 1, reason, remark, null, amount, 1, 1, uid);
}
-
+ this.deleteTask(id);//删除定时任务
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
+ System.err.println("推送取消操作---------------------");
+ }
+ }).start();
+
+ //修改司机为空闲
+ Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
+ driver.setState(2);
+ driverService.updateById(driver);
}
//添加消息
@@ -631,9 +717,9 @@
}else{
orderCancel = orderCancelService.selectById(cancleId);
}
-
- CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
- if(null != query){
+
+ Double amount = queryCancleAmount(id, language).getData().getAmount();
+ if(0 < amount){
if(payType == 1){//手机支付
orderCancel.setPayType(1);
orderCancelService.updateById(orderCancel);
@@ -645,7 +731,7 @@
checkoutRequest.setAccountNumber(userInfo.getPhone());
checkoutRequest.setCustomerFirstName(userInfo.getFirstName());
checkoutRequest.setCustomerLastName(userInfo.getLastName());
- checkoutRequest.setRequestAmount(query.getMoney());
+ checkoutRequest.setRequestAmount(amount);
checkoutRequest.setMerchantTransactionId(merchantTransactionId);
checkoutRequest.setRequestDescription("Cancel a trip");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
@@ -654,7 +740,7 @@
checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()==200){
- paymentRecordService.saveData(1, null, null, id, 1, 1, query.getMoney(), null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, null, null, id, 1, 1, amount, null, 1);//添加预支付数据
}
}
@@ -670,7 +756,7 @@
checkoutRequest.setAccountNumber(bankCard.getCode());
checkoutRequest.setCustomerFirstName(bankCard.getFirstName());
checkoutRequest.setCustomerLastName(bankCard.getLastName());
- checkoutRequest.setRequestAmount(query.getMoney());
+ checkoutRequest.setRequestAmount(amount);
checkoutRequest.setMerchantTransactionId(merchantTransactionId);
checkoutRequest.setRequestDescription("Cancel a trip");
checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
@@ -679,26 +765,30 @@
checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()==200){
- paymentRecordService.saveData(1, null, null, id, 1, 2, query.getMoney(), null, 1);//添加预支付数据
+ paymentRecordService.saveData(1, null, null, id, 1, 2, amount, null, 1);//添加预支付数据
}
}
if(payType == 3){//余额支付
- if(userInfo.getBalance() != null && userInfo.getBalance() < query.getMoney()){
+ if(userInfo.getBalance() != null && userInfo.getBalance() < amount){
return ResultUtil.error((language == 1 ? "账户余额不足" : language == 2 ? "Insufficient balance" : "Solde insuffisant"), "");
}
- userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(query.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(amount)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
//添加交易明细
- transactionDetailsService.saveData(uid, "取消订单", query.getMoney(), 2, 1, 1, 1, id);
+ transactionDetailsService.saveData(uid, "取消订单", amount, 2, 1, 1, 1, id);
userInfoService.updateById(userInfo);
//解除小号绑定
if(orderPrivateCar.getBindId() != null){
- chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
+ ChinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
}
-
- orderPrivateCar.setState(10);
+
+ if(5 == orderPrivateCar.getOldState()){
+ orderPrivateCar.setState(6);
+ }else{
+ orderPrivateCar.setState(10);
+ }
orderPrivateCar.setTelX("");
orderPrivateCar.setBindId("");
this.updateById(orderPrivateCar);
@@ -707,20 +797,19 @@
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();
- BigDecimal c =new BigDecimal(query.getMoney());//司机收入
- incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, 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());
- driverService.updateById(driver);
-
- this.deleteTask(id);//删除定时任务
+ if(null != orderPrivateCar.getDriverId()){
+ BigDecimal c =new BigDecimal(amount);//司机收入
+ incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, 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());
+ driverService.updateById(driver);
+
+ this.deleteTask(id);//删除定时任务
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
+ }
+ pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
//添加消息
systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
@@ -903,7 +992,7 @@
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){
@@ -1058,36 +1147,36 @@
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-GO此订单消费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 -" + orderPrivateCar.getCouponMoney());
+ 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 -" + orderPrivateCar.getDiscountMoney());
+ 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 -" + orderPrivateCar.getRedPacketMoney());
+ 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.getPayMoney());
+ 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");
@@ -1099,7 +1188,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());
@@ -1124,36 +1213,36 @@
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 -" + orderPrivateCar.getCouponMoney());
+ 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 -" + orderPrivateCar.getDiscountMoney());
+ 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 -" + orderPrivateCar.getRedPacketMoney());
+ 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.getPayMoney());
+ 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("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");
@@ -1165,7 +1254,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());
@@ -1190,36 +1279,36 @@
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 -" + orderPrivateCar.getCouponMoney());
+ 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 -" + orderPrivateCar.getDiscountMoney());
+ 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 -" + orderPrivateCar.getRedPacketMoney());
+ 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.getPayMoney());
+ 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("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");
@@ -1231,7 +1320,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());
@@ -1341,17 +1430,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());
@@ -1369,7 +1484,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());
@@ -1391,24 +1506,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);
+ }
}
}
}
@@ -1437,36 +1561,36 @@
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-GO此订单消费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 -" + orderPrivateCar.getCouponMoney());
+ 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 -" + orderPrivateCar.getDiscountMoney());
+ 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 -" + orderPrivateCar.getRedPacketMoney());
+ 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.getPayMoney());
+ 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");
@@ -1478,7 +1602,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());
@@ -1503,36 +1627,36 @@
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 -" + orderPrivateCar.getCouponMoney());
+ 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 -" + orderPrivateCar.getDiscountMoney());
+ 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 -" + orderPrivateCar.getRedPacketMoney());
+ 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.getPayMoney());
+ 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");
@@ -1544,7 +1668,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());
@@ -1569,36 +1693,36 @@
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 -" + orderPrivateCar.getCouponMoney());
+ 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 -" + orderPrivateCar.getDiscountMoney());
+ 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 -" + orderPrivateCar.getRedPacketMoney());
+ 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.getPayMoney());
+ 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("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");
@@ -1610,7 +1734,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());
@@ -1871,10 +1995,14 @@
if(null != query){
//添加交易明细
transactionDetailsService.saveData(orderPrivateCar.getUserId(), "取消订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
- orderPrivateCar.setState(10);
+ if(5 == orderPrivateCar.getOldState()){
+ orderPrivateCar.setState(6);
+ }else{
+ orderPrivateCar.setState(10);
+ }
//解除小号绑定
if(orderPrivateCar.getBindId() != null){
- chinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
+ ChinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
}
orderPrivateCar.setBindId("");
orderPrivateCar.setTelX("");
@@ -1890,27 +2018,19 @@
orderCancelService.updateById(query1);
}
-// //添加已收入明细
-// 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());
- 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());
- driverService.updateById(driver);
- this.deleteTask(orderPrivateCar.getId());//删除定时任务
-
- // TODO: 2020/5/24 这里需要给司机和用户推送订单状态
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
-// }
-// }).start();
+ if(null != orderPrivateCar.getDriverId()){
+ BigDecimal c =new BigDecimal(query.getAmount());//司机收入
+ incomeService.saveData(2, orderPrivateCar.getDriverId(), 3, 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());
+ driverService.updateById(driver);
+ this.deleteTask(orderPrivateCar.getId());//删除定时任务
+
+ pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
+ }
+ pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
//添加消息
systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
@@ -2004,36 +2124,36 @@
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-GO此订单消费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 -" + orderPrivateCar.getCouponMoney());
+ 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 -" + orderPrivateCar.getDiscountMoney());
+ 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 -" + orderPrivateCar.getRedPacketMoney());
+ 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.getPayMoney());
+ 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");
@@ -2045,7 +2165,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());
@@ -2070,36 +2190,36 @@
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 -" + orderPrivateCar.getCouponMoney());
+ 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 -" + orderPrivateCar.getDiscountMoney());
+ 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 -" + orderPrivateCar.getRedPacketMoney());
+ 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.getPayMoney());
+ 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 money" : "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");
@@ -2111,7 +2231,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());
@@ -2136,36 +2256,36 @@
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 -" + orderPrivateCar.getCouponMoney());
+ 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 -" + orderPrivateCar.getDiscountMoney());
+ 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 -" + orderPrivateCar.getRedPacketMoney());
+ 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.getPayMoney());
+ 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 ? "Argent 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");
@@ -2177,7 +2297,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());
@@ -2533,4 +2653,29 @@
}
return endPushWarpper;
}
+
+
+ /**
+ * 修改目的地
+ * @param orderId
+ * @param endLon
+ * @param endLat
+ * @param endAddress
+ */
+ @Override
+ public void updateEndAddress(Integer orderId, String endLon, String endLat, String endAddress) {
+ OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ if(null != orderPrivateCar.getDriverId()){
+ orderPrivateCar.setDestination(endAddress);
+ orderPrivateCar.setDestinationLat(endLat);
+ orderPrivateCar.setDestinationLon(endLon);
+ this.updateById(orderPrivateCar);
+ pushUtil.pushModifyAddress(2, orderPrivateCar.getDriverId(), orderId, 1, 1);
+ }else{
+ orderPrivateCar.setEndAddress(endAddress);
+ orderPrivateCar.setEndLat(Double.valueOf(endLat));
+ orderPrivateCar.setEndLon(Double.valueOf(endLon));
+ this.updateById(orderPrivateCar);
+ }
+ }
}
--
Gitblit v1.7.1