From b50c961c49851d140d77d549db34a9f6400dadd4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 19:03:10 +0800
Subject: [PATCH] 跨城推广
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 10 ++++++++--
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/OrderCrossCity.java | 11 ++++++++++-
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/OrderCrossCity.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/OrderCrossCity.java
index 7c7981d..d3509e5 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/OrderCrossCity.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/OrderCrossCity.java
@@ -353,13 +353,22 @@
private Integer responsibilityType;
+ private Date successTime;
public Integer getResponsibilityType() {
return responsibilityType;
}
public void setResponsibilityType(Integer responsibilityType) {
- responsibilityType = responsibilityType;
+ this.responsibilityType = responsibilityType;
+ }
+
+ public Date getSuccessTime() {
+ return successTime;
+ }
+
+ public void setSuccessTime(Date successTime) {
+ this.successTime = successTime;
}
public Long getPromotionActivityId() {
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index f3baac8..1a13082 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -393,19 +393,25 @@
public void promotion(Integer orderId) {
OrderCrossCity orderCrossCity = this.baseMapper.selectById(orderId);
UserInfo userInfo = userInfoMapper.selectById(orderCrossCity.getUserId());
- if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
+ if(orderCrossCity.getPromotionDriverId()!=null ){
String registAreaCode = userInfo.getRegistAreaCode();
- TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 3 + ", bizType) limit 1"));
+ TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).le("startTime", new Date()).ge("endTime", new Date()).last("AND FIND_IN_SET(" + 3 + ", bizType) limit 1"));
+ System.out.println("ddddd"+tDriverPromotionActivity);
if(tDriverPromotionActivity!=null){
Double payMoney = orderCrossCity.getPayMoney();
+ System.out.println(payMoney);
BigDecimal bigDecimal = tDriverPromotionActivity.getCommissionRatio().divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(payMoney)).setScale(2, RoundingMode.HALF_UP);
+ System.out.println(bigDecimal);
orderCrossCity.setPromotionDriverId(userInfo.getBindDriverId());
orderCrossCity.setPromotionMoney(bigDecimal);
orderCrossCity.setPromotionActivityId(tDriverPromotionActivity.getId());
+ orderCrossCity.setSuccessTime(new Date());
this.baseMapper.updateById(orderCrossCity);
}
}
+
+
}
/**
* 获取订单明细
--
Gitblit v1.7.1