From 36695821ea10197d7758babc7bc2b5dfb66dd88e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 24 六月 2023 09:30:26 +0800
Subject: [PATCH] 修改bug
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java | 467 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 231 insertions(+), 236 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
index b6fa8fc..a87c1fc 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
@@ -34,7 +34,6 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.math.MathContext;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -110,8 +109,6 @@
@Value("${callbackPath}")
private String callbackPath;//支付回调网关地址
-
- private Map<String, Timer> timerMap = new HashMap<>();
@@ -197,13 +194,15 @@
city = null != weatherCity ? weatherCity.getId().toString() : "";
}
order.setCreateTime(new Date());
- order = getOrderPrice(1, d, 0D, order, city);
+ order = getOrderPrice(1, d, 0, order, city);
order.setState(null == order.getDriverId() ? 101 : 102);
order.setStatus(1);
this.insert(order);
driverService.updateById(driver);
//推送状态
if(null != order.getDriverId()){
+ //推动订单数据
+ redisUtil.addSetValue("orderService", order.getId().toString());
pushUtil.pushOrderStatus(uid, 2, order.getId(), order.getStatus());
}else{
//开始推单
@@ -211,7 +210,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushOrder(finalOrder);
+ pushOrder(finalOrder.getId());
}
}).start();
}
@@ -228,9 +227,7 @@
* @param city 查询天气的城市
* @return
*/
- public Order getOrderPrice(Integer type, Double distance, Double waitTime, Order order, String city){
- distance = new BigDecimal(distance).setScale(0, BigDecimal.ROUND_UP).doubleValue();
- waitTime = new BigDecimal(waitTime).setScale(0, BigDecimal.ROUND_UP).doubleValue();
+ public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city){
order = getOrderInitialPrice(order);
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5));
if(null == systemConfig){
@@ -290,12 +287,14 @@
order.setStartDistance(distance);//起步里程
order.setStartPrice(num4);//起步价
}else{
- BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num3)).setScale(2, BigDecimal.ROUND_HALF_EVEN);//超出起步里程
- BigDecimal divide = subtract.divide(new BigDecimal(num5), 2, BigDecimal.ROUND_HALF_EVEN);
- BigDecimal multiply = divide.multiply(new BigDecimal(num6));
+ Double distance1 = distance;//原始里程
order.setStartDistance(num3);//起步里程
order.setStartPrice(num4);//起步价
- order.setOverDriveDistance(subtract.doubleValue());//超出起步里程
+ order.setOverDriveDistance(new BigDecimal(distance1 - num3).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//超出起步里程
+
+ distance = new BigDecimal(distance).setScale(0, RoundingMode.UP).doubleValue();//向上取整
+ BigDecimal divide = new BigDecimal(distance - num3).divide(new BigDecimal(num5), 2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal multiply = divide.multiply(new BigDecimal(num6));
order.setOverDrivePrice(multiply.doubleValue());//超出起步里程费
//计算长途费（超出长途起始公里，费用开始按照长途规则计算。）
@@ -310,10 +309,10 @@
}
//计算长途里程超出的部分
if(distance.compareTo(num8) > 0){
- BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num8)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
- BigDecimal divide1 = subtract1.divide(new BigDecimal(num10), 2, BigDecimal.ROUND_HALF_EVEN);
+ order.setOverLongDistance(new BigDecimal(distance1 - num8).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//超出长途里程
+
+ BigDecimal divide1 = new BigDecimal(distance - num8).divide(new BigDecimal(num10), 2, BigDecimal.ROUND_HALF_EVEN);
BigDecimal multiply1 = divide1.multiply(new BigDecimal(num11));
- order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
}
}
@@ -322,9 +321,9 @@
}
//计算额外费用
- Double num1 = extraCost.getDouble("num1");//等待时长
+ Integer num1 = extraCost.getInteger("num1");//等待时长
Double num2 = extraCost.getDouble("num2");//等待费
- Double num3 = extraCost.getDouble("num3");//等待超出时长
+ Integer num3 = extraCost.getInteger("num3");//等待超出时长
Double num4 = extraCost.getDouble("num4");//等到超出时长费用单价 X/分钟
Double num5 = extraCost.getDouble("num5");//恶劣天气公里
Double num6 = extraCost.getDouble("num6");//恶劣天气费
@@ -333,12 +332,12 @@
Double num9 = extraCost.getDouble("num9");//恶劣天气最高收取金额
//等待费用
- if(waitTime.compareTo(num1) >= 0){
- order.setWaitTime(num1);//等待时长
+ if(waitTime.compareTo(num1 * 60) >= 0){
+ order.setWaitTime(num1 * 60);//等待时长
order.setWaitTimePrice(num2);//等待费用
- Double w = waitTime - num1 - num3;
- BigDecimal multiply = new BigDecimal(w).multiply(new BigDecimal(num4));
+ Integer w = waitTime - (num1 * 60);
+ BigDecimal multiply = new BigDecimal(w).divide(new BigDecimal(60), 0, RoundingMode.UP).multiply(new BigDecimal(num4));
order.setOutWaitTime(w);//等待时长超出分钟
order.setOutWaitTimePrice(multiply.doubleValue());//等待时长超出费用
}
@@ -410,7 +409,7 @@
order.setOverLongDistancePrice(0d);//超出长途里程费
// order.setWaitTime(0);//等待时长
order.setWaitTimePrice(0D);//等待费
- order.setOutWaitTime(0D);//超出等待时长
+ order.setOutWaitTime(0);//超出等待时长
order.setOutWaitTimePrice(0D);//超出等待时长费
order.setBadWeatherDistance(0D);//恶劣天气里程
order.setBadWeatherPrice(0D);//恶劣天气里程费
@@ -426,10 +425,10 @@
/**
* 订单推送逻辑
- * @param order
*/
- public void pushOrder(Order order){
+ public void pushOrder(Long orderId){
try {
+ Order order = this.selectById(orderId);
/**
* 1.先找最大推单范围内的优推司机 -》 距离最近
* 没有1 - 》
@@ -451,11 +450,10 @@
}
}
if(!lock){
- redisUtil.unlock();
order.setHallOrder(1);
this.updateById(order);
ExtraPushOrder(order);
- return;
+ redisUtil.unlock();
}
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
if(null == systemConfig){
@@ -484,14 +482,18 @@
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"));
+ .eq("state", 2).last(" and surplusQuantity > 0 and now() < endTime and now() < failureTime"));
Double d = null;
for (YouTuiDriver youTuiDriver : youTuiDrivers) {
String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
if(ToolUtil.isEmpty(value)){
continue;
}
- DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", youTuiDriver.getDriverId()).eq("status", 1));
+ Driver driver1 = driverService.selectById(youTuiDriver.getDriverId());
+ 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;
}
@@ -504,7 +506,6 @@
}
}
}
-
if(null != youTuiDriver1 && youTuiDriver1.getType() == 1){
youTuiDriver1.setSurplusQuantity(youTuiDriver1.getSurplusQuantity() - 1);
youTuiDriverService.updateById(youTuiDriver1);
@@ -527,13 +528,14 @@
driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
if(driverIds.size() > 0){
- List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2).eq("serverStatus", 1).eq("status", 1).in("id", driverIds));
+ 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){
continue;
}
- Integer integral = null;
- Double score = null;
+ Integer integral = null;//积分
+ Double score = null;//评分
Double d = null;
for (Driver driver1 : drivers) {
String value = redisUtil.getValue("DRIVER" + driver1.getId());
@@ -544,27 +546,32 @@
if(null == driverWork){
continue;
}
+
if(integral == null || integral.compareTo(driver1.getIntegral()) < 0){//积分大
integral = driver1.getIntegral();
score = driver1.getScore();
driver = driver1.getId();
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ d = wgs84;
continue;
}
if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) < 0){//积分相同对比评分
integral = driver1.getIntegral();
score = driver1.getScore();
driver = driver1.getId();
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ d = wgs84;
continue;
}
if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) == 0){//积分相同/评分相同对比距离
- String value1 = redisUtil.getValue("DRIVER" + driver1.getId());
- if(ToolUtil.isEmpty(value1)){
- continue;
- }
- Map<String, Double> distance = GeodesyUtil.getDistance(value1, order.getStartLng() + "," + order.getStartLat());
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
Double wgs84 = distance.get("WGS84");
- if(d == null || d.compareTo(wgs84) > 0){
+ if(d.compareTo(wgs84) > 0){
d = wgs84;
+ integral = driver1.getIntegral();
+ score = driver1.getScore();
driver = driver1.getId();
continue;
}
@@ -585,11 +592,16 @@
new Timer().schedule(new TimerTask() {
@Override
public void run() {
- driver1.setServerStatus(1);
- driverService.updateById(driver1);
-
Order order1 = OrderServiceImpl.this.selectById(order.getId());
- if(order1.getState() == 101 || order1.getState() == 201){
+ if(order1.getState() != 101 && order1.getState() != 201 && order1.getDriverId().compareTo(driver1.getId()) != 0){
+ driver1.setServerStatus(1);
+ driverService.updateById(driver1);
+ }
+
+ if(order1.getState() == 201 || (order1.getState() == 101 && null == order1.getDriverId())){
+ driver1.setServerStatus(1);
+ driverService.updateById(driver1);
+
order1.setHallOrder(1);
OrderServiceImpl.this.updateById(order1);
ExtraPushOrder(order);
@@ -603,8 +615,8 @@
}
redisUtil.unlock();
}catch (Exception e){
- redisUtil.unlock();
e.printStackTrace();
+ redisUtil.unlock();
}
}
@@ -796,20 +808,16 @@
driverService.updateById(driver);
if(state == 201){//转单的订单
//停止定时任务
- Timer timer = timerMap.get(order.getId().toString());
- if(null != timer){
- timer.cancel();
- timerMap.remove(order.getId().toString());
- }
- //原司机下班
+ redisUtil.delSetValue("orderService", order.getId().toString());
+ //原司机下班 TODO 2023-06-21 客户说取消此功能
Driver oldDriver = driverService.selectById(oldDriverId);
oldDriver.setServerStatus(1);
driverService.updateById(oldDriver);
- DriverWork driverWork1 = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", oldDriverId).eq("status", 1));
- driverWork1.setStatus(2);
- driverWork1.setOffWorkTime(new Date());
- driverWorkService.updateById(driverWork1);
+// DriverWork driverWork1 = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", oldDriverId).eq("status", 1));
+// driverWork1.setStatus(2);
+// driverWork1.setOffWorkTime(new Date());
+// driverWorkService.updateById(driverWork1);
//添加关系数据
OrderTransfer orderTransfer = orderTransferService.selectOne(new EntityWrapper<OrderTransfer>().eq("orderId", order.getId()).eq("status", 1).isNull("successTime"));
@@ -833,7 +841,7 @@
}
//推动订单数据
- pushOrderInfo(order.getId(), uid);//开始推送订单数据
+ redisUtil.addSetValue("orderService", order.getId().toString());
//发送系统消息
systemMessageService.addSystemMessage(uid, 2, "接单成功", "您已成功接到用户订单，请尽快联系客户！");
pushUtil.pushOrderStatus(order.getDriverId(), 2, order.getId(), order.getState());
@@ -850,6 +858,9 @@
}
+
+
+
/**
* 获取订单详情
* @param orderId
@@ -858,7 +869,18 @@
*/
@Override
public OrderInfoWarpper queryOrderInfo(Integer uid, Long orderId) throws Exception {
+ Order order = this.selectById(orderId);
OrderInfoWarpper orderInfoWarpper = this.baseMapper.queryOrderInfo(orderId);
+ Integer wait = Integer.valueOf(orderInfoWarpper.getWaitTime());
+ if(null != order.getStartWaitTime()){
+ wait += Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
+ }
+ Integer s = wait % 60;
+ int m = Double.valueOf(wait / 60).intValue();
+ orderInfoWarpper.setWaitTime((m < 10 ? ("0" + m) : m) + ":" + (s < 10 ? ("0" + s) : s));
+ Double actualMileage = orderInfoWarpper.getActualMileage();
+ orderInfoWarpper.setActualMileage(new BigDecimal(actualMileage / 1000).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+
if(orderInfoWarpper.getTravelTime() == null){
orderInfoWarpper.setTravelTime(0);
}
@@ -918,7 +940,7 @@
order.setStartTime(new Date());
}
//计算等待用户时长
- Double w = new BigDecimal(Double.valueOf(System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 60000).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ Integer w = new BigDecimal(Double.valueOf(System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
order.setWaitTime(order.getWaitTime() + w);
order.setStartWaitTime(null);
break;
@@ -937,13 +959,14 @@
.where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
city = null != weatherCity ? weatherCity.getId().toString() : "";
}
- order = getOrderPrice(2, Double.valueOf(order.getActualMileage() / 1000), order.getWaitTime(), order, city);
+ order = getOrderPrice(2, Double.valueOf(order.getActualMileage()) / 1000, order.getWaitTime(), order, city);
//修改司机状态和积分
Driver driver = driverService.selectById(order.getDriverId());
driver.setServerStatus(1);
driverService.updateById(driver);
saveIntegral(order);
+ redisUtil.delSetValue("orderService", order.getId().toString());
break;
case 401:
order.setStartWaitTime(new Date());
@@ -1022,55 +1045,45 @@
/**
* 定时任务推送订单数据
* @param orderId
- * @param uid
*/
- public void pushOrderInfo(Long orderId, Integer uid){
- Timer timer = new Timer();
- timer.schedule(new TimerTask() {
- @Override
- public void run() {
- String value = redisUtil.getValue("DRIVER" + uid);
- Order order = OrderServiceImpl.this.selectById(orderId);
- if(order.getState() == 106 || order.getState() == 301){
- Timer timer = timerMap.get(order.getId().toString());
- if(null != timer){
- timer.cancel();
- timerMap.remove(order.getId().toString());
- }
- }
+ @Override
+ public void pushOrderInfo(Long orderId){
+ Order order = this.selectById(orderId);
+ Integer driverId = order.getDriverId();
+ String value = redisUtil.getValue("DRIVER" + driverId);
+ if(order.getState() == 106 || order.getState() == 301){
+ redisUtil.delSetValue("orderService", orderId.toString());
+ return;
+ }
- PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
- pushOrderInfoWarpper.setId(orderId);
- if(ToolUtil.isNotEmpty(value)){
- String[] split = value.split(",");
- pushOrderInfoWarpper.setDriverLat(split[1]);
- pushOrderInfoWarpper.setDriverLng(split[0]);
- }
- Double w = 0D;
- if(null != order.getStartWaitTime()){
- w = Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 60000);
- }
- pushOrderInfoWarpper.setWaitTime(order.getWaitTime() + w);
- pushOrderInfoWarpper.setState(order.getState());
- pushOrderInfoWarpper.setActualMileage(Double.valueOf(order.getActualMileage() / 1000));
- pushOrderInfoWarpper.setTravelTime(0);
- if(null != order.getStartTime()){
- int travelTime = Double.valueOf((System.currentTimeMillis() - order.getStartTime().getTime()) / 60000).intValue();
- pushOrderInfoWarpper.setTravelTime(travelTime);
- }
- if(null != order.getUserId()){
- pushUtil.pushOrderInfo(order.getUserId(), 1, pushOrderInfoWarpper);
- }
- if(order.getState() == 301){//司机取消不推送给司机
- CancelOrder cancelOrder = cancelOrderService.selectOne(new EntityWrapper<CancelOrder>().eq("orderId", order.getId()).eq("status", 1));
- if(null != cancelOrder && cancelOrder.getUserType() == 2){
- return;
- }
- }
- pushUtil.pushOrderInfo(uid, 2, pushOrderInfoWarpper);
+ PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+ pushOrderInfoWarpper.setId(orderId);
+ if(ToolUtil.isNotEmpty(value)){
+ String[] split = value.split(",");
+ pushOrderInfoWarpper.setDriverLat(split[1]);
+ pushOrderInfoWarpper.setDriverLng(split[0]);
+ }
+ Integer w = 0;
+ if(null != order.getStartWaitTime()){
+ w = Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
+ }
+ Integer wait = order.getWaitTime() + w;
+ Integer s = wait % 60;
+ Integer m = wait / 60;
+ pushOrderInfoWarpper.setWaitTime((m < 10 ? ("0" + m) : m) + ":" + (s < 10 ? ("0" + s) : s));
+ pushOrderInfoWarpper.setState(order.getState());
+ pushOrderInfoWarpper.setActualMileage(new BigDecimal(order.getActualMileage()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue());
+ pushOrderInfoWarpper.setTravelTime("0");
+ if(null != order.getUserId()){
+ pushUtil.pushOrderInfo(order.getUserId(), 1, pushOrderInfoWarpper);
+ }
+ if(order.getState() == 301){//司机取消不推送给司机
+ CancelOrder cancelOrder = cancelOrderService.selectOne(new EntityWrapper<CancelOrder>().eq("orderId", order.getId()).eq("status", 1));
+ if(null != cancelOrder && cancelOrder.getUserType() == 2){
+ return;
}
- },0, 10000);
- timerMap.put(orderId.toString(), timer);
+ }
+ pushUtil.pushOrderInfo(driverId, 2, pushOrderInfoWarpper);
}
@@ -1108,7 +1121,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushOrder(finalOrder);
+ pushOrder(finalOrder.getId());
}
}).start();
return ResultUtil.success();
@@ -1142,7 +1155,7 @@
.where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
city = null != weatherCity ? weatherCity.getId().toString() : "";
}
- order = getOrderPrice(1, d, 0D, order, city);
+ order = getOrderPrice(1, d, 0, order, city);
this.updateById(order);
return ResultUtil.success();
}
@@ -1195,6 +1208,7 @@
order.setState(301);
this.updateById(order);
+ redisUtil.delSetValue("orderService", orderId.toString());
CancelOrder cancelOrder = new CancelOrder();
cancelOrder.setOrderId(orderId);
@@ -1210,7 +1224,9 @@
driverService.updateById(driver);
}
- pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getStatus());
+ if(null != order.getUserId()){
+ pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getStatus());
+ }
return ResultUtil.success();
}
@@ -1227,23 +1243,32 @@
Driver driver = driverService.selectById(uid);
Order order = this.selectById(orderId);
OrderPriceWarpper orderPriceWarpper = new OrderPriceWarpper();
- BeanUtils.copyProperties(order, orderPriceWarpper);
- orderPriceWarpper.setWaitTime(orderPriceWarpper.getWaitTime() + orderPriceWarpper.getOutWaitTime());
- orderPriceWarpper.setWaitTimePrice(orderPriceWarpper.getWaitTimePrice() + orderPriceWarpper.getOutWaitTimePrice());
- orderPriceWarpper.setLongDistance(0D);
- if(ToolUtil.isNotEmpty(order.getLongDistance())){
+ orderPriceWarpper.setStartTime(order.getArrivalTimeAtTheAppointmentPoint().getTime());
+ orderPriceWarpper.setEndTime(order.getGetoffTime().getTime());
+ orderPriceWarpper.setActualMileage(Double.valueOf(order.getActualMileage() / 1000));
+ if(null != order.getStartPrice() && 0 != order.getStartPrice()){
+ orderPriceWarpper.setStartPrice(order.getStartPrice());
+ orderPriceWarpper.setStartDistance(order.getStartDistance());
+ orderPriceWarpper.setOverDriveDistance(order.getOverDriveDistance());
+ orderPriceWarpper.setMileageFee(order.getOverDrivePrice());
+ }else{
String[] split = order.getLongDistance().split("-");
- Double longDistanc = Double.valueOf(split[1]) - Double.valueOf(split[0]) + orderPriceWarpper.getOverLongDistance();
- orderPriceWarpper.setLongDistance(longDistanc);
+ orderPriceWarpper.setStartPrice(order.getLongDistancePrice());
+ orderPriceWarpper.setStartDistance(Double.valueOf(split[1]));
+ orderPriceWarpper.setOverDriveDistance(order.getOverLongDistance());
+ orderPriceWarpper.setMileageFee(order.getOverLongDistancePrice());
}
- orderPriceWarpper.setLongDistancePrice(orderPriceWarpper.getLongDistancePrice() + orderPriceWarpper.getOverLongDistancePrice());
- orderPriceWarpper.setBadWeatherDistance(orderPriceWarpper.getBadWeatherDistance() + orderPriceWarpper.getOverBadWeatherDistance());
- orderPriceWarpper.setBadWeatherPrice(orderPriceWarpper.getBadWeatherPrice() + orderPriceWarpper.getOverBadWeatherPrice());
-
- orderPriceWarpper.setActualMileage(new BigDecimal(order.getActualMileage() / 1000).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPriceWarpper.setTravelTime(0);
- if(null != order.getGetoffTime()){
- orderPriceWarpper.setTravelTime(Double.valueOf((order.getGetoffTime().getTime() - order.getStartTime().getTime()) / 60000).intValue());
+ Integer waitTime = order.getWaitTime() + order.getOutWaitTime();
+ Integer s = waitTime % 60;
+ Integer m = waitTime / 60;
+ orderPriceWarpper.setWaitTime((m < 10 ? "0" + m : m) + ":" + (s < 10 ? "0" + s : s));
+ orderPriceWarpper.setWaitTimePrice(order.getWaitTimePrice() + order.getOutWaitTimePrice());
+ orderPriceWarpper.setDiscountAmount(order.getDiscountAmount());
+ orderPriceWarpper.setDiscountedPrice(order.getDiscountedPrice());
+ orderPriceWarpper.setBadWeatherPrice(order.getBadWeatherPrice());
+ orderPriceWarpper.setPayMoney(order.getPayMoney());
+ if(order.getState() < 107){
+ orderPriceWarpper.setPayMoney(order.getOrderMoney());
}
orderPriceWarpper.setWxCollectionCode(driver.getWxCollectionCode());
orderPriceWarpper.setZfbCollectionCode(driver.getZfbCollectionCode());
@@ -1263,15 +1288,9 @@
public ResultUtil setOrderStatus(Integer uid, Long orderId, Integer payType, Integer state) throws Exception {
List<Integer> s = Arrays.asList(107, 108);
if(!s.contains(state)){
- return ResultUtil.error("操作失败");
+ return ResultUtil.error("操作失败，请刷新订单");
}
Order order = this.selectById(orderId);
- if(state == 107 && order.getState() != 106){
- return ResultUtil.error("操作失败");
- }
- if(state == 108 && order.getState() != 107){
- return ResultUtil.error("操作失败");
- }
order.setState(state);
if(payType == 2 && state == 107){
@@ -1443,47 +1462,63 @@
Driver driver = driverService.selectById(order.getDriverId());
AppUser appUser = appUserService.selectById(order.getUserId());
- //司机推荐首单收入
- List<Integer> state = Arrays.asList(107, 108, 109);
- int count = this.selectCount(new EntityWrapper<Order>().eq("userId", order.getUserId()).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);
+ if(null != order.getUserId()){
+ //司机推荐首单收入
+ List<Integer> state = Arrays.asList(107, 108, 109);
+ int count = this.selectCount(new EntityWrapper<Order>().eq("userId", order.getUserId()).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){
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
Double num2 = jsonObject.getDouble("num2");
Double num3 = jsonObject.getDouble("num3");
if(order.getOrderMoney() >= num2){//订单金额大于num2才有抽佣金
- payMoney = payMoney - num3;
+ driver = driverService.selectById(order.getDriverId());
+ AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
+ accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail1.setUserType(2);
+ accountChangeDetail1.setUserId(driver.getId());
+ accountChangeDetail1.setType(1);
+ accountChangeDetail1.setChangeType(9);
+ accountChangeDetail1.setOrderId(order.getId());
+ accountChangeDetail1.setOldData(driver.getBalance() + driver.getBackgroundBalance());
+ accountChangeDetail1.setExplain("线下收款服务费支出");
+ accountChangeDetail1.setCreateTime(new Date());
+ driver.setBalance(driver.getBalance() - num3);
+ accountChangeDetail1.setNewData(driver.getBalance() + driver.getBackgroundBalance());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail1);
- //有分佣的情况，分佣的金额从司机充值金额中扣除转给平台，再由平台转账给各个分佣对象
+
+ //有分佣的情况，分佣的金额从司机充值金额中扣除转给分佣对象
SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
if(null != systemConfig1){
JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
//司机推荐用户收入
- if(null != appUser.getInviterType() && appUser.getInviterType() == 2){
+ if(null != appUser && null != appUser.getInviterType() && appUser.getInviterType() == 2){
Double num1 = jsonObject1.getDouble("num1");
num1 = (num3 >= num1 ? num1 : num3);
@@ -1514,19 +1549,19 @@
revenueService.insert(revenue);
Double num1_1 = num1;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num1_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num1_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num1_1, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num1_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(0d);
rechargeRecordService.updateById(rechargeRecord);
num1_1 -= surplusDividedAmount;
@@ -1576,19 +1611,19 @@
accountChangeDetailService.saveData(accountChangeDetail);
Double num5_1 = num5;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num5_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num5_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num5_1, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num5_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(0d);
rechargeRecordService.updateById(rechargeRecord);
num5_1 -= surplusDividedAmount;
@@ -1626,19 +1661,19 @@
accountChangeDetailService.saveData(accountChangeDetail);
Double num6_1 = num6;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num6_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), num6_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num6_1, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num6_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(0d);
rechargeRecordService.updateById(rechargeRecord);
num6_1 -= surplusDividedAmount;
@@ -1676,19 +1711,19 @@
accountChangeDetailService.saveData(accountChangeDetail);
Double num7_1 = num7;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num7_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver3.getMerchantNumber(), num7_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num7_1, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num7_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver3.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(0d);
rechargeRecordService.updateById(rechargeRecord);
num7_1 -= surplusDividedAmount;
@@ -1729,19 +1764,19 @@
accountChangeDetailService.saveData(accountChangeDetail);
Double num3_1 = num3_;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num3_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num3_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(0d);
rechargeRecordService.updateById(rechargeRecord);
num3_1 -= surplusDividedAmount;
@@ -1779,19 +1814,19 @@
accountChangeDetailService.saveData(accountChangeDetail);
Double num4_1 = num4;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num4_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), num4_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num4_1, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num4_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(0d);
rechargeRecordService.updateById(rechargeRecord);
num4_1 -= surplusDividedAmount;
@@ -1832,19 +1867,19 @@
accountChangeDetailService.saveData(accountChangeDetail);
Double num2_1 = num2_;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num2_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num2_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num2_1, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num2_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(0d);
rechargeRecordService.updateById(rechargeRecord);
num2_1 -= surplusDividedAmount;
@@ -1869,19 +1904,19 @@
revenueService.insert(revenue);
Agent agent = agentService.selectById(driver.getAgentId());
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num3) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), agent.getMerchantNumber(), num3, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), agent.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(zhaunzhang.getCode() == 10000){
+ ResultUtil fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(0d);
rechargeRecordService.updateById(rechargeRecord);
num3 -= surplusDividedAmount;
@@ -1890,47 +1925,6 @@
}
}
}
- }
- }
- }
- }
- //司机余额扣减抽佣金额，将金额先分账给平台
- if(order.getPayMoney().compareTo(payMoney) > 0){
- driver = driverService.selectById(order.getDriverId());
- Double m = order.getPayMoney() - payMoney;
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver.getId());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(9);
- accountChangeDetail.setOrderId(order.getId());
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance());
- accountChangeDetail.setExplain("线下收款服务费支出");
- accountChangeDetail.setCreateTime(new Date());
- driver.setBalance(driver.getBalance() - m);
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance());
- driverService.updateById(driver);
- accountChangeDetailService.saveData(accountChangeDetail);
-
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
- for (RechargeRecord rechargeRecord : rechargeRecords) {
- Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
- if(surplusDividedAmount.compareTo(m) >= 0){
- ResultUtil fengzhang = fengzhang(3, null, "553021440975", rechargeRecord.getId().longValue(), rechargeRecord.getOrderNumber(), m, 1);
- if(fengzhang.getCode() == 10000){
- rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - m);
- rechargeRecordService.updateById(rechargeRecord);
- }
- break;
- }else{
- ResultUtil fengzhang = fengzhang(3, null, "553021440975", rechargeRecord.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
- if(fengzhang.getCode() == 10000){
- rechargeRecord.setSurplusDividedAmount(0d);
- rechargeRecordService.updateById(rechargeRecord);
- m -= surplusDividedAmount;
- }else{
- break;
}
}
}
@@ -1944,11 +1938,12 @@
* @param amount
*/
@Override
- public ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, String merOrderId, Double amount, Integer sourceType){
+ public ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, Integer rechargeRecordId, String merOrderId, Double amount, Integer sourceType){
DivisionRecord divisionRecord = new DivisionRecord();
divisionRecord.setUserType(userType);
divisionRecord.setUserId(id);
divisionRecord.setOrderId(orderId);
+ divisionRecord.setRechargeRecordId(rechargeRecordId);
divisionRecord.setSourceType(sourceType);
divisionRecord.setAmount(amount);
divisionRecord.setMerchantNumber(merchantNumber);
--
Gitblit v1.7.1