From b701b92c8af86026b2536c65ec9161037e88a8d9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 12 三月 2025 18:26:41 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 12 +-----
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml | 24 +++++++++++
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 12 +-----
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 35 +++++++++--------
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityHistoryMapper.java | 9 ++++
5 files changed, 54 insertions(+), 38 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 0985a8a..fb532b8 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
@@ -3649,11 +3649,7 @@
ChinaMobileUtil.midAxbUnBindSend(orderLogistics.getBindId(),orderLogistics.getTelX());
}
- if(5 == orderLogistics.getOldState()){
- orderLogistics.setState(6);
- }else{
- orderLogistics.setState(10);
- }
+ orderLogistics.setState(10);
orderLogistics.setTelX("");
orderLogistics.setBindId("");
this.updateById(orderLogistics);
@@ -3723,11 +3719,7 @@
if(orderLogistics.getBindId() != null){
ChinaMobileUtil.midAxbUnBindSend(orderLogistics.getBindId(),orderLogistics.getTelX());
}
- if(5 == orderLogistics.getOldState()){
- orderLogistics.setState(6);
- }else{
- orderLogistics.setState(10);
- }
+ orderLogistics.setState(10);
orderLogistics.setBindId("");
orderLogistics.setTelX("");
this.updateById(orderLogistics);
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 77dae76..9101d5e 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
@@ -1033,11 +1033,7 @@
ChinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
}
- if(5 == orderPrivateCar.getOldState()){
- orderPrivateCar.setState(6);
- }else{
- orderPrivateCar.setState(10);
- }
+ orderPrivateCar.setState(10);
orderPrivateCar.setTelX("");
orderPrivateCar.setBindId("");
this.updateById(orderPrivateCar);
@@ -2709,11 +2705,7 @@
if(null != query){
//添加交易明细
transactionDetailsService.saveData(orderPrivateCar.getUserId(), "取消订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
- if(5 == orderPrivateCar.getOldState()){
- orderPrivateCar.setState(6);
- }else{
- orderPrivateCar.setState(10);
- }
+ orderPrivateCar.setState(10);
//解除小号绑定
if(orderPrivateCar.getBindId() != null){
ChinaMobileUtil.midAxbUnBindSend(orderPrivateCar.getBindId(),orderPrivateCar.getTelX());
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityHistoryMapper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityHistoryMapper.java
index 1a0ff4c..2079fd0 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityHistoryMapper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityHistoryMapper.java
@@ -2,6 +2,15 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.DriverActivityHistory;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
public interface DriverActivityHistoryMapper extends BaseMapper<DriverActivityHistory> {
+
+
+ List<DriverActivityHistory> queryList(@Param("driverId") Integer driverId, @Param("type") Integer type,
+ @Param("carryOut") Integer carryOut, @Param("start") Date start,
+ @Param("end") Date end);
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml
index 74fc62e..9f43a79 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml
@@ -1,5 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.modular.system.dao.DriverActivityHistoryMapper">
-
+
+
+ <select id="queryList" resultType="DriverActivityHistory">
+ select
+ id as id,
+ `day` as `day`,
+ driverId as driverId,
+ `type` as `type`,
+ activityId as activityId,
+ carryOut as carryOut,
+ money as money,
+ insertTime as insertTime
+ from t_driver_activity_history where `day` between #{start} and #{end} and driverActivityId in (select id from t_driver_activity where status = 3 and now() between startTime and endTime)
+ <if test="null != type">
+ and `type` = #{type}
+ </if>
+ <if test="null != carryOut">
+ and carryOut = #{carryOut}
+ </if>
+ <if test="null != driverId">
+ and driverId = #{driverId}
+ </if>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index 19ee14a..5c9c59e 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -85,6 +85,9 @@
@Resource
private DriverMapper driverMapper;
+
+ @Autowired
+ private DateUtil dateUtil;
@Resource
private DriverActivityRegisteredMapper driverActivityRegisteredMapper;
@@ -305,14 +308,17 @@
if(null != uid){
if(type == 2){//司机分享
Driver driver = driverMapper.selectById(uid);
- List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
+ Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
+ //邀请用户注册
+ List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(uid, 2, 1, date.get("startTime"), date.get("endTime"));
BigDecimal bigDecimal = new BigDecimal("0");
- for(Map<String, Object> map : query){
- if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
- bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
- incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
- }
+ for (DriverActivityHistory driverActivityHistory : list) {
+ bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
+ incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
+ driverActivityHistory.setCarryOut(2);
+ driverActivityHistoryMapper.updateById(driverActivityHistory);
}
+
driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driver.setLaveActivityMoney(bigDecimal.add(new BigDecimal(driver.getLaveActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -655,18 +661,13 @@
if(null != uid){
if(type == 2){//司机分享
Driver driver = driverMapper.selectById(uid);
- List<Map<String, Object>> query = driverActivityRegisteredMapper.query(userType, driver.getCompanyId());
+ Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
+ //邀请用户注册
+ List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(uid, 2, 1, date.get("startTime"), date.get("endTime"));
BigDecimal bigDecimal = new BigDecimal("0");
- for(Map<String, Object> map : query){
- if(Double.valueOf(String.valueOf(map.get("money"))).compareTo(0D) > 0){
- bigDecimal = bigDecimal.add(new BigDecimal(String.valueOf(map.get("money"))));
- incomeService.saveData(2, driver.getId(), 1, Integer.valueOf(String.valueOf(map.get("id"))), null, Double.valueOf(String.valueOf(map.get("money"))));
- }
- DriverActivityHistory dah = new DriverActivityHistory();
- dah.setActivityId(Integer.valueOf(map.get("id").toString()));
- dah.setDriverId(uid);
- dah.setType(2);
- DriverActivityHistory driverActivityHistory = driverActivityHistoryMapper.selectOne(dah);
+ for (DriverActivityHistory driverActivityHistory : list) {
+ bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
+ incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
driverActivityHistory.setCarryOut(2);
driverActivityHistoryMapper.updateById(driverActivityHistory);
}
--
Gitblit v1.7.1