From 16cee07f274c039bf0dcb5da347859053b7c2586 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 05 八月 2025 09:28:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverRankVo.java | 2
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCrossCity.java | 18 +++
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverPromotionActivityServiceImpl.java | 1
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 35 +++---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java | 8
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java | 18 +++
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tDriverPromotionActivity1.js | 6
ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tPromotionOrder.html | 9 +
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TPromotionOrderCarController.java | 12 +-
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java | 72 ++++++++++++++
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java | 20 ++++
ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tPromotionOrder.js | 7 +
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 5
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml | 18 +++
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java | 2
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java | 7
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java | 4
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java | 4
18 files changed, 208 insertions(+), 40 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index 095c35a..7868560 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -556,11 +556,14 @@
(select count(id) from t_order_logistics where driverId = a.id and state in (6, 9))
) as orderNum,
((select sum(fraction) from t_order_evaluate where driverId = a.id) / (select count(fraction) from t_order_evaluate where driverId = a.id)) as score,
- if((select id from t_merchant where auditStatus = 2 and userType = 2 and userId = a.id and state = 1) is null, 0, 1) as merchant
+ if((select id from t_merchant where auditStatus = 2 and userType = 2 and userId = a.id and state = 1) is null, 0, 1) as merchant,
+ a.companyId as companyId,
+ e.name as companyName
from t_driver a
left join t_car b on (a.carId = b.id)
left join t_car_model c on (b.carModelId = c.id)
left join t_car_brand d on (c.brandId = d.id)
+ left join t_company e on (a.companyId = e.id)
where a.id = #{uid}
</select>
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index d40981b..a880df4 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -44,7 +44,7 @@
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -408,6 +408,9 @@
driver.setProvince(registeredWarpper.getProvince());
driver.setProvinceCode(registeredWarpper.getProvinceCode());
driver.setCompanyId(registeredWarpper.getCompanyId());
+ if(registeredWarpper.getCompanyId()==null){
+ return ResultUtil.error("请选择服务商");
+ }
String code = registeredWarpper.getAreaCode();
Company query = companyCityService.query(code);
@@ -1626,11 +1629,11 @@
public DriverIndexVo queryHomeDataFromDriver(Integer uid) {
DriverIndexVo driverIndexVo = new DriverIndexVo();
// 获取快车订单
- List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().ne("state", 10).eq("driverId", uid).like("insertTime", LocalDateTime.now().toString()));
+ List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().ne("state", 10).eq("driverId", uid).like("insertTime", LocalDate.now().toString()));
// 跨城订单
- List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.selectList(new EntityWrapper<OrderCrossCity>().ne("state", 10).eq("driverId", uid).like("insertTime", LocalDateTime.now().toString()));
+ List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.selectList(new EntityWrapper<OrderCrossCity>().ne("state", 10).eq("driverId", uid).like("insertTime", LocalDate.now().toString()));
// 出租车订单
- List<OrderTaxi> orderTaxis = orderTaxiMapper.selectList(new EntityWrapper<OrderTaxi>().ne("state", 10).eq("driverId", uid).like("insertTime", LocalDateTime.now().toString()));
+ List<OrderTaxi> orderTaxis = orderTaxiMapper.selectList(new EntityWrapper<OrderTaxi>().ne("state", 10).eq("driverId", uid).like("insertTime", LocalDate.now().toString()));
driverIndexVo.setTodayOrderNum(orderPrivateCars.size() + orderCrossCities.size() + orderTaxis.size());
@@ -1640,9 +1643,9 @@
driverIndexVo.setTodayOrderMoney(new BigDecimal(sum +sum1+sum2));
- BigDecimal reduce = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().eq("promotionDriverId", uid).like("insertTime", LocalDateTime.now().toString())).stream().map(OrderPrivateCar::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal reduce1 = orderCrossCityMapper.selectList(new EntityWrapper<OrderCrossCity>().eq("promotionDriverId", uid).like("insertTime", LocalDateTime.now().toString())).stream().map(OrderCrossCity::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal reduce2 = orderTaxiMapper.selectList(new EntityWrapper<OrderTaxi>().eq("promotionDriverId", uid).like("insertTime", LocalDateTime.now().toString())).stream().map(OrderTaxi::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal reduce = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().eq("promotionDriverId", uid).like("insertTime", LocalDate.now().toString())).stream().map(OrderPrivateCar::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal reduce1 = orderCrossCityMapper.selectList(new EntityWrapper<OrderCrossCity>().eq("promotionDriverId", uid).like("insertTime", LocalDate.now().toString())).stream().map(OrderCrossCity::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal reduce2 = orderTaxiMapper.selectList(new EntityWrapper<OrderTaxi>().eq("promotionDriverId", uid).like("insertTime", LocalDate.now().toString())).stream().map(OrderTaxi::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
driverIndexVo.setTodayPromotionMoney(reduce.add(reduce1).add(reduce2));
return driverIndexVo;
};
@@ -1661,9 +1664,9 @@
List<OrderTaxi> orderTaxis = orderTaxiMapper.selectList(new EntityWrapper<OrderTaxi>().ne("state", 10).eq("driverId", uid));
DriverOrderDataVo driverOrderDataVo = new DriverOrderDataVo();
driverOrderDataVo.setAllOrderNum(orderPrivateCars.size() + orderCrossCities.size() + orderTaxis.size());
- long count = orderPrivateCars.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDateTime.now().toString())).count();
- long count1 = orderCrossCities.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDateTime.now().toString())).count();
- long count2 = orderTaxis.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDateTime.now().toString())).count();
+ long count = orderPrivateCars.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).count();
+ long count1 = orderCrossCities.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).count();
+ long count2 = orderTaxis.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).count();
driverOrderDataVo.setTodayOrderNum((int) (count+count1+count2));
Date date = new Date();
@@ -1707,9 +1710,9 @@
- double count = orderPrivateCars.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDateTime.now().toString())).mapToDouble(OrderPrivateCar::getOrderMoney).sum();
- double count1 = orderCrossCities.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDateTime.now().toString())).mapToDouble(OrderCrossCity::getOrderMoney).sum();
- double count2 = orderTaxis.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDateTime.now().toString())).mapToDouble(OrderTaxi::getOrderMoney).sum();
+ double count = orderPrivateCars.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).mapToDouble(OrderPrivateCar::getOrderMoney).sum();
+ double count1 = orderCrossCities.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).mapToDouble(OrderCrossCity::getOrderMoney).sum();
+ double count2 = orderTaxis.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).mapToDouble(OrderTaxi::getOrderMoney).sum();
driverOrderDataVo.setTodayOrderMoney(new BigDecimal(count+count1+count2));
@@ -1754,9 +1757,9 @@
- BigDecimal count = orderPrivateCars.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDateTime.now().toString())).map(OrderPrivateCar::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count1 = orderCrossCities.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDateTime.now().toString())).map(OrderCrossCity::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal count2 = orderTaxis.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDateTime.now().toString())).map(OrderTaxi::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal count = orderPrivateCars.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).map(OrderPrivateCar::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal count1 = orderCrossCities.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).map(OrderCrossCity::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal count2 = orderTaxis.stream().filter(e -> simpleDateFormat.format(e.getInsertTime()).equals(LocalDate.now().toString())).map(OrderTaxi::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
driverOrderDataVo.setTodayOrderMoney(count.add(count1).add(count2));
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java
index 008dfda..68ad9b0 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDriverPromotionActivityController.java
@@ -114,15 +114,16 @@
model.addAttribute("driverId",id);
return PREFIX + "tDriverPromotionActivityUser.html";
}
- @RequestMapping("/tDriverPromotionActivity_viewMoney/{id}")
- public String tDriverPromotionActivityViewMoney(@PathVariable Integer id, Model model) {
+ @RequestMapping("/tDriverPromotionActivity_viewMoney/{id}/{activityId}")
+ public String tDriverPromotionActivityViewMoney(@PathVariable Integer id,@PathVariable Integer activityId, Model model) {
List<Map<String, Object>> list=new ArrayList<>();
- list = tOrderPrivateCarService.promotionInfoExport(null, null, null, null, null, null, null, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),id);
+ list = tOrderPrivateCarService.promotionInfoExport(null, null, null, null, null, null, null, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),id,activityId);
BigDecimal reduce = list.stream().map(e -> new BigDecimal(e.get("promotionMoney").toString())).reduce(BigDecimal.ZERO, BigDecimal::add);
model.addAttribute("money",reduce);
model.addAttribute("size",list.size());
model.addAttribute("driverId",id);
+ model.addAttribute("activityId",activityId);
return PREFIX + "tPromotionOrder.html";
}
/**
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TPromotionOrderCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TPromotionOrderCarController.java
index af7f7a6..2ef2c7c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TPromotionOrderCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TPromotionOrderCarController.java
@@ -54,7 +54,7 @@
@RequestMapping("")
public String index(Model model) {
List<Map<String, Object>> list=new ArrayList<>();
- list = tOrderPrivateCarService.promotionInfoExport(null, null, null, null, null, null, null, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),null);
+ list = tOrderPrivateCarService.promotionInfoExport(null, null, null, null, null, null, null, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),null,null);
BigDecimal reduce = list.stream().map(e -> new BigDecimal(e.get("promotionMoney").toString())).reduce(BigDecimal.ZERO, BigDecimal::add);
model.addAttribute("money",reduce);
model.addAttribute("size",list.size());
@@ -72,7 +72,7 @@
String orderNum,
String userName,
String name,
- String driverName,Integer driverId){
+ String driverName,Integer driverId,Integer activityId){
String beginTime = null;
String endTime = null;
if (SinataUtil.isNotEmpty(insertTime)) {
@@ -81,7 +81,7 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tOrderPrivateCarService.promotionInfo(page, beginTime, endTime, orderNum, userName, name, driverName, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),driverId));
+ page.setRecords(tOrderPrivateCarService.promotionInfo(page, beginTime, endTime, orderNum, userName, name, driverName, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),driverId,activityId));
return super.packForBT(page);
}
@@ -103,7 +103,7 @@
endTime = timeArray[1];
}
List<Map<String, Object>> list=new ArrayList<>();
- list = tOrderPrivateCarService.promotionInfoExport(null, beginTime, endTime, orderNum, userName, name, driverName, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),driverId);
+ list = tOrderPrivateCarService.promotionInfoExport(null, beginTime, endTime, orderNum, userName, name, driverName, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),driverId,null);
// 表格数据【封装】
@@ -187,7 +187,7 @@
String orderNum,
String userName,
String name,
- String driverName) {
+ String driverName,Integer driverId,Integer activityId) {
String beginTime = null;
String endTime = null;
if (SinataUtil.isNotEmpty(insertTime)) {
@@ -196,7 +196,7 @@
endTime = timeArray[1];
}
List<Map<String, Object>> list=new ArrayList<>();
- list = tOrderPrivateCarService.promotionInfoExport(null, beginTime, endTime, orderNum, userName, name, driverName, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),null);
+ list = tOrderPrivateCarService.promotionInfoExport(null, beginTime, endTime, orderNum, userName, name, driverName, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),driverId,activityId);
HashMap<String, Object> map = new HashMap<>();
BigDecimal reduce = list.stream().map(e -> new BigDecimal(e.get("promotionMoney").toString())).reduce(BigDecimal.ZERO, BigDecimal::add);
map.put("money", reduce);
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java
index de96020..135a4ee 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java
@@ -71,7 +71,7 @@
List<Map<String,Object>> getSurcharge(@Param("id") Object id,@Param("orderType") Integer orderType);
- List<Map<String, Object>> promotionInfo(@Param("page") Page<Map<String, Object>> page, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderNum") String orderNum, @Param("userName") String userName, @Param("name") String name, @Param("driverName") String driverName, @Param("roleType") Integer roleType, @Param("objectId") Integer objectId, @Param("driverId") Integer driverId);
+ List<Map<String, Object>> promotionInfo(@Param("page") Page<Map<String, Object>> page, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderNum") String orderNum, @Param("userName") String userName, @Param("name") String name, @Param("driverName") String driverName, @Param("roleType") Integer roleType, @Param("objectId") Integer objectId, @Param("driverId") Integer driverId,@Param("activityId") Integer activityId);
- List<Map<String, Object>> promotionInfoExport(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderNum") String orderNum, @Param("userName") String userName, @Param("name") String name, @Param("driverName") String driverName, @Param("roleType") Integer roleType, @Param("objectId") Integer objectId, @Param("driverId") Integer driverId);
+ List<Map<String, Object>> promotionInfoExport(@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderNum") String orderNum, @Param("userName") String userName, @Param("name") String name, @Param("driverName") String driverName, @Param("roleType") Integer roleType, @Param("objectId") Integer objectId, @Param("driverId") Integer driverId, @Param("activityId") Integer activityId);
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
index c593fd3..80b2701 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -273,6 +273,9 @@
<if test="orderNum != null and orderNum != ''">
and t1.orderNum =#{orderNum}
</if>
+ <if test="activityId != null">
+ and t1.promotionActivityId =#{activityId}
+ </if>
<if test="beginTime != null and endTime != null">
and t1.successTime between #{beginTime} and #{endTime}
</if>
@@ -301,6 +304,9 @@
where t1.promotionActivityId is not null
<if test="orderNum != null and orderNum != ''">
and t1.orderNum =#{orderNum}
+ </if>
+ <if test="activityId != null">
+ and t1.promotionActivityId =#{activityId}
</if>
<if test="beginTime != null and endTime != null">
and t1.successTime between #{beginTime} and #{endTime}
@@ -331,6 +337,9 @@
where t1.promotionActivityId is not null
<if test="orderNum != null and orderNum != ''">
and t1.orderNum =#{orderNum}
+ </if>
+ <if test="activityId != null">
+ and t1.promotionActivityId =#{activityId}
</if>
<if test="beginTime != null and endTime != null">
and t1.successTime between #{beginTime} and #{endTime}
@@ -364,6 +373,9 @@
<if test="orderNum != null and orderNum != ''">
and t1.orderNum =#{orderNum}
</if>
+ <if test="activityId != null">
+ and t1.promotionActivityId =#{activityId}
+ </if>
<if test="beginTime != null and endTime != null">
and t1.successTime between #{beginTime} and #{endTime}
</if>
@@ -392,6 +404,9 @@
where t1.promotionActivityId is not null
<if test="orderNum != null and orderNum != ''">
and t1.orderNum =#{orderNum}
+ </if>
+ <if test="activityId != null">
+ and t1.promotionActivityId =#{activityId}
</if>
<if test="beginTime != null and endTime != null">
and t1.successTime between #{beginTime} and #{endTime}
@@ -423,6 +438,9 @@
<if test="orderNum != null and orderNum != ''">
and t1.orderNum =#{orderNum}
</if>
+ <if test="activityId != null">
+ and t1.promotionActivityId =#{activityId}
+ </if>
<if test="beginTime != null and endTime != null">
and t1.successTime between #{beginTime} and #{endTime}
</if>
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverRankVo.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverRankVo.java
index 845273f..b129810 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverRankVo.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverRankVo.java
@@ -13,4 +13,6 @@
private Integer userNum;
private BigDecimal money;
+
+ private Long activityId;
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCrossCity.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCrossCity.java
index 903157b..010adb0 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCrossCity.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCrossCity.java
@@ -310,7 +310,25 @@
private Integer promotionDriverId;
private BigDecimal promotionMoney;
+ private String voice;
+ private Date voiceTime;
+
+ public String getVoice() {
+ return voice;
+ }
+
+ public void setVoice(String voice) {
+ this.voice = voice;
+ }
+
+ public Date getVoiceTime() {
+ return voiceTime;
+ }
+
+ public void setVoiceTime(Date voiceTime) {
+ this.voiceTime = voiceTime;
+ }
public BigDecimal getPromotionMoney() {
return promotionMoney;
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
index 150e4a7..b62fa3e 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
@@ -350,6 +350,26 @@
private BigDecimal promotionMoney;
+ private String voice;
+
+ private Date voiceTime;
+
+ public String getVoice() {
+ return voice;
+ }
+
+ public void setVoice(String voice) {
+ this.voice = voice;
+ }
+
+ public Date getVoiceTime() {
+ return voiceTime;
+ }
+
+ public void setVoiceTime(Date voiceTime) {
+ this.voiceTime = voiceTime;
+ }
+
public BigDecimal getPromotionMoney() {
return promotionMoney;
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
index 9e240dc..a59d96a 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
@@ -313,7 +313,25 @@
private Integer promotionDriverId;
private BigDecimal promotionMoney;
+ private String voice;
+ private Date voiceTime;
+
+ public String getVoice() {
+ return voice;
+ }
+
+ public void setVoice(String voice) {
+ this.voice = voice;
+ }
+
+ public Date getVoiceTime() {
+ return voiceTime;
+ }
+
+ public void setVoiceTime(Date voiceTime) {
+ this.voiceTime = voiceTime;
+ }
public BigDecimal getPromotionMoney() {
return promotionMoney;
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java
index afaab8d..d2110fc 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java
@@ -71,8 +71,8 @@
List<Map<String,Object>> getSurcharge(Object id,Integer orderType);
- List<Map<String, Object>> promotionInfo(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId);
+ List<Map<String, Object>> promotionInfo(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId);
- List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId);
+ List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId);
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverPromotionActivityServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverPromotionActivityServiceImpl.java
index c581749..9395687 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverPromotionActivityServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverPromotionActivityServiceImpl.java
@@ -65,6 +65,7 @@
for (TDriver tDriver : tDrivers) {
DriverRankVo driverRankVo = new DriverRankVo();
+ driverRankVo.setActivityId(id);
driverRankVo.setDriverId(tDriver.getId());
driverRankVo.setDriverName(tDriver.getName());
long count = tUsers.stream().filter(e -> tDriver.getId().equals(e.getBindDriverId())).count();
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
index cb73f5a..76e01bb 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
@@ -115,12 +115,12 @@
}
@Override
- public List<Map<String, Object>> promotionInfo(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId) {
- return this.baseMapper.promotionInfo(page, beginTime, endTime, orderNum, userName, name, driverName, roleType, objectId,driverId);
+ public List<Map<String, Object>> promotionInfo(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId) {
+ return this.baseMapper.promotionInfo(page, beginTime, endTime, orderNum, userName, name, driverName, roleType, objectId,driverId,activityId);
}
@Override
- public List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId) {
- return this.baseMapper.promotionInfoExport(beginTime, endTime, orderNum, userName, name, driverName, roleType, objectId,driverId);
+ public List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId) {
+ return this.baseMapper.promotionInfoExport(beginTime, endTime, orderNum, userName, name, driverName, roleType, objectId,driverId,activityId);
}
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index a8a1ee0..594229a 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -1,14 +1,26 @@
package com.stylefeng.guns.modular.system.util;
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClient;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.modular.system.model.TDriver;
+import com.stylefeng.guns.modular.system.model.TOrderCrossCity;
+import com.stylefeng.guns.modular.system.model.TOrderPrivateCar;
+import com.stylefeng.guns.modular.system.model.TOrderTaxi;
import com.stylefeng.guns.modular.system.service.ITDriverService;
+import com.stylefeng.guns.modular.system.service.ITOrderCrossCityService;
+import com.stylefeng.guns.modular.system.service.ITOrderPrivateCarService;
+import com.stylefeng.guns.modular.system.service.ITOrderTaxiService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@@ -26,6 +38,15 @@
@Autowired
private ITDriverService driverService;
+
+ @Autowired
+ private ITOrderPrivateCarService orderPrivateCarService;
+
+ @Autowired
+ private ITOrderTaxiService orderTaxiService;
+
+ @Autowired
+ private ITOrderCrossCityService orderCrossCityService;
/**
@@ -44,4 +65,55 @@
e.printStackTrace();
}
}
+
+
+ /**
+ * 每分钟执行
+ */
+ @Scheduled(cron = "0 0/1 * * * ?")
+ public void taskMinute(){
+ // 15天后的时间
+ long time = System.currentTimeMillis() + 15 * 24 * 60 * 60 * 1000;
+ Date date = new Date(time);
+ // 查出录音
+ List<TOrderPrivateCar> list = orderPrivateCarService.selectList(new EntityWrapper<TOrderPrivateCar>().isNotNull("voiceTime").gt("voiceTime", date));
+ List<TOrderTaxi> tOrderTaxis = orderTaxiService.selectList(new EntityWrapper<TOrderTaxi>().isNotNull("voiceTime").gt("voiceTime", date));
+ List<TOrderCrossCity> tOrderCrossCities = orderCrossCityService.selectList(new EntityWrapper<TOrderCrossCity>().isNotNull("voiceTime").gt("voiceTime", date));
+ ArrayList<String> strings = new ArrayList<>();
+ for (TOrderPrivateCar tOrderPrivateCar : list) {
+ strings.add(tOrderPrivateCar.getVoice());
+ }
+ for (TOrderTaxi tOrderTaxi : tOrderTaxis) {
+ strings.add(tOrderTaxi.getVoice());
+ }
+ for (TOrderCrossCity tOrderCrossCity : tOrderCrossCities) {
+ strings.add(tOrderCrossCity.getVoice());
+ }
+ if(strings.size()>0){
+ deleteFile(strings);
+ }
+
+ }
+
+ public static String oss_domain = "https://cdxy-jiaotong-20250725.oss-cn-chengdu.aliyuncs.com/";
+ public static String accessKeyId = "LTAI5t8obxz88oV8MgFMr4Bd";
+ public static String accessKeySecret = "Y17SxRCVYGePCkr82FSCk9jqCBljRP";
+ public static String bucketName="cdxy-jiaotong-20250725";
+ public static String endpoint = "oss-cn-chengdu.aliyuncs.com";
+ public static OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret);
+ private static boolean deleteFile(List<String> fileNames) {
+ try {
+ for (String fileName : fileNames) {
+ // 删除文件
+ ossClient.deleteObject(bucketName, "img/"+fileName);
+ }
+ // 关闭OSSClient
+ ossClient.shutdown();
+ return true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+ }
+
}
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tPromotionOrder.html b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tPromotionOrder.html
index 43bad65..ceed173 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tPromotionOrder.html
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tDriverPromotionActivity/tPromotionOrder.html
@@ -7,6 +7,7 @@
</div>
<div class="ibox-content">
<input type="hidden" id="driverId" value="${driverId}">
+ <input type="hidden" id="activityId" value="${activityId}">
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
@@ -87,6 +88,7 @@
let driverName = $('#driverName').val();
let userName = $('#userName').val();
let orderNum = $('#orderNum').val();
+ let activityId = $('#activityId').val();
//提交信息
@@ -101,13 +103,15 @@
ajax.set("driverName",driverName);
ajax.set("userName",userName);
ajax.set("orderNum",orderNum);
+ ajax.set("activityId",activityId);
ajax.start();
TAbnormalOrder.search()
}
function resetSearch() {
-
+ let activityId = $('#activityId').val();
+ let driverId = $('#driverId').val();
//提交信息
var ajax = new $ax(Feng.ctxPath + "/promotionInfo/list1", function(data){
console.log(data)
@@ -115,7 +119,10 @@
$("#size").text(data.size)
},function(data){
});
+ ajax.set("activityId",activityId);
+ ajax.set("driverId",driverId);
ajax.start();
+
TAbnormalOrder.resetSearch()
}
</script>
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tDriverPromotionActivity1.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tDriverPromotionActivity1.js
index 6879c44..064a5ce 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tDriverPromotionActivity1.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tDriverPromotionActivity1.js
@@ -30,7 +30,7 @@
formatter: function (value, row) {
var btn = [];
btn += '<a href="javascript:void(0);" onclick="TDriverPromotionActivity.viewUser(' + row.driverId + ')" style="color: #0e9aef">查看下级用户</a> ';
- btn += '<a href="javascript:void(0);" onclick="TDriverPromotionActivity.viewMoney(' + row.driverId + ')" style="color: #0e9aef">查看收益明细</a> ';
+ btn += '<a href="javascript:void(0);" onclick="TDriverPromotionActivity.viewMoney(' + row.driverId+","+row.activityId + ')" style="color: #0e9aef">查看收益明细</a> ';
return btn;
}
@@ -86,14 +86,14 @@
/**
* 打开查看详情
*/
-TDriverPromotionActivity.viewMoney = function (e) {
+TDriverPromotionActivity.viewMoney = function (e,e1) {
var index = layer.open({
type: 2,
title: '推广收益明细',
area: ['100%', '100%'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/tDriverPromotionActivity/tDriverPromotionActivity_viewMoney/' + e
+ content: Feng.ctxPath + '/tDriverPromotionActivity/tDriverPromotionActivity_viewMoney/' + e+"/"+e1
});
this.layerIndex = index;
};
diff --git a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tPromotionOrder.js b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tPromotionOrder.js
index d777a1b..53d9e8b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tPromotionOrder.js
+++ b/ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tDriverPromotionActivity/tPromotionOrder.js
@@ -214,6 +214,7 @@
queryData['userName'] = $("#userName").val();
queryData['orderNum'] = $("#orderNum").val();
queryData['driverId'] = $("#driverId").val();
+ queryData['activityId'] = $("#activityId").val();
TAbnormalOrder.table.refresh({query: queryData});
};
@@ -225,6 +226,7 @@
let userName = $('#userName').val();
let orderNum = $('#orderNum').val();
let driverId = $('#driverId').val();
+ let activityId = $('#activityId').val();
if(null != insertTime && '' != insertTime){
p += "insertTime=" + insertTime + "&";
}
@@ -242,6 +244,9 @@
}
if(null != driverId && '' != driverId){
p += "driverId=" + driverId + "&" ;
+ }
+ if(null != activityId && '' != activityId){
+ p += "activityId=" + activityId + "&" ;
}
if('' != p){
p = "?" + p.substring(0, p.length - 1);
@@ -265,7 +270,7 @@
$(function () {
var defaultColunms = TAbnormalOrder.initColumn();
- var table = new BSTable(TAbnormalOrder.id, "/promotionInfo/list?driverId="+$('#driverId').val(), defaultColunms);
+ var table = new BSTable(TAbnormalOrder.id, "/promotionInfo/list?driverId="+$('#driverId').val()+"&activityId="+$('#activityId').val(), defaultColunms);
table.setPaginationType("server");
TAbnormalOrder.table = table.init();
});
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
index 21ad3b2..37dcf1d 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PhoneServiceImpl.java
@@ -34,7 +34,7 @@
@Override
public List<Phone> queryPhones(String code) throws Exception {
OpenCity openCity = openCityService.openCity1(code);
- return phoneMapper.selectList(new EntityWrapper<Phone>().eq("openCityId", openCity));
+ return phoneMapper.selectList(new EntityWrapper<Phone>().eq("openCityId", openCity.getId()));
}
--
Gitblit v1.7.1