From cf71570fb38ad1983cd40e65fb09e259e509d2a3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 06 五月 2024 09:36:45 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 3337fa0..20b67fb 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -776,21 +776,21 @@
if(orderLogistics.getState() == 1){
this.pushOrder(orderLogistics);
}else{
- //接单后定时任务判断司机是否去接乘客，没有则推送提醒
- CancleOrder cancleOrder = cancleOrderService.query(orderLogistics.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() {
- OrderLogistics orderLogistics1 = OrderLogisticsServiceImpl.this.selectById(orderLogistics.getId());
- if(orderLogistics1.getState() == 2){
- pushUtil.pushDriverTimeOut(1, orderLogistics1.getUserId(), orderLogistics1.getId(), 4);
- }
- }
- }, time);
- }
+// //接单后定时任务判断司机是否去接乘客，没有则推送提醒
+// CancleOrder cancleOrder = cancleOrderService.query(orderLogistics.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() {
+// OrderLogistics orderLogistics1 = OrderLogisticsServiceImpl.this.selectById(orderLogistics.getId());
+// if(orderLogistics1.getState() == 2){
+// pushUtil.pushDriverTimeOut(1, orderLogistics1.getUserId(), orderLogistics1.getId(), 4);
+// }
+// }
+// }, time);
+// }
}
@@ -2561,6 +2561,26 @@
if(state == 11){
map.put("state", map.get("oldState"));
}
+ if(Integer.valueOf(String.valueOf(map.get("state"))) != 8 && Integer.valueOf(String.valueOf(map.get("state"))) != 9){
+ map.put("redPacketMoney", null);
+ map.put("couponMoney", null);
+ }
+ if(Integer.valueOf(String.valueOf(map.get("state"))) == 7){
+ UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(Integer.valueOf(String.valueOf(map.get("companyId"))));
+ if(null != query2){
+ Integer orderNum=this.selectCount(new EntityWrapper<OrderLogistics>().eq("userId",orderLogistics.getUserId()).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
+ if(query2.getDistance()*1000>orderLogistics.getMileage() && query2.getOrderNum()>orderNum){
+ Double special = query2.getSpecial();
+ orderLogistics.setDiscount(special);
+ Double orderMoney = orderLogistics.getOrderMoney();
+ double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ if(orderMoney.compareTo(v) > 0){
+ map.put("discountMoney",orderMoney - v);
+ }
+ }
+
+ }
+ }
Map<String, String> geocode = gdMapGeocodingUtil.geocode(map.get("startLon").toString(), map.get("startLat").toString());
map.put("startCity", geocode.get("city"));
geocode = gdMapGeocodingUtil.geocode(map.get("endLon").toString(), map.get("endLat").toString());
@@ -2927,7 +2947,6 @@
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + Integer.valueOf(String.valueOf(query.get("effective"))));
- userRedPacketRecord.setExpirationTime(calendar.getTime());
userRedPacketRecord.setInsertTime(new Date());
userRedPacketRecord.setCompanyId(Integer.valueOf(String.valueOf(query.get("companyId"))));
userRedPacketRecord.setState(0);
@@ -2980,7 +2999,7 @@
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.getExpirationTime())) + "，详情请查看I-GO平台");
+ time_chinese.text("此活动有效期在 " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " 至 " + DateUtil.conversionFormat(language, sdf.format(id.getEnable())) + "，详情请查看I-GO平台");
}
if(2 == language){
document.getElementById("chinese").remove();
@@ -2989,7 +3008,7 @@
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.getExpirationTime())) + "，check more details on the app.");
+ time_english.text("You could use it from " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " to " + DateUtil.conversionFormat(language, sdf.format(id.getEnable())) + "，check more details on the app.");
}
if(3 == language){
document.getElementById("chinese").remove();
@@ -2998,7 +3017,7 @@
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.getExpirationTime())) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
+ time_french.text("Cette promotion est valable du " + DateUtil.conversionFormat(language, sdf.format(id.getStartTime())) + " au " + DateUtil.conversionFormat(language, sdf.format(id.getEnable())) + ". 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());
--
Gitblit v1.7.1