From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java | 1427 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 1,059 insertions(+), 368 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 50e673a..60e3ef1 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
@@ -10,6 +10,8 @@
import com.supersavedriving.driver.modular.system.service.*;
import com.supersavedriving.driver.modular.system.util.*;
import com.supersavedriving.driver.modular.system.util.GaoDe.MapUtil;
+import com.supersavedriving.driver.modular.system.util.MallBook.model.*;
+import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
import com.supersavedriving.driver.modular.system.util.mongodb.model.Location;
import com.supersavedriving.driver.modular.system.warpper.*;
import com.supersavedriving.driver.core.util.ToolUtil;
@@ -19,8 +21,11 @@
import com.supersavedriving.driver.modular.system.warpper.AddOrderWarpper;
import com.supersavedriving.driver.modular.system.warpper.HallOrderList;
import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
+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;
import org.springframework.data.geo.Circle;
import org.springframework.data.geo.Distance;
import org.springframework.data.geo.Metrics;
@@ -31,7 +36,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;
@@ -44,6 +48,8 @@
*/
@Service
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
+
+ Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
@Autowired
private IDriverWorkService driverWorkService;
@@ -96,7 +102,20 @@
@Autowired
private IUserToCouponService userToCouponService;
- private Map<String, Timer> timerMap = new HashMap<>();
+ @Autowired
+ private IRechargeRecordService rechargeRecordService;
+
+ @Autowired
+ private IDivisionRecordService divisionRecordService;
+
+ @Autowired
+ private IAgentService agentService;
+
+ @Autowired
+ private IOrderPositionService orderPositionService;
+
+ @Value("${callbackPath}")
+ private String callbackPath;//支付回调网关地址
@@ -147,13 +166,26 @@
driver.setServerStatus(2);
order.setOrderTakingTime(new Date());
}
- order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3));
+ order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(5));
order.setSource(2);
AppUser appUser = appUserService.selectOne(new EntityWrapper<AppUser>().eq("phone", addOrderWarpper.getPhone()).eq("status", 1));
if(null != appUser){
order.setUserId(appUser.getId());
}
+
+
+ String startAddress = addOrderWarpper.getStartAddress();
+ startAddress = startAddress.replaceAll("& #40;", "(");
+ startAddress = startAddress.replaceAll("& #41;", ")");
+ addOrderWarpper.setStartAddress(startAddress);
+ if(ToolUtil.isNotEmpty(addOrderWarpper.getEndAddress())){
+ String endAddress = addOrderWarpper.getEndAddress();
+ endAddress = endAddress.replaceAll("& #40;", "(");
+ endAddress = endAddress.replaceAll("& #41;", ")");
+ addOrderWarpper.setEndAddress(endAddress);
+ }
+
order.setUserName(addOrderWarpper.getUserName());
order.setUserPhone(addOrderWarpper.getPhone());
order.setAgentId(driver.getAgentId());
@@ -181,14 +213,16 @@
.where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
city = null != weatherCity ? weatherCity.getId().toString() : "";
}
+ order.setCreateTime(new Date());
order = getOrderPrice(1, d, 0, order, city);
order.setState(null == order.getDriverId() ? 101 : 102);
order.setStatus(1);
- order.setCreateTime(new Date());
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{
//开始推单
@@ -196,7 +230,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushOrder(finalOrder);
+ pushOrder(finalOrder.getId());
}
}).start();
}
@@ -228,7 +262,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();
for (int i = 0; i < chargeStandard.size(); i++) {
JSONObject jsonObject1 = chargeStandard.getJSONObject(i);
String num1 = jsonObject1.getString("num1");
@@ -244,43 +278,61 @@
Double num11 = jsonObject1.getDouble("num11");//超过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()){
if(num3.compareTo(distance) >= 0){//起步里程内
order.setStartDistance(distance);//起步里程
order.setStartPrice(num4);//起步价
}else{
- BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num3));//超出起步里程
- BigDecimal divide = subtract.divide(new BigDecimal(num5), new MathContext(2, RoundingMode.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());//超出起步里程费
- //计算长途费
+ //计算长途费（超出长途起始公里，费用开始按照长途规则计算。）
if(distance.compareTo(num7) > 0){
+ order.setStartDistance(0D);//起步里程
+ order.setStartPrice(0D);//起步价
+ order.setOverDriveDistance(0D);//超出起步里程
+ order.setOverDrivePrice(0D);//超出起步里程费
+
order.setLongDistance(num7 + "-" + num8);//长途里程
order.setLongDistancePrice(num9);//长途费
}
//计算长途里程超出的部分
if(distance.compareTo(num8) > 0){
- BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num8));
- BigDecimal divide1 = subtract1.divide(new BigDecimal(num10), new MathContext(2, RoundingMode.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());//超出长途里程费
}
}
@@ -300,12 +352,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);//等待费用
- Integer w = waitTime - 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());//等待时长超出费用
}
@@ -316,6 +368,8 @@
JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
Integer num11 = jsonObject1.getInteger("num1");//开启恶劣天气计价
if(1 == num11){
+ boolean badWeather = WeatherUtil.isBadWeather(city);
+ if(badWeather){
order.setBadWeatherDistance(num5);//恶劣天气公里
order.setBadWeatherPrice(num6);//恶劣天气费
if(distance.compareTo(num7) > 0){
@@ -372,7 +426,7 @@
order.setLongDistancePrice(0D);//长途里程费
order.setOverLongDistance(0D);//超出长途里程
order.setOverLongDistancePrice(0d);//超出长途里程费
- order.setWaitTime(0);//等待时长
+// order.setWaitTime(0);//等待时长
order.setWaitTimePrice(0D);//等待费
order.setOutWaitTime(0);//超出等待时长
order.setOutWaitTimePrice(0D);//超出等待时长费
@@ -390,30 +444,217 @@
/**
* 订单推送逻辑
- * @param order
*/
- public void pushOrder(Order order){
- /**
- * 1.先找最大推单范围内的优推司机 -》 距离最近
- * 没有1 - 》
- * 2.按照后台推送配置在范围内查找合适司机
- * 合适司：积分 > 评分 > 距离
- * 3.司机没有接单直接将订单置入大厅
- */
- SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
- if(null == systemConfig){
- return;
+ public void pushOrder(Long orderId){
+ try {
+ Order order = this.selectById(orderId);
+ /**
+ * 1.先找最大推单范围内的优推司机 -》 距离最近
+ * 没有1 - 》
+ * 2.按照后台推送配置在范围内查找合适司机
+ * 合适司：积分 > 评分 > 距离
+ * 3.司机没有接单直接将订单置入大厅
+ */
+ boolean lock = redisUtil.lock(5);
+ if(!lock){
+ int num1 = 1;
+ while (num1 <= 10){
+ Thread.sleep(3000);//等待3秒
+ lock = redisUtil.lock(5);
+ if(lock){
+ break;
+ }else{
+ num1++;
+ }
+ }
+ }
+ if(!lock){
+ order.setHallOrder(1);
+ this.updateById(order);
+ ExtraPushOrder(order);
+ redisUtil.unlock();
+ }
+ SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
+ if(null == systemConfig){
+ redisUtil.unlock();
+ return;
+ }
+ JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+ Double num3 = jsonObject.getDouble("num3");//推单最大范围
+ Integer num4 = jsonObject.getInteger("num4");//接单时间
+ String startLat = order.getStartLat();
+ String startLng = order.getStartLng();
+
+ //1
+ //找到中心点
+ GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLng), Double.valueOf(startLat));
+ Double num = num3 / 1000;//范围公里
+ //构造半径
+ 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());
+ 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 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;
+ }
+ Driver driver1 = driverService.selectById(youTuiDriver.getDriverId());
+ int count = this.selectCount(new EntityWrapper<Order>().eq("driverId", youTuiDriver.getDriverId()).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201, 401)));
+ if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1 || count > 0){
+ 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;
+ }
+ }
+ }
+ if(null != youTuiDriver1 && youTuiDriver1.getType() == 1){
+ youTuiDriver1.setSurplusQuantity(youTuiDriver1.getSurplusQuantity() - 1);
+ youTuiDriverService.updateById(youTuiDriver1);
+ }
+
+ //开始范围查找
+ if(null == driver){
+ for (int i = 1; i < 4; i++) {
+ if(null != driver){
+ break;
+ }
+ num = jsonObject.getDouble("num" + i) / 1000;//范围公里
+ //构造半径
+ distanceR = new Distance(num, Metrics.KILOMETERS);
+ //画圆
+ circle = new Circle(geoJsonPoint, distanceR);
+ // 构造query对象
+ query = Query.query(Criteria.where("location").withinSphere(circle));
+ locations = mongoTemplate.find(query, Location.class);
+
+ 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("openOrderQRCode", 0).eq("status", 1).in("id", driverIds));
+ if(drivers.size() == 0){
+ continue;
+ }
+
+ Integer integral = null;//积分
+ Double score = null;//评分
+ Double d = null;
+ 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;
+ }
+ int count = this.selectCount(new EntityWrapper<Order>().eq("driverId", driver1.getId()).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201, 401)));
+ if(count > 0){
+ 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){//积分相同/评分相同对比距离
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ if(d.compareTo(wgs84) > 0){
+ d = wgs84;
+ integral = driver1.getIntegral();
+ score = driver1.getScore();
+ driver = driver1.getId();
+ continue;
+ }
+ }
+ }
+
+ }
+ }
+ }
+
+ if(null != driver){
+ //防止多笔订单推给一个司机
+ Driver driver1 = driverService.selectById(driver);
+ driver1.setServerStatus(2);
+ driverService.updateById(driver1);
+ pushUtil.pushGrabOrder(driver, 2, order.getId(), num4);
+ //创建定时任务处理订单到大厅
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ Order order1 = OrderServiceImpl.this.selectById(order.getId());
+ if(order1.getState() != 101 && order1.getState() != 201 && order1.getState() != 301 && order1.getDriverId().compareTo(driver1.getId()) != 0){
+ driver1.setServerStatus(1);
+ driverService.updateById(driver1);
+ }
+
+ if(order1.getState() == 201 || order1.getState() == 301 || (order1.getState() == 101 && null == order1.getDriverId())){
+ driver1.setServerStatus(1);
+ driverService.updateById(driver1);
+ }
+ if(order1.getState() == 201 || (order1.getState() == 101 && null == order1.getDriverId())){
+ order1.setHallOrder(1);
+ OrderServiceImpl.this.updateById(order1);
+ ExtraPushOrder(order);
+ }
+
+
+ }
+ }, num4 * 1000);
+ }else{
+ order.setHallOrder(1);
+ this.updateById(order);
+ ExtraPushOrder(order);
+ }
+ redisUtil.unlock();
+ }catch (Exception e){
+ e.printStackTrace();
+ redisUtil.unlock();
}
- JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
- Double num3 = jsonObject.getDouble("num3");//推单最大范围
- Integer num4 = jsonObject.getInteger("num4");//接单时间
+ }
+
+
+
+ public void ExtraPushOrder(Order order){
String startLat = order.getStartLat();
String startLng = order.getStartLng();
- //1
//找到中心点
GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLng), Double.valueOf(startLat));
- Double num = num3 / 1000;//范围公里
+ Double num = 5D;//范围公里
//构造半径
Distance distanceR = new Distance(num, Metrics.KILOMETERS);
//画圆
@@ -422,107 +663,26 @@
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());
- 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;
- for (YouTuiDriver youTuiDriver : youTuiDrivers) {
- String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
- if(ToolUtil.isEmpty(value)){
- 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;
- }
+ 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)) {
+ continue;
}
- }
-
- if(null != youTuiDriver1 && youTuiDriver1.getType() == 1){
- youTuiDriver1.setSurplusQuantity(youTuiDriver1.getSurplusQuantity() - 1);
- youTuiDriverService.updateById(youTuiDriver1);
- }
-
- //开始范围查找
- if(null == driver){
- for (int i = 1; i < 4; i++) {
- if(null != driver){
- break;
- }
- num = jsonObject.getDouble("num" + i) / 1000;//范围公里
- //构造半径
- distanceR = new Distance(num, Metrics.KILOMETERS);
- //画圆
- circle = new Circle(geoJsonPoint, distanceR);
- // 构造query对象
- query = Query.query(Criteria.where("location").withinSphere(circle));
- locations = mongoTemplate.find(query, Location.class);
-
- 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));
- if(drivers.size() == 0){
- continue;
- }
-
- Integer integral = null;
- Double score = null;
- Double d = null;
- for (Driver driver1 : drivers) {
- if(integral == null || integral.compareTo(driver1.getIntegral()) < 0){//积分大
- integral = driver1.getIntegral();
- score = driver1.getScore();
- driver = driver1.getId();
- continue;
- }
- if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) < 0){//积分相同对比评分
- integral = driver1.getIntegral();
- score = driver1.getScore();
- driver = driver1.getId();
- continue;
- }
- if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) == 0){//积分相同/评分相同对比距离
- String value = redisUtil.getValue("DRIVER" + driver1.getId());
- if(ToolUtil.isEmpty(value)){
- 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 = driver1.getId();
- continue;
- }
- }
- }
-
- }
- }
- }
-
- if(null != driver){
- pushUtil.pushGrabOrder(driver, 2, order.getId(), num4);
- //创建定时任务处理订单到大厅
- new Timer().schedule(new TimerTask() {
- @Override
- public void run() {
- Order order1 = OrderServiceImpl.this.selectById(order.getId());
- if(order1.getState() == 101 || order1.getState() == 201){
- order1.setHallOrder(1);
- OrderServiceImpl.this.updateById(order1);
- }
- }
- }, num4 * 1000);
- }else{
- order.setHallOrder(1);
- this.updateById(order);
+ pushUtil.pushGrabOrderExtras(driver1.getId(), 2);
}
}
+
+
@@ -539,6 +699,7 @@
pageNum = (pageNum - 1) * pageSize;
String value = redisUtil.getValue("DRIVER" + uid);
List<HallOrderList> hallOrderLists = this.baseMapper.queryOrderHall(pageNum, pageSize);
+ List<HallOrderList> lists = new ArrayList<>();
hallOrderLists.forEach(hallOrderList -> {
if(ToolUtil.isEmpty(hallOrderList.getAvatar())){
hallOrderList.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
@@ -548,11 +709,17 @@
Map<String, Double> distance = GeodesyUtil.getDistance(hallOrderList.getStartLng() + "," + hallOrderList.getStartLat(), value);
Double wgs84 = distance.get("WGS84");
hallOrderList.setCurrentDistance(wgs84);
+
+ if(wgs84 > 5000){
+ return;
+ }
}else{
hallOrderList.setCurrentDistance(0D);
+ return;
}
+ lists.add(hallOrderList);
});
- return hallOrderLists;
+ return lists;
}
@@ -580,6 +747,9 @@
orderRefusalService.insert(orderRefusal);
Driver driver = driverService.selectById(uid);
+ driver.setServerStatus(1);
+ driverService.updateById(driver);
+
//扣除积分
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
if(null != systemConfig) {
@@ -588,7 +758,7 @@
Integer num10 = JSON.parseObject(systemConfig.getContent()).getInteger("num10");
if (num10 > 0) {
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(uid);
accountChangeDetail.setType(2);
@@ -625,7 +795,19 @@
if(count > 0){
return ResultUtil.error("还有未完成的订单");
}
- boolean lock = redisUtil.lock();
+ boolean lock = redisUtil.lock(5);
+ if(!lock){
+ int num1 = 1;
+ while (num1 <= 10){
+ Thread.sleep(3000);//等待3秒
+ lock = redisUtil.lock(5);
+ if(lock){
+ break;
+ }else{
+ num1++;
+ }
+ }
+ }
if(!lock){
return ResultUtil.error("请重试");
}
@@ -659,20 +841,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"));
@@ -696,7 +874,7 @@
}
//推动订单数据
- pushOrderInfo(order.getId(), uid);//开始推送订单数据
+ redisUtil.addSetValue("orderService", order.getId().toString());
//发送系统消息
systemMessageService.addSystemMessage(uid, 2, "接单成功", "您已成功接到用户订单，请尽快联系客户！");
pushUtil.pushOrderStatus(order.getDriverId(), 2, order.getId(), order.getState());
@@ -713,6 +891,9 @@
}
+
+
+
/**
* 获取订单详情
* @param orderId
@@ -721,7 +902,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);
}
@@ -781,13 +973,20 @@
order.setStartTime(new Date());
}
//计算等待用户时长
- Integer w = Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 60000).intValue();
+ Integer w = new BigDecimal(Double.valueOf(System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
order.setWaitTime(order.getWaitTime() + w);
order.setStartWaitTime(null);
+ orderPositionService.initMap(order.getId());
break;
case 106:
order.setGetoffTime(new Date());
if(ToolUtil.isEmpty(order.getEndAddress())){
+
+ String endAddress = processOperationsWarpper.getEndAddress();
+ endAddress = endAddress.replaceAll("& #40;", "(");
+ endAddress = endAddress.replaceAll("& #41;", ")");
+ processOperationsWarpper.setEndAddress(endAddress);
+
order.setEndAddress(processOperationsWarpper.getEndAddress());
order.setEndLng(processOperationsWarpper.getEndLng());
order.setEndLat(processOperationsWarpper.getEndLat());
@@ -800,13 +999,25 @@
.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);
+ Coupon coupon = userToCouponService.queryCoupon(order.getUserId(), order.getOrderMoney());
+ if(null != coupon){
+ order.setCouponId(coupon.getId());
+ order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
+ order.setPayMoney(order.getOrderMoney() - coupon.getCouponPreferentialAmount());
+ UserToCoupon userToCoupon = userToCouponService.selectById(coupon.getId());
+ userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
+ userToCouponService.updateById(userToCoupon);
+ }else{
+ order.setPayMoney(order.getOrderMoney());
+ }
//修改司机状态和积分
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());
@@ -823,6 +1034,9 @@
}
+
+
+
/**
* 添加订单积分奖励
* @param order
@@ -837,10 +1051,12 @@
Integer num5 = JSON.parseObject(systemConfig.getContent()).getInteger("num5");
if(num5 > 0){
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setType(2);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOrderId(order.getId());
accountChangeDetail.setOldData(driver.getIntegral().doubleValue());
driver.setIntegral(driver.getIntegral() + num5);
accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
@@ -848,52 +1064,30 @@
accountChangeDetailService.saveData(accountChangeDetail);
}
//恶劣天气完成订单奖励
- Integer num8 = JSON.parseObject(systemConfig.getContent()).getInteger("num8");
- if(num8 > 0){
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(order.getDriverId());
- accountChangeDetail.setType(2);
- accountChangeDetail.setOldData(driver.getIntegral().doubleValue());
- driver.setIntegral(driver.getIntegral() + num8);
- accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
- accountChangeDetail.setExplain("恶劣天气完成订单奖励");
- accountChangeDetailService.saveData(accountChangeDetail);
+ String city = "";
+ District geocode = MapUtil.geocode(order.getEndLng(), order.getEndLat());
+ if(null != geocode){
+ WeatherCity weatherCity = weatherCityService.selectOne(new EntityWrapper<WeatherCity>()
+ .where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
+ city = null != weatherCity ? weatherCity.getId().toString() : "";
+ }
+ boolean badWeather = WeatherUtil.isBadWeather(city);
+ if(badWeather){
+ Integer num8 = JSON.parseObject(systemConfig.getContent()).getInteger("num8");
+ if(num8 > 0){
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(order.getDriverId());
+ accountChangeDetail.setType(2);
+ accountChangeDetail.setOldData(driver.getIntegral().doubleValue());
+ driver.setIntegral(driver.getIntegral() + num8);
+ accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
+ accountChangeDetail.setExplain("恶劣天气完成订单奖励");
+ accountChangeDetailService.saveData(accountChangeDetail);
+ }
}
driverService.updateById(driver);
-
- if(null == order.getUserId()){
- return;
- }
- //推荐用户首单完成奖励
- Integer num4 = JSON.parseObject(systemConfig.getContent()).getInteger("num4");
- if(num4 > 0){
- List<Integer> state = Arrays.asList(105);
- int count = this.selectCount(new EntityWrapper<Order>().eq("userId", order.getUserId()).eq("status", 1).in("state", state));
- if(count > 1){
- return;
- }
- AppUser appUser = appUserService.selectById(order.getUserId());
- if(null != appUser && null != appUser.getInviterType()){
- if(appUser.getInviterType() == 1){
- return;
- }
- 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(2);
- accountChangeDetail.setOldData(driver1.getIntegral().doubleValue());
- driver1.setIntegral(driver1.getIntegral() + num4);
- accountChangeDetail.setNewData(driver1.getIntegral().doubleValue());
- accountChangeDetail.setExplain("推荐用户完成首单奖励");
- accountChangeDetailService.saveData(accountChangeDetail);
- driverService.updateById(driver1);
- }
- }
-
}
}
@@ -902,55 +1096,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]);
- }
- int w = 0;
- if(null != order.getStartWaitTime()){
- w = Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 60000).intValue();
- }
- 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);
}
@@ -963,7 +1147,7 @@
* @throws Exception
*/
@Override
- public ResultUtil transferOrder(Integer uid, Long orderId, String cause,String phone) throws Exception {
+ public ResultUtil transferOrder(Integer uid, Long orderId, String cause) throws Exception {
// 7.13改动
OrderTransfer orderTransfer = new OrderTransfer();
Order order = this.selectById(orderId);
@@ -1025,6 +1209,12 @@
@Override
public ResultUtil setOrderEndAddress(Integer uid, OrderEndAddressWarpper orderEndAddressWarpper) throws Exception {
Order order = this.selectById(orderEndAddressWarpper.getOrderId());
+
+ String endAddress = orderEndAddressWarpper.getEndAddress();
+ endAddress = endAddress.replaceAll("& #40;", "(");
+ endAddress = endAddress.replaceAll("& #41;", ")");
+ orderEndAddressWarpper.setEndAddress(endAddress);
+
order.setEndLat(orderEndAddressWarpper.getEndLat());
order.setEndLng(orderEndAddressWarpper.getEndLng());
order.setEndAddress(orderEndAddressWarpper.getEndAddress());
@@ -1095,6 +1285,7 @@
order.setState(301);
this.updateById(order);
+ redisUtil.delSetValue("orderService", orderId.toString());
CancelOrder cancelOrder = new CancelOrder();
cancelOrder.setOrderId(orderId);
@@ -1110,7 +1301,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();
}
@@ -1127,23 +1320,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() < 106){
+ orderPriceWarpper.setPayMoney(order.getOrderMoney());
}
orderPriceWarpper.setWxCollectionCode(driver.getWxCollectionCode());
orderPriceWarpper.setZfbCollectionCode(driver.getZfbCollectionCode());
@@ -1161,72 +1363,164 @@
*/
@Override
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("操作失败");
- }
- Order order = this.selectById(orderId);
- order.setState(state);
-
- if(payType == 2 && state == 107){
- order.setPayType(3);
- Coupon coupon = userToCouponService.queryCoupon(order.getUserId(), order.getOrderMoney());
- if(null != coupon){
- order.setCouponId(coupon.getId());
- order.setDiscountAmount(coupon.getCouponPreferentialAmount());
- order.setPayMoney(order.getOrderMoney() - coupon.getCouponPreferentialAmount());
+ try {
+ boolean lock = redisUtil.lock(orderId + "",5);
+ if(!lock){
+ int num1 = 1;
+ while (num1 <= 10){
+ Thread.sleep(3000);//等待3秒
+ lock = redisUtil.lock(orderId + "",5);
+ if(lock){
+ break;
+ }else{
+ num1++;
+ }
+ }
}
- }
+ if(!lock){
+ redisUtil.unlock(orderId + "");
+ return ResultUtil.error("请稍后重试");
+ }
- if(payType == 2 && state == 108){
- order.setPayTime(new Date());
- if(null != order.getCouponId()){
- UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
- if(userToCoupon.getValidCount() > 0){
- userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
- userToCouponService.updateById(userToCoupon);
+ Order order = this.selectById(orderId);
+ if(state == 107 && order.getState() != 106){
+ redisUtil.unlock(orderId + "");
+ return ResultUtil.error("操作失败，请刷新数据");
+ }
+ if(state == 108 && order.getState() != 107){
+ redisUtil.unlock(orderId + "");
+ return ResultUtil.error("操作失败，请刷新数据");
+ }
+
+ order.setState(state);
+
+ if(payType == 2 && state == 107){
+ order.setPayType(3);
+ }
+
+ if(payType == 2 && state == 108){
+ order.setPayTime(new Date());
+ if(null != order.getCouponId()){
+ UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
- order.setPayMoney(order.getPayMoney() - coupon.getCouponPreferentialAmount());
- order.setCouponId(coupon.getId());
- order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
Driver driver = driverService.selectById(order.getDriverId());
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setCreateTime(new Date());
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(7);
accountChangeDetail.setOrderId(order.getId());
accountChangeDetail.setExplain("优惠券收入");
- driver.setCouponBalance(driver.getCouponBalance() + coupon.getCouponPreferentialAmount());
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(coupon.getCouponPreferentialAmount())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver);
accountChangeDetailService.insert(accountChangeDetail);
+
+ //补贴中分账
+ Double discountedPrice = order.getDiscountedPrice();
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(discountedPrice) >= 0){
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice = new BigDecimal(discountedPrice).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
}
}
- }
- this.updateById(order);
+ this.updateById(order);
- if(state == 108){//计算抽成
- saveRevenue(order);
- }
+ if(payType == 2 && state == 108){//计算抽成
+ saveRevenue(order);
+ }
- PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
- pushOrderInfoWarpper.setId(order.getId());
- pushOrderInfoWarpper.setState(order.getState());
- pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
- if(null != order.getUserId()){
- pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
+ PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+ pushOrderInfoWarpper.setId(order.getId());
+ pushOrderInfoWarpper.setState(order.getState());
+ pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
+ if(null != order.getUserId()){
+ pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
+ }
+
+ if(payType == 2 && state == 107){
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ try {
+ OrderServiceImpl.this.setOrderStatus(uid, orderId, payType, 108);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }, 60000);
+ }
+ redisUtil.unlock(orderId + "");
+ return ResultUtil.success();
+ }catch (Exception e){
+ redisUtil.unlock(orderId + "");
+ e.printStackTrace();
+ return ResultUtil.error("系统异常");
}
- return ResultUtil.success();
+ }
+
+
+
+ /**
+ * 转账
+ * @param id
+ * @param merOrderId
+ * @param toUserId
+ * @param amount
+ * @param notifyUrl
+ * @return
+ */
+ public ResultUtil<Double> zhaunzhang(Integer id, String merOrderId, String toUserId, Double amount, String notifyUrl){
+ Transfer transfer = new Transfer();
+ transfer.setDepositMerOrderId(merOrderId);
+ transfer.setToUserId(toUserId);
+ transfer.setAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ transfer.setOrderName("补贴");
+ transfer.setNotifyUrl(notifyUrl);
+ transfer.setParameter1(id.toString());
+ TrhRequest<Transfer> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(transfer, Transfer.SERVICE_CODE);
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ String status = jsonObject.getString("status");//0：待处理；1：成功；2：失败
+ if("2" == status){
+ System.err.println("转账失败");
+ return ResultUtil.error("转账失败");
+ }
+ Double remainAmount = Double.valueOf(jsonObject.getInteger("remainAmount")) / 100;
+ return ResultUtil.success(remainAmount);
+ }else{
+ System.err.println("转账失败：" + execute.getMsg());
+ return ResultUtil.error(execute.getMsg());
+ }
}
/**
- * 计算抽成和分佣
+ * 计算线下收款的抽成和分佣
* @param order
*/
public void saveRevenue(Order order) throws Exception{
@@ -1234,41 +1528,83 @@
//司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
Driver driver = driverService.selectById(order.getDriverId());
AppUser appUser = appUserService.selectById(order.getUserId());
- Double payMoney = order.getPayMoney();
+
+ 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(5));
+ 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);
+ }
+ }
+
+
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
- Double n = 0D;
if(null != systemConfig){
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
Double num2 = jsonObject.getDouble("num2");
Double num3 = jsonObject.getDouble("num3");
- n = num3;
- if(order.getPayMoney() >= num2){
- payMoney = payMoney - num3;//司机收入
+ if(order.getOrderMoney() >= num2){//订单金额大于num2才有抽佣金
+ driver = driverService.selectById(order.getDriverId());
+ AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
+ accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail1.setUserType(2);
+ accountChangeDetail1.setUserId(driver.getId());
+ accountChangeDetail1.setType(1);
+ accountChangeDetail1.setChangeType(9);
+ accountChangeDetail1.setOrderId(order.getId());
+ accountChangeDetail1.setOldData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail1.setExplain("订单信息费");
+ accountChangeDetail1.setCreateTime(new Date());
+ driver.setBalance(new BigDecimal(driver.getBalance()).subtract(new BigDecimal(num3)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail1.setNewData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ 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());
- //司机推荐首单收入
- 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){
+ //司机推荐用户收入
+ if(null != appUser && null != appUser.getInviterType() && appUser.getInviterType() == 2){
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.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
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.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setExplain("邀请用户奖励");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num1);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
- driverService.updateById(driver1);
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetailService.saveData(accountChangeDetail);
+ driverService.updateById(driver1);
Revenue revenue = new Revenue();
revenue.setType(2);
@@ -1278,12 +1614,37 @@
revenue.setAmount(num1);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
+
+ Double num1_1 = num1;
+ 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 fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num1_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num1_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ 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 = new BigDecimal(num1_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+
}
- num3 = (num3 >= num1 ? num3 - num1 : 0);
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num1 ? v : 0);
}
//开始处理层级抽佣
- if(null != driver.getInviterType() && driver.getInviterType() == 2){
+ if(num3 > 0 && null != driver.getInviterType() && driver.getInviterType() == 2){
Driver driver1 = driverService.selectById(driver.getInviterId());//一级司机
if(null != driver1 && null != driver1.getInviterType() && driver1.getInviterType() == 2){
Driver driver2 = driverService.selectById(driver1.getInviterId());//二级司机
@@ -1304,19 +1665,43 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num5);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num5)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num5 ? num3 - num5 : 0);
+
+ Double num5_1 = num5;
+ 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 fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num5_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num5_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ 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 = new BigDecimal(num5_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num5)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num5 ? v : 0);
}
num6 = (num3 >= num6 ? num6 : num3);
if(num6 > 0){
@@ -1330,19 +1715,43 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver2.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num6);
- accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
+ driver2.setCommission(new BigDecimal(driver2.getCommission()).add(new BigDecimal(num6)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num6 ? num3 - num6 : 0);
+
+ Double num6_1 = num6;
+ 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 fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num6_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num6_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ 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 = new BigDecimal(num6_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num6)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num6 ? v : 0);
}
num7 = (num3 >= num7 ? num7 : num3);
if(num7 > 0){
@@ -1356,19 +1765,43 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver3.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver3.getCouponBalance()).add(new BigDecimal(driver3.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver3.setCommission(driver3.getCommission() + num7);
- accountChangeDetail.setNewData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
+ driver3.setCommission(new BigDecimal(driver3.getCommission()).add(new BigDecimal(num7)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver3.getCouponBalance()).add(new BigDecimal(driver3.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver3);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num7 ? num3 - num7 : 0);
+
+ Double num7_1 = num7;
+ 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 fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num7_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num7_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ 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 = new BigDecimal(num7_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num7)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num7 ? v : 0);
}
}else{
Double num3_ = jsonObject1.getDouble("num3");
@@ -1385,19 +1818,43 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num3_);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num3_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num3_ ? num3 - num3_ : 0);
+
+ Double num3_1 = num3_;
+ 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 fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ 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 = new BigDecimal(num3_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num3_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num3_ ? v : 0);
}
num4 = (num3 >= num4 ? num4 : num3);
if(num4 > 0){
@@ -1411,19 +1868,43 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver2.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num4);
- accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
+ driver2.setCommission(new BigDecimal(driver2.getCommission()).add(new BigDecimal(num4)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num4 ? num3 - num4 : 0);
+
+ Double num4_1 = num4;
+ 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 fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num4_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num4_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ 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 = new BigDecimal(num4_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num4)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num4 ? v : 0);
}
}
}else{
@@ -1440,19 +1921,43 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num2_);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num2_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num2_ ? num3 - num2_ : 0);
+
+ Double num2_1 = num2_;
+ 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 fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num2_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num2_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ 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 = new BigDecimal(num2_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num2_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num2_ ? v : 0);
}
}
}
@@ -1466,28 +1971,129 @@
revenue.setAmount(num3);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
+
+ Agent agent = agentService.selectById(driver.getAgentId());
+ 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 fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ 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 = new BigDecimal(num3).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
}
}
}
}
- //司机余额扣减抽佣金额
- if(n > 0){
- 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() + driver.getCouponBalance() + driver.getCommission());
- accountChangeDetail.setExplain("线下收款服务费支出");
- accountChangeDetail.setCreateTime(new Date());
- driver.setBalance(driver.getBalance() - n);
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- driverService.updateById(driver);
- accountChangeDetailService.saveData(accountChangeDetail);
+ }
+
+
+
+ /**
+ * 分账操作
+ * @param amount
+ */
+ @Override
+ 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);
+ divisionRecord.setState(1);
+ divisionRecord.setCreateTime(new Date());
+ divisionRecordService.insert(divisionRecord);
+
+ Complete complete = new Complete();
+ complete.setOriginalMerOrderId(merOrderId);
+ complete.setNotifyUrl(callbackPath + "/base/order/ledgerCallback");
+ complete.setParameter1(divisionRecord.getId().toString());
+ //分账方列表
+ List<PamentOrderUser> splitList = new ArrayList<>();
+ PamentOrderUser pamentOrderUser = new PamentOrderUser();
+ pamentOrderUser.setSplitUserId(merchantNumber);
+ pamentOrderUser.setSplitAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ pamentOrderUser.setSplitType("1");
+ splitList.add(pamentOrderUser);
+ complete.setSplitList(splitList);
+ TrhRequest<Complete> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);//分账操作
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");//0：待处理 1：成功 2：失败
+ String merOrderId1 = jsonObject.getString("merOrderId");
+ if(2 == status){
+ logger.warn("订单支付成功后的分账处理异常失败");
+ return ResultUtil.error("订单支付成功后的分账处理异常失败");
+ }
+ if(1 == status){
+ divisionRecord.setMerOrderId(merOrderId1);
+ divisionRecord.setPayTime(new Date());
+ divisionRecord.setState(2);
+ divisionRecordService.updateById(divisionRecord);
+ //间隔1分钟开始调用确认收货后开始提现
+
+ new Timer().schedule(new TimerTask() {//确认收货和提现
+ @Override
+ public void run() {
+ confirmReceipt(merchantNumber, merOrderId, divisionRecord);
+ }
+ }, 60000);
+ return ResultUtil.success();
+ }
+ }else{
+ logger.warn("订单支付成功后的分账处理异常 ：" + execute.getMsg());
+ return ResultUtil.error("订单支付成功后的分账处理异常 ：" + execute.getMsg());
+ }
+ logger.warn("未知异常");
+ return ResultUtil.error("未知异常");
+ }
+
+
+
+
+ /**
+ * 分账后的确认收货
+ * @param divisionRecord
+ */
+ public void confirmReceipt(String merchantNumber, String orderNumber, DivisionRecord divisionRecord){
+ Receive receive = new Receive();
+ receive.setOriginalMerOrderId(orderNumber);
+ receive.setAsynMerOrderId(divisionRecord.getMerOrderId());
+ receive.setRcvAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ List<ReceiveUser> splitList = new ArrayList<>();
+ ReceiveUser receiveUser = new ReceiveUser();
+ receiveUser.setSplitUserId(merchantNumber);
+ receiveUser.setRcvSplitAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ splitList.add(receiveUser);
+ receive.setSplitList(splitList);
+ TrhRequest<Receive> request = new TrhRequest();
+ InterfaceResponse execute1 = request.execute(receive, Receive.SERVICE_CODE);//确认收货
+ if("0000".equals(execute1.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute1.getResult());
+ String merOrderId = jsonObject.getString("merOrderId");
+ logger.warn("分账确认收货成功");
+ }else{
+ logger.warn("分账确认收货异常" + execute1.getMsg());
}
}
+
/**
* 获取司机的订单列表
@@ -1645,6 +2251,91 @@
*/
@Override
public void completeCollection() {
- this.baseMapper.completeCollection();
+ List<Order> orders = this.selectList(new EntityWrapper<Order>().eq("state", 107).eq("status", 1)
+ .eq("payType", 3).last(" and UNIX_TIMESTAMP(getoffTime) + 600 <= UNIX_TIMESTAMP(now())"));
+ for (Order order : orders) {
+ Long orderId = order.getId();
+ try {
+ boolean lock = redisUtil.lock(orderId + "",5);
+ if(!lock){
+ int num1 = 1;
+ while (num1 <= 10){
+ Thread.sleep(3000);//等待3秒
+ lock = redisUtil.lock(orderId + "",5);
+ if(lock){
+ break;
+ }else{
+ num1++;
+ }
+ }
+ }
+ if(!lock){
+ redisUtil.unlock(orderId + "");
+ continue;
+ }
+ completeCollection_(order);
+ }catch (Exception e){
+ redisUtil.unlock(orderId + "");
+ e.printStackTrace();
+ }
+ }
+ }
+
+
+
+
+
+ public void completeCollection_(Order order) throws Exception{
+ order.setState(108);
+ order.setPayTime(new Date());
+ if(null != order.getCouponId()){
+ UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
+ Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
+
+ Driver driver = driverService.selectById(order.getDriverId());
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(order.getDriverId());
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setExplain("优惠券收入");
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(coupon.getCouponPreferentialAmount())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ accountChangeDetailService.insert(accountChangeDetail);
+
+ //补贴中分账
+ Double discountedPrice = order.getDiscountedPrice();
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(discountedPrice) >= 0){
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice = new BigDecimal(discountedPrice).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ }
+
+ this.updateById(order);
+ saveRevenue(order);
}
}
--
Gitblit v1.7.1