From d4f8078c2a062864dab885d6bd54fbe1195f85e2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 12 六月 2023 11:07:18 +0800
Subject: [PATCH] 修改计费bug
---
user/guns-admin/src/main/java/com/agentdriving/user/modular/system/service/impl/OrderServiceImpl.java | 258 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 177 insertions(+), 81 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/agentdriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/agentdriving/user/modular/system/service/impl/OrderServiceImpl.java
index 75abf86..ad3f375 100644
--- a/user/guns-admin/src/main/java/com/agentdriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/agentdriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -15,6 +15,8 @@
import com.agentdriving.user.modular.system.util.GaoDe.model.District;
import com.agentdriving.user.modular.system.util.juhe.WeatherUtil;
import com.agentdriving.user.modular.system.util.mongodb.model.Location;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -30,6 +32,7 @@
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -42,6 +45,8 @@
*/
@Service
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
+
+ Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
@Autowired
private ISystemConfigService systemConfigService;
@@ -126,7 +131,9 @@
.where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
city = null != weatherCity ? weatherCity.getId().toString() : "";
}
- Order order = getOrderPrice(1, d, 0, new Order(), city);
+ Order order1 = new Order();
+ order1.setCreateTime(new Date());
+ Order order = getOrderPrice(1, d, 0, order1, city);
Double estimatedPrice = order.getEstimatedPrice();
Coupon coupon = userToCouponService.queryCoupon(uid, estimatedPrice);
if(null != coupon){
@@ -192,7 +199,7 @@
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
JSONArray chargeStandard = jsonObject.getJSONArray("ChargeStandard");
JSONObject extraCost = jsonObject.getJSONObject("ExtraCost");
- Date date = new Date();
+ Date date = order.getCreateTime();
boolean b = true;
for (int i = 1; i < chargeStandard.size(); i++) {//各种时间段
@@ -207,18 +214,29 @@
Double num8 = jsonObject1.getDouble("num8");//超过num8每num10公里收取num11
String[] split = num1.split(":");
+ Integer hour1 = Integer.valueOf(split[0]);
+ String[] split1 = num2.split(":");
+ Integer hour2 = Integer.valueOf(split1[0]);
+
Calendar s = Calendar.getInstance();
s.setTime(date);
- s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
+ s.set(Calendar.HOUR_OF_DAY, hour1);
s.set(Calendar.MINUTE, Integer.valueOf(split[1]));
s.set(Calendar.SECOND, 0);
- split = num2.split(":");
Calendar e = Calendar.getInstance();
e.setTime(date);
- e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
- e.set(Calendar.MINUTE, Integer.valueOf(split[1]));
+ e.set(Calendar.HOUR_OF_DAY, hour2);
+ e.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
e.set(Calendar.SECOND, 0);
+
+ if(hour1 > hour2){
+ if(s.getTimeInMillis() > date.getTime()){
+ s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
+ }else{
+ e.set(Calendar.DAY_OF_YEAR, e.get(Calendar.DAY_OF_YEAR) + 1);
+ }
+ }
if(date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
b = false;
@@ -244,8 +262,8 @@
}
//计算长途里程超出的部分
if(distance.compareTo(num5) > 0){
- BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num5));
- BigDecimal divide1 = subtract1.divide(new BigDecimal(num7), new MathContext(2, RoundingMode.HALF_EVEN));
+ BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num5)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal divide1 = subtract1.divide(new BigDecimal(num7), 2, BigDecimal.ROUND_HALF_EVEN);
BigDecimal multiply1 = divide1.multiply(new BigDecimal(num8));
order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
@@ -284,8 +302,8 @@
}
//计算长途里程超出的部分
if(distance.compareTo(num5) > 0){
- BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num5));
- BigDecimal divide1 = subtract1.divide(new BigDecimal(num7), new MathContext(2, RoundingMode.HALF_EVEN));
+ BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num5)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal divide1 = subtract1.divide(new BigDecimal(num7), 2, BigDecimal.ROUND_HALF_EVEN);
BigDecimal multiply1 = divide1.multiply(new BigDecimal(num8));
order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
@@ -358,6 +376,42 @@
}
return order;
}
+
+
+ public static void main(String[] ages){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Integer hour1 = 22;
+ Integer hour2 = 06;
+
+ Date date = null;
+ try {
+ date = sdf.parse("2023-06-12 23:26:50");
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ Calendar s = Calendar.getInstance();
+ s.setTime(date);
+ s.set(Calendar.HOUR_OF_DAY, hour1);
+ s.set(Calendar.MINUTE, 0);
+ s.set(Calendar.SECOND, 0);
+ Calendar e = Calendar.getInstance();
+ e.setTime(date);
+ e.set(Calendar.HOUR_OF_DAY, hour2);
+ e.set(Calendar.MINUTE, 0);
+ e.set(Calendar.SECOND, 0);
+ if(hour1 > hour2){
+ if(s.getTimeInMillis() > date.getTime()){
+ s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
+ }else{
+ e.set(Calendar.DAY_OF_YEAR, e.get(Calendar.DAY_OF_YEAR) + 1);
+ }
+
+ }
+
+ System.err.println("开始时间：" + sdf.format(s.getTime()));
+ System.err.println("结束时间：" + sdf.format(e.getTime()));
+ }
+
@@ -530,12 +584,14 @@
Query query = Query.query(Criteria.where("location").withinSphere(circle));
List<Location> locations = mongoTemplate.find(query, Location.class);
List<Integer> driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
+ logger.warn("范围内司机--》" + JSON.toJSONString(driverIds));
Integer driver = null;
YouTuiDriver youTuiDriver1 = null;
if(driverIds.size() > 0){
List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds)
.eq("state", 2).last(" and (surplusQuantity > 0 or now() < endTime) and now() < failureTime"));
Double d = null;
+ logger.warn("优推司机--》" + JSON.toJSONString(youTuiDrivers));
for (YouTuiDriver youTuiDriver : youTuiDrivers) {
String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
if(ToolUtil.isEmpty(value)){
@@ -545,12 +601,17 @@
if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1){
continue;
}
+ DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId()).eq("status", 1));
+ if(null == driverWork){
+ continue;
+ }
Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
Double wgs84 = distance.get("WGS84");
if(d == null || d.compareTo(wgs84) > 0){
d = wgs84;
driver = youTuiDriver.getDriverId();
youTuiDriver1 = youTuiDriver;
+ logger.warn("最优优推司机--》" + JSON.toJSONString(driver));
}
}
}
@@ -575,9 +636,11 @@
locations = mongoTemplate.find(query, Location.class);
driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
+ logger.warn("范围内司机--》" + JSON.toJSONString(driverIds));
if(driverIds.size() > 0){
List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2)
.eq("serverStatus", 1).eq("openOrderQRCode", 0).eq("status", 1).in("id", driverIds));
+ logger.warn("范围内空闲司机--》" + JSON.toJSONString(drivers));
if(drivers.size() == 0){
continue;
}
@@ -588,6 +651,10 @@
for (Driver driver1 : drivers) {
String value = redisUtil.getValue("DRIVER" + driver1.getId());
if(ToolUtil.isEmpty(value)){
+ continue;
+ }
+ DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId()).eq("status", 1));
+ if(null == driverWork){
continue;
}
if(integral == null || integral.compareTo(driver1.getIntegral()) < 0){//积分大
@@ -624,7 +691,7 @@
}
}
}
-
+ logger.warn("最终的司机--》" + JSON.toJSONString(driver));
if(null != driver){
pushUtil.pushGrabOrder(driver, 2, order.getId(), num4);
//创建定时任务处理订单到大厅
@@ -635,12 +702,48 @@
if(order1.getState() == 101 || order1.getState() == 201){
order1.setHallOrder(1);
OrderServiceImpl.this.updateById(order1);
+ ExtraPushOrder(order1);
}
}
}, num4 * 1000);
}else{
order.setHallOrder(1);
this.updateById(order);
+ ExtraPushOrder(order);
+ }
+ }
+
+ public void ExtraPushOrder(Order order){
+ String startLat = order.getStartLat();
+ String startLng = order.getStartLng();
+
+ //找到中心点
+ GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLng), Double.valueOf(startLat));
+ Double num = 5D;//范围公里
+ //构造半径
+ Distance distanceR = new Distance(num, Metrics.KILOMETERS);
+ //画圆
+ Circle circle = new Circle(geoJsonPoint, distanceR);
+ // 构造query对象
+ Query query = Query.query(Criteria.where("location").withinSphere(circle));
+ List<Location> locations = mongoTemplate.find(query, Location.class);
+ List<Integer> driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
+ if(driverIds.size() == 0){
+ return;
+ }
+ List<DriverWork> tDriverWorks = driverWorkService.selectList(new EntityWrapper<DriverWork>().in("driverId", driverIds).eq("status", 1));
+ driverIds = tDriverWorks.stream().map(DriverWork::getDriverId).collect(Collectors.toList());
+ List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2)
+ .eq("serverStatus", 1).eq("openOrderQRCode", 0).eq("status", 1).in("id", driverIds));
+ if(drivers.size() == 0){
+ return;
+ }
+ for (Driver driver1 : drivers) {
+ String value = redisUtil.getValue("DRIVER" + driver1.getId());
+ if (ToolUtil.isEmpty(value)) {
+ return;
+ }
+ pushUtil.pushGrabOrderExtras(driver1.getId(), 2);
}
}
@@ -1295,7 +1398,7 @@
if(null != systemConfig){
//{"num1":"10:00","num2":"14:00","num3":10,"num4":10,"num5":10,"num6":10,"num7":10,"num8":10,"num9":5,"num10":5}
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
- Integer num5 = jsonObject.getInteger("num5");
+ Integer num6 = jsonObject.getInteger("num6");
//增加积分变动记录
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
@@ -1306,7 +1409,7 @@
accountChangeDetail.setOldData(driver.getIntegral().doubleValue());
accountChangeDetail.setType(2);
accountChangeDetail.setExplain("代驾5星好评");
- driver.setIntegral(driver.getIntegral() + num5);
+ driver.setIntegral(driver.getIntegral() + num6);
accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
accountChangeDetailService.insert(accountChangeDetail);
}
@@ -1345,9 +1448,35 @@
*/
public void saveCommission(Order order) throws Exception{
//司机收入和代理商抽成(先分佣，后抽成)
- //司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
Driver driver = driverService.selectById(order.getDriverId());
AppUser appUser = appUserService.selectById(order.getUserId());
+
+ //首单积分奖励
+ //司机推荐首单收入
+ List<Integer> state = Arrays.asList(108, 109);
+ int count = this.selectCount(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("status", 1).in("state", state));
+ if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && count == 1){
+ Driver driver1 = driverService.selectById(appUser.getInviterId());
+ SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
+ JSONObject jsonObject2 = JSON.parseObject(systemConfig1.getContent());
+ Integer num4 = jsonObject2.getInteger("num4");
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver1.getId());
+ accountChangeDetail.setType(2);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(driver1.getIntegral().doubleValue());
+ accountChangeDetail.setExplain("邀请用户首单积分奖励");
+ accountChangeDetail.setCreateTime(new Date());
+ driver1.setIntegral(driver1.getIntegral() + num4);
+ accountChangeDetail.setNewData(driver1.getIntegral().doubleValue());
+ accountChangeDetailService.insert(accountChangeDetail);
+ driverService.updateById(driver1);
+ }
+
+
Double payMoney = order.getPayMoney();
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
if(null != systemConfig){
@@ -1359,40 +1488,6 @@
SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
if(null != systemConfig1){
JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
- //司机推荐首单收入
- List<Integer> state = Arrays.asList(108, 109);
- int count = this.selectCount(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("status", 1).in("state", state));
- if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && count == 1){
- Double num1 = jsonObject1.getDouble("num1");
- num1 = (num3 >= num1 ? num1 : num3);
-
- if(num1 > 0){
- Driver driver1 = driverService.selectById(appUser.getInviterId());
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver1.getId());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
- accountChangeDetail.setExplain("订单分佣收入");
- accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num1);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
- driverService.updateById(driver1);
- accountChangeDetailService.saveData(accountChangeDetail);
-
- Revenue revenue = new Revenue();
- revenue.setType(2);
- revenue.setUserType(2);
- revenue.setUserId(driver1.getId());
- revenue.setOrderId(order.getId());
- revenue.setAmount(num1);
- revenue.setCreateTime(new Date());
- revenueService.insert(revenue);
- }
- num3 = (num3 >= num1 ? num3 - num1 : 0);
- }
//开始处理层级抽佣
if(null != driver & null != driver.getInviterType() && driver.getInviterType() == 2){
@@ -1401,17 +1496,17 @@
Driver driver2 = driverService.selectById(driver1.getInviterId());//二级司机
if(null != driver2 && null != driver2.getInviterType() && driver2.getInviterType() == 2){
Driver driver3 = driverService.selectById(driver2.getInviterId());//三级级司机
+ Double num4 = jsonObject1.getDouble("num4");
Double num5 = jsonObject1.getDouble("num5");
Double num6 = jsonObject1.getDouble("num6");
- Double num7 = jsonObject1.getDouble("num7");
- num5 = (num3 >= num5 ? num5 : num3);
- if(num5 > 0 && null != driver1){
+ num4 = (num3 >= num4 ? num4 : num3);
+ if(num4 > 0 && null != driver1){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver1.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num5);
+ revenue.setAmount(num4);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1424,20 +1519,20 @@
accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num5);
+ driver1.setCommission(driver1.getCommission() + num4);
accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num5 ? num3 - num5 : 0);
+ num3 = (num3 >= num4 ? num3 - num4 : 0);
}
- num6 = (num3 >= num6 ? num6 : num3);
- if(num6 > 0 && null != driver2){
+ num5 = (num3 >= num5 ? num5 : num3);
+ if(num5 > 0 && null != driver2){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver2.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num6);
+ revenue.setAmount(num5);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1450,20 +1545,20 @@
accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num6);
+ driver2.setCommission(driver2.getCommission() + num5);
accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num6 ? num3 - num6 : 0);
+ num3 = (num3 >= num5 ? num3 - num5 : 0);
}
- num7 = (num3 >= num7 ? num7 : num3);
- if(num7 > 0 && null != driver3){
+ num6 = (num3 >= num6 ? num6 : num3);
+ if(num6 > 0 && null != driver3){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver3.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num7);
+ revenue.setAmount(num6);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1476,23 +1571,23 @@
accountChangeDetail.setOldData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver3.setCommission(driver3.getCommission() + num7);
+ driver3.setCommission(driver3.getCommission() + num6);
accountChangeDetail.setNewData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
driverService.updateById(driver3);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num7 ? num3 - num7 : 0);
+ num3 = (num3 >= num6 ? num3 - num6 : 0);
}
}else{
+ Double num2_ = jsonObject1.getDouble("num2");
Double num3_ = jsonObject1.getDouble("num3");
- Double num4 = jsonObject1.getDouble("num4");
- num3_ = (num3 >= num3_ ? num3_ : num3);
- if(num3_ > 0 && null != driver1){
+ num2_ = (num3 >= num2_ ? num2_ : num3);
+ if(num2_ > 0 && null != driver1){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver1.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num3_);
+ revenue.setAmount(num2_);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1505,20 +1600,20 @@
accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num3_);
+ driver1.setCommission(driver1.getCommission() + num2_);
accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num3_ ? num3 - num3_ : 0);
+ num3 = (num3 >= num2_ ? num3 - num2_ : 0);
}
- num4 = (num3 >= num4 ? num4 : num3);
- if(num4 > 0 && null != driver2){
+ num3_ = (num3 >= num3_ ? num3_ : num3);
+ if(num3_ > 0 && null != driver2){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver2.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num4);
+ revenue.setAmount(num3_);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1531,23 +1626,23 @@
accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num4);
+ driver2.setCommission(driver2.getCommission() + num3_);
accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num4 ? num3 - num4 : 0);
+ num3 = (num3 >= num3_ ? num3 - num3_ : 0);
}
}
}else{
- Double num2_ = jsonObject1.getDouble("num2");
- num2_ = (num3 >= num2_ ? num2_ : num3);
- if(num2_ > 0 && null != driver1){
+ Double num1_ = jsonObject1.getDouble("num1");
+ num1_ = (num3 >= num1_ ? num1_ : num3);
+ if(num1_ > 0 && null != driver1){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver1.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num2_);
+ revenue.setAmount(num1_);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1560,11 +1655,11 @@
accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num2_);
+ driver1.setCommission(driver1.getCommission() + num1_);
accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num2_ ? num3 - num2_ : 0);
+ num3 = (num3 >= num1_ ? num3 - num1_ : 0);
}
}
}
@@ -1583,6 +1678,7 @@
}
}
//司机订单收入
+ driver = driverService.selectById(order.getDriverId());
Revenue revenue = new Revenue();
revenue.setType(1);
revenue.setUserType(2);
--
Gitblit v1.7.1