From f58cca364b731eac2d60a440ffaa804be3cd43fd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 30 六月 2023 10:32:28 +0800
Subject: [PATCH] 修改bug
---
user/guns-admin/src/main/java/com/agentdriving/user/modular/system/service/impl/OrderServiceImpl.java | 1153 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 601 insertions(+), 552 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/agentdriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/agentdriving/user/modular/system/service/impl/OrderServiceImpl.java
index 89920f4..e1a860b 100644
--- a/user/guns-admin/src/main/java/com/agentdriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/agentdriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -3,7 +3,6 @@
import com.agentdriving.user.modular.system.model.*;
import com.agentdriving.user.modular.system.service.*;
import com.agentdriving.user.modular.system.util.*;
-import com.agentdriving.user.modular.system.util.MallBook.model.*;
import com.agentdriving.user.modular.system.warpper.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -12,17 +11,12 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.agentdriving.user.core.util.ToolUtil;
import com.agentdriving.user.modular.system.dao.OrderMapper;
-import com.agentdriving.user.modular.system.model.*;
-import com.agentdriving.user.modular.system.service.*;
-import com.agentdriving.user.modular.system.util.*;
import com.agentdriving.user.modular.system.util.GaoDe.MapUtil;
import com.agentdriving.user.modular.system.util.GaoDe.model.District;
-import com.agentdriving.user.modular.system.util.MallBook.model.*;
-import com.agentdriving.user.modular.system.util.MallBook.util.Transfer;
-import com.agentdriving.user.modular.system.util.MallBook.util.TrhRequest;
import com.agentdriving.user.modular.system.util.juhe.WeatherUtil;
import com.agentdriving.user.modular.system.util.mongodb.model.Location;
-import com.agentdriving.user.modular.system.warpper.*;
+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;
@@ -38,7 +32,7 @@
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
-import java.net.InetAddress;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -51,6 +45,8 @@
*/
@Service
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
+
+ Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
@Autowired
private ISystemConfigService systemConfigService;
@@ -100,15 +96,6 @@
@Autowired
private IRevenueService revenueService;
- @Autowired
- private IAgentService agentService;
-
- @Autowired
- private IPlatformRechargeRecordService platformRechargeRecordService;
-
- @Autowired
- private IDivisionRecordService divisionRecordService;
-
@Value("${callbackPath}")
private String callbackPath;//支付回调网关地址
@@ -144,7 +131,9 @@
.where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
city = null != weatherCity ? weatherCity.getId().toString() : "";
}
- Order order = getOrderPrice(1, d, 0, new Order(), city);
+ Order order1 = new Order();
+ order1.setCreateTime(new Date());
+ Order order = getOrderPrice(1, d, 0, order1, city);
Double estimatedPrice = order.getEstimatedPrice();
Coupon coupon = userToCouponService.queryCoupon(uid, estimatedPrice);
if(null != coupon){
@@ -210,63 +199,114 @@
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
JSONArray chargeStandard = jsonObject.getJSONArray("ChargeStandard");
JSONObject extraCost = jsonObject.getJSONObject("ExtraCost");
- Date date = new Date();
- for (int i = 0; i < chargeStandard.size(); i++) {
+ Date date = order.getCreateTime();
+
+ boolean b = true;
+ for (int i = 1; i < chargeStandard.size(); i++) {//各种时间段
JSONObject jsonObject1 = chargeStandard.getJSONObject(i);
String num1 = jsonObject1.getString("num1");
String num2 = jsonObject1.getString("num2");
- Double num3 = jsonObject1.getDouble("num3");//起步里程
- Double num4 = jsonObject1.getDouble("num4");//起步价格
- Double num5 = jsonObject1.getDouble("num5");//超过公里
- Double num6 = jsonObject1.getDouble("num6");//超过num3每num5公里收取num6
- Double num7 = jsonObject1.getDouble("num7");//长途起始公里
- Double num8 = jsonObject1.getDouble("num8");//长途结束公里
- Double num9 = jsonObject1.getDouble("num9");//长途费
- Double num10 = jsonObject1.getDouble("num10");//超出长途里程每num10公里
- Double num11 = jsonObject1.getDouble("num11");//超过num8每num10公里收取num11
+ JSONArray num3 = jsonObject1.getJSONArray("num3");//起步里程
+ Double num4 = jsonObject1.getDouble("num4");//长途里程
+ Double num5 = jsonObject1.getDouble("num5");//长途里程
+ Double num6 = jsonObject1.getDouble("num6");//长途费
+ Double num7 = jsonObject1.getDouble("num7");//超出长途里程每num10公里
+ Double num8 = jsonObject1.getDouble("num8");//超过num8每num10公里收取num11
String[] split = num1.split(":");
+ Integer hour1 = Integer.valueOf(split[0]);
+ String[] split1 = num2.split(":");
+ Integer hour2 = Integer.valueOf(split1[0]);
+
Calendar s = Calendar.getInstance();
s.setTime(date);
- s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
+ s.set(Calendar.HOUR_OF_DAY, hour1);
s.set(Calendar.MINUTE, Integer.valueOf(split[1]));
s.set(Calendar.SECOND, 0);
- split = num2.split(":");
Calendar e = Calendar.getInstance();
e.setTime(date);
- e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
- e.set(Calendar.MINUTE, Integer.valueOf(split[1]));
+ e.set(Calendar.HOUR_OF_DAY, hour2);
+ e.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
e.set(Calendar.SECOND, 0);
- if(date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
- if(num3.compareTo(distance) >= 0){//起步里程内
- order.setStartDistance(distance);//起步里程
- order.setStartPrice(num4);//起步价
+ if(hour1 > hour2){
+ if(s.getTimeInMillis() > date.getTime()){
+ s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
}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));
- order.setStartDistance(num3);//起步里程
- order.setStartPrice(num4);//起步价
- order.setOverDriveDistance(subtract.doubleValue());//超出起步里程
- order.setOverDrivePrice(multiply.doubleValue());//超出起步里程费
+ e.set(Calendar.DAY_OF_YEAR, e.get(Calendar.DAY_OF_YEAR) + 1);
+ }
+ }
- //计算长途费
- if(distance.compareTo(num7) > 0){
- order.setLongDistance(num7 + "-" + num8);//长途里程
- order.setLongDistancePrice(num9);//长途费
+ if(date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
+ b = false;
+ for (int j = 0; j < num3.size(); j++) {
+ JSONObject jsonObject2 = num3.getJSONObject(j);
+ Double num1_1 = jsonObject2.getDouble("num1");
+ Double num2_1 = jsonObject2.getDouble("num2");
+ Double num3_1 = jsonObject2.getDouble("num3");
+ if(num1_1.compareTo(distance) <= 0 && num2_1.compareTo(distance) > 0){
+ order.setStartDistance(distance);//起步里程
+ order.setStartPrice(num3_1);//起步价
+ break;
}
- //计算长途里程超出的部分
- 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));
- BigDecimal multiply1 = divide1.multiply(new BigDecimal(num11));
- order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
- order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
+ if(j == num3.size() - 1 && order.getStartPrice() == 0){
+ order.setStartDistance(num2_1);//起步里程
+ order.setStartPrice(num3_1);//起步价
}
}
- break;
+ //计算长途费
+ if(distance.compareTo(num4) > 0){
+ order.setLongDistance(num4 + "-" + num5);//长途里程
+ order.setLongDistancePrice(num6);//长途费
+ }
+ //计算长途里程超出的部分
+ if(distance.compareTo(num5) > 0){
+ BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num5)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal divide1 = subtract1.divide(new BigDecimal(num7), 2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal multiply1 = divide1.multiply(new BigDecimal(num8));
+ order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
+ order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
+ }
+ }
+ }
+
+ if(b){//默认配置
+ JSONObject jsonObject1 = chargeStandard.getJSONObject(0);
+ JSONArray num3 = jsonObject1.getJSONArray("num3");//起步里程
+ Double num4 = jsonObject1.getDouble("num4");//长途里程
+ Double num5 = jsonObject1.getDouble("num5");//长途里程
+ Double num6 = jsonObject1.getDouble("num6");//长途费
+ Double num7 = jsonObject1.getDouble("num7");//超出长途里程每num10公里
+ Double num8 = jsonObject1.getDouble("num8");//超过num8每num10公里收取num11
+
+ for (int j = 0; j < num3.size(); j++) {
+ JSONObject jsonObject2 = num3.getJSONObject(j);
+ Double num1_1 = jsonObject2.getDouble("num1");
+ Double num2_1 = jsonObject2.getDouble("num2");
+ Double num3_1 = jsonObject2.getDouble("num3");
+ if(num1_1.compareTo(distance) <= 0 && num2_1.compareTo(distance) > 0){
+ order.setStartDistance(distance);//起步里程
+ order.setStartPrice(num3_1);//起步价
+ break;
+ }
+ if(j == num3.size() - 1 && order.getStartPrice() == 0){
+ order.setStartDistance(num2_1);//起步里程
+ order.setStartPrice(num3_1);//起步价
+ }
+ }
+ //计算长途费
+ if(distance.compareTo(num4) > 0){
+ order.setLongDistance(num4 + "-" + num5);//长途里程
+ order.setLongDistancePrice(num6);//长途费
+ }
+ //计算长途里程超出的部分
+ if(distance.compareTo(num5) > 0){
+ BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num5)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal divide1 = subtract1.divide(new BigDecimal(num7), 2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal multiply1 = divide1.multiply(new BigDecimal(num8));
+ order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
+ order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
}
}
@@ -336,6 +376,42 @@
}
return order;
}
+
+
+ public static void main(String[] ages){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Integer hour1 = 22;
+ Integer hour2 = 06;
+
+ Date date = null;
+ try {
+ date = sdf.parse("2023-06-12 23:26:50");
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ Calendar s = Calendar.getInstance();
+ s.setTime(date);
+ s.set(Calendar.HOUR_OF_DAY, hour1);
+ s.set(Calendar.MINUTE, 0);
+ s.set(Calendar.SECOND, 0);
+ Calendar e = Calendar.getInstance();
+ e.setTime(date);
+ e.set(Calendar.HOUR_OF_DAY, hour2);
+ e.set(Calendar.MINUTE, 0);
+ e.set(Calendar.SECOND, 0);
+ if(hour1 > hour2){
+ if(s.getTimeInMillis() > date.getTime()){
+ s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
+ }else{
+ e.set(Calendar.DAY_OF_YEAR, e.get(Calendar.DAY_OF_YEAR) + 1);
+ }
+
+ }
+
+ System.err.println("开始时间：" + sdf.format(s.getTime()));
+ System.err.println("结束时间：" + sdf.format(e.getTime()));
+ }
+
@@ -436,15 +512,14 @@
return ResultUtil.error("司机还未上班");
}
Driver driver = driverService.selectById(travelOrder.getDriverId());
- if(driver.getServerStatus() == 2){
- return ResultUtil.error("司机正在服务中");
- }
- order.setAgentId(driver.getAgentId());
- order.setBranchOfficeId(driver.getBranchOfficeId());
- order.setOrderTakingTime(new Date());
+ if(driver.getServerStatus() == 1){
+ order.setAgentId(driver.getAgentId());
+ order.setBranchOfficeId(driver.getBranchOfficeId());
+ order.setOrderTakingTime(new Date());
- driver.setServerStatus(2);
- driverService.updateById(driver);
+ driver.setServerStatus(2);
+ driverService.updateById(driver);
+ }
appUser.setCancelCount(0);
appUser.setIsException(1);
@@ -479,28 +554,208 @@
* 订单推送逻辑
*/
public void pushOrder(Long orderId){
- Order order = this.selectById(orderId);
- /**
- * 1.先找最大推单范围内的优推司机 -》 距离最近
- * 没有1 - 》
- * 2.按照后台推送配置在范围内查找合适司机
- * 合适司：积分 > 评分 > 距离
- * 3.司机没有接单直接将订单置入大厅
- */
- SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
- if(null == systemConfig){
- return;
+ 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());
+ if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1){
+ continue;
+ }
+ DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId()).eq("status", 1));
+ if(null == driverWork){
+ continue;
+ }
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ if(d == null || d.compareTo(wgs84) > 0){
+ d = wgs84;
+ driver = youTuiDriver.getDriverId();
+ youTuiDriver1 = youTuiDriver;
+ }
+ }
+ }
+ 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;
+ }
+
+ 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);
//画圆
@@ -509,117 +764,22 @@
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;
- }
- Driver driver1 = driverService.selectById(youTuiDriver.getDriverId());
- if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1){
- 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)) {
+ return;
}
- }
- 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;
- }
- 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){
- 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);
}
}
@@ -783,12 +943,7 @@
orderPriceWarpper.setDiscountAmount(0D);
orderPriceWarpper.setPayType(1);//微信支付
Double orderMoney = order.getOrderMoney();
- //先算优惠券
-// Coupon coupon = userToCouponService.queryCoupon(uid, orderMoney);
-// if(null != coupon && null == couponId){
-// orderPriceWarpper.setDiscountedPrice(coupon.getCouponPreferentialAmount());
-// orderPriceWarpper.setCouponId(coupon.getId());
-// }
+
if(payType == 1 && null == couponId && appUser.getHavDiscount() == 1 && balance.compareTo(orderMoney) >= 0){//使用余额抵扣
orderPriceWarpper.setDiscount(9D);
orderPriceWarpper.setDiscountAmount(new BigDecimal(orderMoney * 0.1).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
@@ -859,6 +1014,9 @@
if(orderPayment.getPayType() == 3){//线下支付（由司机端操作）
}
if(orderPayment.getPayType() == 4){//微信+余额
+ if(appUser.getAccountBalance() == 0){
+ return ResultUtil.error("账户余额不足");
+ }
return weixinAndBalancePayment(order, appUser, orderPayment.getCouponId());
}
return ResultUtil.success();
@@ -889,48 +1047,92 @@
}
order.setPayType(1);
order.setPayMoney(payMoney);
+ this.updateById(order);
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String out_trade_no = sdf.format(new Date()) + order.getId();
-// ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
-// this.updateById(order);
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
+ if(weixinpay.getCode() == 200){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ int num = 1;
+ int wait = 0;
+ while (num <= 10) {
+ int min = 5000;
+ wait += (min * num);
+ Order order1 = OrderServiceImpl.this.selectById(order.getId());
+ if (order1.getState() != 107) {
+ return;
+ }
+ ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(out_trade_no, "");
+ if (resultUtil.getCode() == 200) {
+ /**
+ * 订单状态
+ * SUCCESS—支付成功，
+ * REFUND—转入退款，
+ * NOTPAY—未支付，
+ * CLOSED—已关闭，
+ * REVOKED—已撤销（刷卡支付），
+ * USERPAYING--用户支付中，
+ * PAYERROR--支付失败(其他原因，如银行返回失败)
+ */
+ Map<String, String> data2 = resultUtil.getData();
+ String s = data2.get("state");
+ String transaction_id = data2.get("transaction_id");
+ if ("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
+ //回退
+ return;
+ }
+ if ("SUCCESS".equals(s)) {
+ order1.setState(108);
+ order1.setPayTime(new Date());
+ order1.setOrderNo(transaction_id);
+ OrderServiceImpl.this.updateById(order1);
+ Driver driver = driverService.selectById(order1.getDriverId());
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(order1.getDriverId());
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order1.getId());
+ accountChangeDetail.setExplain("优惠券收入");
+ driver.setCouponBalance(driver.getCouponBalance() + order1.getDiscountedPrice());
+ accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.insert(accountChangeDetail);
-
- PaymentOrder paymentOrder = new PaymentOrder();
- paymentOrder.setBizOrderId(out_trade_no);
- paymentOrder.setAmount(String.valueOf(payMoney * 100));
- paymentOrder.setOrderName("代驾服务费");
- paymentOrder.setPayType("WX_MINI");
- paymentOrder.setTransferType("0");
- paymentOrder.setAsynSplitFlag("1");
- paymentOrder.setAppid("");
- paymentOrder.setOpenid(appUser.getOpenid());
- paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
- List<PaymentOrderGood> goodsDetail = new ArrayList<>();
- PaymentOrderGood paymentOrderGood = new PaymentOrderGood();
- paymentOrderGood.setGoodsName("服务费");
- goodsDetail.add(paymentOrderGood);
- paymentOrder.setGoodsDetail(goodsDetail);
- paymentOrder.setFrontUrl("");
- paymentOrder.setNotifyUrl(callbackPath + "/base/order/orderPayCallback");
- paymentOrder.setParameter1(order.getId().toString());
-
- TrhRequest<PaymentOrder> request = new TrhRequest();
- InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
- return ResultUtil.error(execute.getMsg());
+ pushUtil.pushOrderStatus(order1.getUserId(), 1, order1.getId(), order1.getState());
+ if(null != order1.getDriverId()) {
+ PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+ pushOrderInfoWarpper.setId(order1.getId());
+ pushOrderInfoWarpper.setState(order1.getState());
+ pushUtil.pushOrderInfo(order1.getDriverId(), 2, pushOrderInfoWarpper);
+ }
+ //处理佣金和收入记录
+ saveCommission(order1);
+ return;
+ }
+ if ("USERPAYING".equals(s)) {
+ Thread.sleep(wait);
+ num++;
+ continue;
+ }
+ Thread.sleep(wait);
+ num++;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }).start();
}
- JSONObject jsonObject = JSON.parseObject(execute.getResult());
- String status = jsonObject.getString("status");
- if("2".equals(status)){
- return ResultUtil.error("失败");
- }
- if("0".equals(status)){
- return ResultUtil.error("处理中");
- }
- String payCode = jsonObject.getString("payCode");
- this.updateById(order);
- return ResultUtil.success(payCode);
+ return weixinpay;
}
@@ -971,9 +1173,9 @@
}
if(appUser.getHavDiscount() == 1){//9折
- payMoney = payMoney * 0.9;
order.setDiscount(9D);
order.setDiscountAmount(payMoney * 0.1);
+ payMoney = payMoney * 0.9;
}
order.setPayType(2);
@@ -1036,7 +1238,7 @@
order.setPayType(1);
order.setPayMoney(payMoney);
- payMoney = payMoney > appUser.getAccountBalance() ? payMoney - appUser.getAccountBalance() : 0D;
+ payMoney = payMoney.compareTo(appUser.getAccountBalance()) > 0 ? payMoney - appUser.getAccountBalance() : 0D;
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
@@ -1048,7 +1250,7 @@
accountChangeDetail.setChangeType(2);
accountChangeDetail.setOrderId(order.getId());
accountChangeDetail.setExplain("代驾服务费");
- appUser.setAccountBalance(appUser.getAccountBalance() > payMoney ? appUser.getAccountBalance() - payMoney : 0);
+ appUser.setAccountBalance(appUser.getAccountBalance().compareTo(payMoney) > 0 ? appUser.getAccountBalance() - payMoney : 0);
accountChangeDetail.setNewData(appUser.getAccountBalance());
appUserService.updateById(appUser);
accountChangeDetailService.insert(accountChangeDetail);
@@ -1056,126 +1258,109 @@
if(0 < payMoney){//还需要调起微信支付
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String out_trade_no = sdf.format(new Date()) + order.getId();
-// ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
- PaymentOrder paymentOrder = new PaymentOrder();
- paymentOrder.setBizOrderId(out_trade_no);
- paymentOrder.setAmount(String.valueOf(payMoney * 100));
- paymentOrder.setOrderName("代驾服务费");
- paymentOrder.setPayType("WX_MINI");
- paymentOrder.setTransferType("0");
- paymentOrder.setAsynSplitFlag("1");
- paymentOrder.setAppid("");
- paymentOrder.setOpenid(appUser.getOpenid());
- paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
- List<PaymentOrderGood> goodsDetail = new ArrayList<>();
- PaymentOrderGood paymentOrderGood = new PaymentOrderGood();
- paymentOrderGood.setGoodsName("服务费");
- goodsDetail.add(paymentOrderGood);
- paymentOrder.setGoodsDetail(goodsDetail);
- paymentOrder.setFrontUrl("");
- paymentOrder.setNotifyUrl(callbackPath + "/base/order/orderPayCallback");
- paymentOrder.setParameter1(order.getId().toString());
+ if(weixinpay.getCode() == 200){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ int num = 1;
+ int wait = 0;
+ while (num <= 10) {
+ int min = 5000;
+ wait += (min * num);
+ Order order1 = OrderServiceImpl.this.selectById(order.getId());
+ if (order1.getState() != 107) {
+ return;
+ }
+ ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(out_trade_no, "");
+ if (resultUtil.getCode() == 200) {
+ /**
+ * 订单状态
+ * SUCCESS—支付成功，
+ * REFUND—转入退款，
+ * NOTPAY—未支付，
+ * CLOSED—已关闭，
+ * REVOKED—已撤销（刷卡支付），
+ * USERPAYING--用户支付中，
+ * PAYERROR--支付失败(其他原因，如银行返回失败)
+ */
+ Map<String, String> data2 = resultUtil.getData();
+ String s = data2.get("state");
+ String transaction_id = data2.get("transaction_id");
+ if ("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10) {
+ //回退
+ AccountChangeDetail accountChangeDetail1 = accountChangeDetailService.selectById(accountChangeDetail.getId());
+ double v = accountChangeDetail1.getOldData() - accountChangeDetail1.getNewData();
+ AppUser appUser1 = appUserService.selectById(order1.getUserId());
- TrhRequest<PaymentOrder> request = new TrhRequest();
- InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
- return ResultUtil.error(execute.getMsg());
- }
- JSONObject jsonObject = JSON.parseObject(execute.getResult());
- String status = jsonObject.getString("status");
- if("2".equals(status)){
- return ResultUtil.error("失败");
- }
- if("0".equals(status)){
- return ResultUtil.error("处理中");
- }
- String payCode = jsonObject.getString("payCode");
- this.updateById(order);
- return ResultUtil.success(payCode);
+ accountChangeDetail1 = new AccountChangeDetail();
+ accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail1.setUserType(1);
+ accountChangeDetail1.setUserId(appUser1.getId());
+ accountChangeDetail1.setCreateTime(new Date());
+ accountChangeDetail1.setOldData(appUser1.getAccountBalance());
+ accountChangeDetail1.setType(1);
+ accountChangeDetail1.setChangeType(2);
+ accountChangeDetail1.setOrderId(order1.getId());
+ accountChangeDetail1.setExplain("支付失败回退");
+ appUser1.setAccountBalance(appUser1.getAccountBalance() + v);
+ accountChangeDetail1.setNewData(appUser1.getAccountBalance());
+ appUserService.updateById(appUser1);
+ accountChangeDetailService.insert(accountChangeDetail1);
+ return;
+ }
+ if ("SUCCESS".equals(s)) {
+ order1.setState(108);
+ order1.setPayTime(new Date());
+ order1.setOrderNo(transaction_id);
+ OrderServiceImpl.this.updateById(order1);
- // TODO: 2023/5/18 取消支付后需要处理优惠券数据回退
-//
-//
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// try {
-// int num = 1;
-// int wait = 0;
-// while (num <= 10){
-// int min = 5000;
-// wait += (min * num);
-// Order order1 = OrderServiceImpl.this.selectById(order.getId());
-// if(order1.getState() != 107){
-// return;
-// }
-//
-// /**
-// * SUCCESS--支付成功
-// * REFUND--转入退款
-// * NOTPAY--未支付
-// * CLOSED--已关闭
-// * REVOKED--已撤销(刷卡支付)
-// * USERPAYING--用户支付中
-// * PAYERROR--支付失败(其他原因，如银行返回失败)
-// * ACCEPT--已接收，等待扣款
-// */
-// ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(out_trade_no, "");
-// if(resultUtil.getCode() == 200){
-// Map<String, String> map = resultUtil.getData();
-// String trade_type = map.get("trade_type");
-// String trade_state = map.get("trade_state");
-// String transaction_id = map.get("transaction_id");
-// if("REFUND".equals(trade_state) || "NOTPAY".equals(trade_state) || "CLOSED".equals(trade_state) || "REVOKED".equals(trade_state) || "PAYERROR".equals(trade_state)){
-// AccountChangeDetail accountChangeDetail1 = accountChangeDetailService.selectById(accountChangeDetail.getId());
-// AppUser appUser1 = appUserService.selectById(accountChangeDetail1.getUserId());
-// Double b = accountChangeDetail1.getOldData() - accountChangeDetail1.getNewData();
-// appUser1.setAccountBalance(appUser1.getAccountBalance() + b);
-// appUserService.updateById(appUser1);
-//
-// accountChangeDetailService.deleteById(accountChangeDetail.getId());
-// return;
-// }
-// if("SUCCESS".equals(trade_state)){
-// order1.setPayTime(new Date());
-// order1.setState(108);
-// order1.setOrderNo(transaction_id);
-// OrderServiceImpl.this.updateById(order1);
-//
-// //处理抽成及收入
-// saveCommission(order1);
-// return;
-// }
-// if("USERPAYING".equals(trade_state) || "ACCEPT".equals(trade_state)){
-// Thread.sleep(wait);
-// num++;
-// }
-// }else{
-// Thread.sleep(wait);
-// num++;
-// }
-// if(10 == num){
-// AccountChangeDetail accountChangeDetail1 = accountChangeDetailService.selectById(accountChangeDetail.getId());
-// AppUser appUser1 = appUserService.selectById(accountChangeDetail1.getUserId());
-// Double b = accountChangeDetail1.getOldData() - accountChangeDetail1.getNewData();
-// appUser1.setAccountBalance(appUser1.getAccountBalance() + b);
-// appUserService.updateById(appUser1);
-//
-// accountChangeDetailService.deleteById(accountChangeDetail.getId());
-// }
-// }
-// }catch (Exception e){
-// e.printStackTrace();
-// }
-// }
-// }).start();
-// return weixinpay;
+ Driver driver = driverService.selectById(order1.getDriverId());
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(order1.getDriverId());
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order1.getId());
+ accountChangeDetail.setExplain("优惠券收入");
+ driver.setCouponBalance(driver.getCouponBalance() + order1.getDiscountedPrice());
+ accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.insert(accountChangeDetail);
+
+ pushUtil.pushOrderStatus(order1.getUserId(), 1, order1.getId(), order1.getState());
+ if(null != order1.getDriverId()) {
+ PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+ pushOrderInfoWarpper.setId(order1.getId());
+ pushOrderInfoWarpper.setState(order1.getState());
+ pushUtil.pushOrderInfo(order1.getDriverId(), 2, pushOrderInfoWarpper);
+ }
+ //处理佣金和收入记录
+ saveCommission(order1);
+ return;
+ }
+ if ("USERPAYING".equals(s)) {
+ Thread.sleep(wait);
+ num++;
+ continue;
+ }
+ Thread.sleep(wait);
+ num++;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }).start();
+ }
+ return weixinpay;
}
-// order.setPayTime(new Date());
-// this.updateById(order);
-
-
return ResultUtil.success();
}
@@ -1206,135 +1391,6 @@
pushOrderInfoWarpper.setState(order.getState());
pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
}
-
- //支付成功---->异步分账----->10s钟后再进行确认收货
- //确认收货后才能进行提现（结算接口）
- //异步分账
- List<Revenue> revenues = revenueService.selectList(new EntityWrapper<Revenue>().eq("orderId", order.getId()));
- Complete complete = new Complete();
- complete.setOriginalMerOrderId(transaction_id);
- complete.setNotifyUrl(callbackPath + "/base/order/ledgerCallback");
- List<PamentOrderUser> splitList = new ArrayList<>();
- for (Revenue revenue : revenues) {
- if(revenue.getUserType() == 2){//司机
- Driver driver = driverService.selectById(revenue.getUserId());
- PamentOrderUser pamentOrderUser = new PamentOrderUser();
- pamentOrderUser.setSplitUserId(driver.getMerchantNumber());
- pamentOrderUser.setSplitAmount(revenue.getAmount().toString());
- pamentOrderUser.setSplitType("2");
- splitList.add(pamentOrderUser);
-
- DivisionRecord divisionRecord = new DivisionRecord();
- divisionRecord.setUserType(1);
- divisionRecord.setUserId(revenue.getUserId());
- divisionRecord.setOrderId(order.getId());
- divisionRecord.setMerOrderId(transaction_id);
- divisionRecord.setSourceType(1);
- divisionRecord.setAmount(revenue.getAmount());
- divisionRecord.setMerchantNumber(driver.getMerchantNumber());
- divisionRecord.setState(1);
- divisionRecord.setCreateTime(new Date());
- divisionRecordService.insert(divisionRecord);
- }
- if(revenue.getUserType() == 3){//代理商
- Agent agent = agentService.selectById(revenue.getUserId());
- PamentOrderUser pamentOrderUser = new PamentOrderUser();
- pamentOrderUser.setSplitUserId(agent.getMerchantNumber());
- pamentOrderUser.setSplitAmount(revenue.getAmount().toString());
- pamentOrderUser.setSplitType("2");
- splitList.add(pamentOrderUser);
-
- DivisionRecord divisionRecord = new DivisionRecord();
- divisionRecord.setUserType(2);
- divisionRecord.setUserId(revenue.getUserId());
- divisionRecord.setOrderId(order.getId());
- divisionRecord.setMerOrderId(transaction_id);
- divisionRecord.setSourceType(1);
- divisionRecord.setAmount(revenue.getAmount());
- divisionRecord.setMerchantNumber(agent.getMerchantNumber());
- divisionRecord.setState(1);
- divisionRecord.setCreateTime(new Date());
- divisionRecordService.insert(divisionRecord);
- }
-
- }
- complete.setSplitList(splitList);
- TrhRequest<Complete> request = new TrhRequest();
- InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
- return ResultUtil.error(execute.getMsg());
- }
- JSONObject jsonObject = JSON.parseObject(execute.getResult());
- String status = jsonObject.getString("status");
- if("2".equals(status)){
- return ResultUtil.error("失败");
- }
- if("0".equals(status)){
- return ResultUtil.error("处理中");
- }
-
- //使用优惠券的情况，通过转账接口将优惠券的收入转到司机电子账簿
- if(null != order.getCouponId()){
- List<PlatformRechargeRecord> platformRechargeRecords = platformRechargeRecordService.selectList(new EntityWrapper<PlatformRechargeRecord>().eq("state", 2).last(" and balance > 0 order by payTime"));
- Double discountedPrice = order.getDiscountedPrice();
- Driver driver = driverService.selectById(order.getDriverId());
-
- UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
- Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(order.getDriverId());
- accountChangeDetail.setCreateTime(new Date());
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- 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());
- driverService.updateById(driver);
- accountChangeDetailService.insert(accountChangeDetail);
-
-
- for (PlatformRechargeRecord platformRechargeRecord : platformRechargeRecords) {
- if(discountedPrice == 0){
- break;
- }
-
- if(platformRechargeRecord.getBalance().compareTo(discountedPrice) >= 0){
- discountedPrice = 0D;
- platformRechargeRecord.setBalance(platformRechargeRecord.getBalance() - discountedPrice);
- platformRechargeRecordService.updateById(platformRechargeRecord);
- }else{
-
- }
-
- Transfer transfer = new Transfer();
- transfer.setDepositMerOrderId("6831518911582834611");
- transfer.setToUserId(driver.getMerchantNumber());
- transfer.setAmount(discountedPrice.toString());
- transfer.setOrderName("");
- transfer.setNotifyUrl("");
- transfer.setParameter1(order.getId().toString());
-
- TrhRequest<Transfer> request1 = new TrhRequest();
- InterfaceResponse execute1 = request1.execute(transfer, Transfer.SERVICE_CODE);
- if(!"0000".equals(execute1.getResult())){
- return ResultUtil.error(execute1.getMsg());
- }
- JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
- String status1 = jsonObject1.getString("status");
- if("2".equals(status1)){
- return ResultUtil.error("失败");
- }
- if("0".equals(status1)){
- return ResultUtil.error("处理中");
- }
- }
- }
-
-
return ResultUtil.success();
}
@@ -1378,7 +1434,7 @@
if(null != systemConfig){
//{"num1":"10:00","num2":"14:00","num3":10,"num4":10,"num5":10,"num6":10,"num7":10,"num8":10,"num9":5,"num10":5}
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
- Integer num5 = jsonObject.getInteger("num5");
+ Integer num6 = jsonObject.getInteger("num6");
//增加积分变动记录
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
@@ -1389,7 +1445,7 @@
accountChangeDetail.setOldData(driver.getIntegral().doubleValue());
accountChangeDetail.setType(2);
accountChangeDetail.setExplain("代驾5星好评");
- driver.setIntegral(driver.getIntegral() + num5);
+ driver.setIntegral(driver.getIntegral() + num6);
accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
accountChangeDetailService.insert(accountChangeDetail);
}
@@ -1428,9 +1484,35 @@
*/
public void saveCommission(Order order) throws Exception{
//司机收入和代理商抽成(先分佣，后抽成)
- //司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
Driver driver = driverService.selectById(order.getDriverId());
AppUser appUser = appUserService.selectById(order.getUserId());
+
+ //首单积分奖励
+ //司机推荐首单收入
+ List<Integer> state = Arrays.asList(108, 109);
+ int count = this.selectCount(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("status", 1).in("state", state));
+ if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && count == 1){
+ Driver driver1 = driverService.selectById(appUser.getInviterId());
+ SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
+ JSONObject jsonObject2 = JSON.parseObject(systemConfig1.getContent());
+ Integer num4 = jsonObject2.getInteger("num4");
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver1.getId());
+ accountChangeDetail.setType(2);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(driver1.getIntegral().doubleValue());
+ accountChangeDetail.setExplain("邀请用户首单积分奖励");
+ accountChangeDetail.setCreateTime(new Date());
+ driver1.setIntegral(driver1.getIntegral() + num4);
+ accountChangeDetail.setNewData(driver1.getIntegral().doubleValue());
+ accountChangeDetailService.insert(accountChangeDetail);
+ driverService.updateById(driver1);
+ }
+
+
Double payMoney = order.getPayMoney();
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
if(null != systemConfig){
@@ -1442,40 +1524,6 @@
SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
if(null != systemConfig1){
JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
- //司机推荐首单收入
- List<Integer> state = Arrays.asList(108, 109);
- int count = this.selectCount(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("status", 1).in("state", state));
- if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && count == 1){
- Double num1 = jsonObject1.getDouble("num1");
- num1 = (num3 >= num1 ? num1 : num3);
-
- if(num1 > 0){
- Driver driver1 = driverService.selectById(appUser.getInviterId());
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver1.getId());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
- accountChangeDetail.setExplain("订单分佣收入");
- accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num1);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
- driverService.updateById(driver1);
- accountChangeDetailService.saveData(accountChangeDetail);
-
- Revenue revenue = new Revenue();
- revenue.setType(2);
- revenue.setUserType(2);
- revenue.setUserId(driver1.getId());
- revenue.setOrderId(order.getId());
- revenue.setAmount(num1);
- revenue.setCreateTime(new Date());
- revenueService.insert(revenue);
- }
- num3 = (num3 >= num1 ? num3 - num1 : 0);
- }
//开始处理层级抽佣
if(null != driver & null != driver.getInviterType() && driver.getInviterType() == 2){
@@ -1484,17 +1532,17 @@
Driver driver2 = driverService.selectById(driver1.getInviterId());//二级司机
if(null != driver2 && null != driver2.getInviterType() && driver2.getInviterType() == 2){
Driver driver3 = driverService.selectById(driver2.getInviterId());//三级级司机
+ Double num4 = jsonObject1.getDouble("num4");
Double num5 = jsonObject1.getDouble("num5");
Double num6 = jsonObject1.getDouble("num6");
- Double num7 = jsonObject1.getDouble("num7");
- num5 = (num3 >= num5 ? num5 : num3);
- if(num5 > 0 && null != driver1){
+ num4 = (num3 >= num4 ? num4 : num3);
+ if(num4 > 0 && null != driver1){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver1.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num5);
+ revenue.setAmount(num4);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1507,20 +1555,20 @@
accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num5);
+ driver1.setCommission(driver1.getCommission() + num4);
accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num5 ? num3 - num5 : 0);
+ num3 = (num3 >= num4 ? num3 - num4 : 0);
}
- num6 = (num3 >= num6 ? num6 : num3);
- if(num6 > 0 && null != driver2){
+ num5 = (num3 >= num5 ? num5 : num3);
+ if(num5 > 0 && null != driver2){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver2.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num6);
+ revenue.setAmount(num5);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1533,20 +1581,20 @@
accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num6);
+ driver2.setCommission(driver2.getCommission() + num5);
accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num6 ? num3 - num6 : 0);
+ num3 = (num3 >= num5 ? num3 - num5 : 0);
}
- num7 = (num3 >= num7 ? num7 : num3);
- if(num7 > 0 && null != driver3){
+ num6 = (num3 >= num6 ? num6 : num3);
+ if(num6 > 0 && null != driver3){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver3.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num7);
+ revenue.setAmount(num6);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1559,23 +1607,23 @@
accountChangeDetail.setOldData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver3.setCommission(driver3.getCommission() + num7);
+ driver3.setCommission(driver3.getCommission() + num6);
accountChangeDetail.setNewData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
driverService.updateById(driver3);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num7 ? num3 - num7 : 0);
+ num3 = (num3 >= num6 ? num3 - num6 : 0);
}
}else{
+ Double num2_ = jsonObject1.getDouble("num2");
Double num3_ = jsonObject1.getDouble("num3");
- Double num4 = jsonObject1.getDouble("num4");
- num3_ = (num3 >= num3_ ? num3_ : num3);
- if(num3_ > 0 && null != driver1){
+ num2_ = (num3 >= num2_ ? num2_ : num3);
+ if(num2_ > 0 && null != driver1){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver1.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num3_);
+ revenue.setAmount(num2_);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1588,20 +1636,20 @@
accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num3_);
+ driver1.setCommission(driver1.getCommission() + num2_);
accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num3_ ? num3 - num3_ : 0);
+ num3 = (num3 >= num2_ ? num3 - num2_ : 0);
}
- num4 = (num3 >= num4 ? num4 : num3);
- if(num4 > 0 && null != driver2){
+ num3_ = (num3 >= num3_ ? num3_ : num3);
+ if(num3_ > 0 && null != driver2){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver2.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num4);
+ revenue.setAmount(num3_);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1614,23 +1662,23 @@
accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num4);
+ driver2.setCommission(driver2.getCommission() + num3_);
accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num4 ? num3 - num4 : 0);
+ num3 = (num3 >= num3_ ? num3 - num3_ : 0);
}
}
}else{
- Double num2_ = jsonObject1.getDouble("num2");
- num2_ = (num3 >= num2_ ? num2_ : num3);
- if(num2_ > 0 && null != driver1){
+ Double num1_ = jsonObject1.getDouble("num1");
+ num1_ = (num3 >= num1_ ? num1_ : num3);
+ if(num1_ > 0 && null != driver1){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver1.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num2_);
+ revenue.setAmount(num1_);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1643,11 +1691,11 @@
accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num2_);
+ driver1.setCommission(driver1.getCommission() + num1_);
accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num2_ ? num3 - num2_ : 0);
+ num3 = (num3 >= num1_ ? num3 - num1_ : 0);
}
}
}
@@ -1666,6 +1714,7 @@
}
}
//司机订单收入
+ driver = driverService.selectById(order.getDriverId());
Revenue revenue = new Revenue();
revenue.setType(1);
revenue.setUserType(2);
--
Gitblit v1.7.1