From 85fefef6c862c543117ad8d2691817bfeae69f41 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 23 六月 2023 11:11:15 +0800
Subject: [PATCH] 修改bug
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 1982 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 1,568 insertions(+), 414 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index 6132161..79c6575 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -18,6 +18,7 @@
import com.supersavedriving.user.modular.system.util.juhe.WeatherUtil;
import com.supersavedriving.user.modular.system.util.mongodb.model.Location;
import com.supersavedriving.user.modular.system.warpper.*;
+import io.swagger.models.auth.In;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -145,7 +146,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){
@@ -200,6 +203,7 @@
*/
public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city){
distance = new BigDecimal(distance).setScale(0, BigDecimal.ROUND_UP).doubleValue();
+ waitTime = new BigDecimal(waitTime).setScale(0, BigDecimal.ROUND_UP).intValue();
order = getOrderInitialPrice(order);
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5));
if(null == systemConfig){
@@ -214,7 +218,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");
@@ -302,12 +306,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 - (num3 * 60);
+ BigDecimal multiply = new BigDecimal(w).divide(new BigDecimal(60), 0, RoundingMode.UP).multiply(new BigDecimal(num4));
order.setOutWaitTime(w);//等待时长超出分钟
order.setOutWaitTimePrice(multiply.doubleValue());//等待时长超出费用
}
@@ -449,6 +453,7 @@
.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);
if(null != travelOrder.getDriverId()){
DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", travelOrder.getDriverId()).eq("status", 1));
@@ -499,159 +504,198 @@
* 订单推送逻辑
*/
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;
- }
- 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 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;
- }
- 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;
+ 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(null != youTuiDriver1 && youTuiDriver1.getType() == 1){
- youTuiDriver1.setSurplusQuantity(youTuiDriver1.getSurplusQuantity() - 1);
- youTuiDriverService.updateById(youTuiDriver1);
- }
+ 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();
- //开始范围查找
- 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){
+ //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);
+ }
- 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){
+ //开始范围查找
+ 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;
}
- 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;
+ 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.getDriverId().compareTo(driver1.getId()) != 0){
+ driver1.setServerStatus(1);
+ driverService.updateById(driver1);
+ }
+
+ if(order1.getState() == 201 || (order1.getState() == 101 && null == order1.getDriverId())){
+ driver1.setServerStatus(1);
+ driverService.updateById(driver1);
+
+ order1.setHallOrder(1);
+ OrderServiceImpl.this.updateById(order1);
+ ExtraPushOrder(order);
+ }
+ }
+ }, num4 * 1000);
+ }else{
+ order.setHallOrder(1);
+ this.updateById(order);
+ ExtraPushOrder(order);
+ }
+ redisUtil.unlock();
+ }catch (Exception e){
+ e.printStackTrace();
+ redisUtil.unlock();
}
- 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);
- ExtraPushOrder(order);
- }
- }
- }, num4 * 1000);
- }else{
- order.setHallOrder(1);
- this.updateById(order);
- ExtraPushOrder(order);
- }
}
@@ -716,6 +760,7 @@
cancelOrderService.insert(cancelOrder);
order.setState(301);
this.updateById(order);
+ redisUtil.delSetValue("orderService", order.getId().toString());
AppUser appUser = appUserService.selectById(uid);
appUser.setCancelCount(appUser.getCancelCount() + 1);
if(appUser.getCancelCount() >= 3){
@@ -819,17 +864,35 @@
* @throws Exception
*/
@Override
- public OrderPriceWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception {
+ public OrderPriceInfoWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception {
Order order = this.selectById(orderId);
- Coupon coupon = userToCouponService.queryCoupon(uid, order.getOrderMoney());
- OrderPriceWarpper orderPriceWarpper = new OrderPriceWarpper();
- BeanUtils.copyProperties(order, orderPriceWarpper);
- if(null != coupon){
- orderPriceWarpper.setCouponId(coupon.getId());
- orderPriceWarpper.setDiscountedPrice(coupon.getCouponPreferentialAmount());
+ OrderPriceInfoWarpper orderPriceWarpper = new OrderPriceInfoWarpper();
+ 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("-");
+ orderPriceWarpper.setStartPrice(order.getLongDistancePrice());
+ orderPriceWarpper.setStartDistance(Double.valueOf(split[1]));
+ orderPriceWarpper.setOverDriveDistance(order.getOverLongDistance());
+ orderPriceWarpper.setMileageFee(order.getOverLongDistancePrice());
}
- orderPriceWarpper.setActualMileage(new BigDecimal(order.getActualMileage() / 1000).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
- orderPriceWarpper.setTravelTime(Double.valueOf((order.getGetoffTime().getTime() - order.getStartTime().getTime()) / 60000).intValue());
+ Integer waitTime = order.getWaitTime() + order.getOutWaitTime();
+ Integer s = waitTime % 60;
+ int m = Double.valueOf(waitTime / 60).intValue();
+ 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());
+ if(null == order.getPayMoney()){
+ orderPriceWarpper.setPayMoney(order.getOrderMoney());
+ }
return orderPriceWarpper;
}
@@ -854,14 +917,18 @@
orderPriceWarpper.setBalance(appUser.getAccountBalance());
orderPriceWarpper.setDiscount(0D);
orderPriceWarpper.setDiscountAmount(0D);
- orderPriceWarpper.setPayType(1);//微信支付
+ orderPriceWarpper.setPayType(order.getPayType());//微信支付
+ if(null == order.getPayType() && -1 == payType){
+ orderPriceWarpper.setPayType(1);
+ payType = 0;
+ }
Double orderMoney = order.getOrderMoney();
//先算优惠券
-// Coupon coupon = userToCouponService.queryCoupon(uid, orderMoney);
-// if(null != coupon && null == couponId){
-// orderPriceWarpper.setDiscountedPrice(coupon.getCouponPreferentialAmount());
-// orderPriceWarpper.setCouponId(coupon.getId());
-// }
+ 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());
@@ -1066,22 +1133,6 @@
payMoney = payMoney - 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.setUserType(2);
- accountChangeDetail.setUserId(order.getDriverId());
- accountChangeDetail.setCreateTime(new Date());
- accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(7);
- accountChangeDetail.setOrderId(order.getId());
- accountChangeDetail.setExplain("优惠券收入");
- driver.setCommission(driver.getCommission() + coupon.getCouponPreferentialAmount());
- accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
- driverService.updateById(driver);
- accountChangeDetailService.insert(accountChangeDetail);
}
}
@@ -1122,7 +1173,7 @@
accountChangeDetailService.insert(accountChangeDetail);
//处理佣金和收入记录
- saveCommission(order);
+ saveCommissionYE(order);
return ResultUtil.success();
}
@@ -1146,27 +1197,15 @@
payMoney = payMoney - 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.setUserType(2);
- accountChangeDetail.setUserId(order.getDriverId());
- accountChangeDetail.setCreateTime(new Date());
- accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(7);
- accountChangeDetail.setOrderId(order.getId());
- accountChangeDetail.setExplain("优惠券收入");
- driver.setCommission(driver.getCommission() + coupon.getCouponPreferentialAmount());
- accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
- driverService.updateById(driver);
- accountChangeDetailService.insert(accountChangeDetail);
}
}
+
order.setPayType(1);
order.setPayMoney(payMoney);
order.setBalancePayment(payMoney > appUser.getAccountBalance() ? appUser.getAccountBalance() : payMoney);
+ order.setWeChatPayment(payMoney);
+ order.setResidueBalancePayment(order.getBalancePayment());
+ order.setResidueWeChatPayment(order.getWeChatPayment());
payMoney = payMoney > appUser.getAccountBalance() ? payMoney - appUser.getAccountBalance() : 0D;
@@ -1186,6 +1225,7 @@
accountChangeDetailService.insert(accountChangeDetail);
if(0 < payMoney){//还需要调起微信支付
+ order.setPayType(4);
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String out_trade_no = sdf.format(new Date()) + order.getId();
@@ -1283,7 +1323,7 @@
this.updateById(order);
//处理佣金和收入记录
- saveCommission(order);
+ saveCommissionYE(order);
}
return ResultUtil.success();
@@ -1306,7 +1346,12 @@
order.setOrderNo(transaction_id);
this.updateById(order);
//添加收入明细
- saveCommission(order);
+ if(order.getPayType() == 4){
+ saveCommissionWXANDYU(order);
+ }
+ if(order.getPayType() == 1){
+ saveCommissionWX(order);
+ }
pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
if(null != order.getDriverId()) {
@@ -1401,12 +1446,423 @@
/**
- * 处理订单收入及分佣抽成
+ * 微信支付分佣
* @param order
* @return
* @throws Exception
*/
- public void saveCommission(Order order) throws Exception{
+ public void saveCommissionWX(Order order) throws Exception{
+ Driver driver = driverService.selectById(order.getDriverId());
+ AppUser appUser = appUserService.selectById(order.getUserId());
+
+ //首单积分奖励
+ //司机推荐首单收入
+ List<Integer> state = Arrays.asList(107, 108, 109);
+ int count = this.selectCount(new EntityWrapper<Order>().eq("userId", 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);
+ }
+
+
+
+ //todo 司机订单收入归并到佣金中一起提现
+ SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
+ if(null != systemConfig){
+ JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+ Double num2 = jsonObject.getDouble("num2");
+ Double num3 = jsonObject.getDouble("num3");
+ if(order.getOrderMoney().compareTo(num2) >= 0){//订单金额大于num2开始分佣
+
+ SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
+ if(null != systemConfig1){
+ JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
+ //司机推荐用户收入
+ if(null != appUser.getInviterType() && appUser.getInviterType() == 2){
+ 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.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setExplain("邀请用户奖励");
+ accountChangeDetail.setCreateTime(new Date());
+ driver1.setCommission(driver1.getCommission() + num1);
+ accountChangeDetail.setNewData(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);
+
+ //订单分账
+ fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num1, 1);
+ }
+ num3 = (num3 >= num1 ? num3 - num1 : 0);
+ }
+
+ //开始处理层级抽佣
+ if(num3 > 0 && null != driver & 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());//二级司机
+ if(null != driver2 && null != driver2.getInviterType() && driver2.getInviterType() == 2){
+ Driver driver3 = driverService.selectById(driver2.getInviterId());//三级级司机
+ 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){
+ Revenue revenue = new Revenue();
+ revenue.setType(2);
+ revenue.setUserType(2);
+ revenue.setUserId(driver1.getId());
+ revenue.setOrderId(order.getId());
+ revenue.setAmount(num5);
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ 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.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setCreateTime(new Date());
+ driver1.setCommission(driver1.getCommission() + num5);
+ accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+ driverService.updateById(driver1);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //订单分账
+ fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num5, 1);
+
+ num3 = (num3 >= num5 ? num3 - num5 : 0);
+ }
+ num6 = (num3 >= num6 ? num6 : num3);
+ if(num6 > 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.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver2.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOldData(driver2.getCouponBalance() + driver2.getCommission());
+ accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setCreateTime(new Date());
+ driver2.setCommission(driver2.getCommission() + num6);
+ accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
+ driverService.updateById(driver2);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //订单分账
+ fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num6, 1);
+ num3 = (num3 >= num6 ? num3 - num6 : 0);
+ }
+ num7 = (num3 >= num7 ? num7 : num3);
+ if(num7 > 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.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver3.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOldData(driver3.getCouponBalance() + driver3.getCommission());
+ accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setCreateTime(new Date());
+ driver3.setCommission(driver3.getCommission() + num7);
+ accountChangeDetail.setNewData(driver3.getCouponBalance() + driver3.getCommission());
+ driverService.updateById(driver3);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //订单分账
+ fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num7, 1);
+
+ num3 = (num3 >= num7 ? num3 - num7 : 0);
+ }
+ }else{
+ Double num3_ = jsonObject1.getDouble("num3");
+ Double num4 = jsonObject1.getDouble("num4");
+ num3_ = (num3 >= num3_ ? num3_ : num3);
+ if(num3_ > 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.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ 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.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setCreateTime(new Date());
+ driver1.setCommission(driver1.getCommission() + num3_);
+ accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+ driverService.updateById(driver1);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //订单分账
+ fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num3_, 1);
+
+ num3 = (num3 >= num3_ ? num3 - num3_ : 0);
+ }
+ num4 = (num3 >= num4 ? num4 : num3);
+ if(num4 > 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.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver2.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOldData(driver2.getCouponBalance() + driver2.getCommission());
+ accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setCreateTime(new Date());
+ driver2.setCommission(driver2.getCommission() + num4);
+ accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
+ driverService.updateById(driver2);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //订单分账
+ fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num4, 1);
+
+ num3 = (num3 >= num4 ? num3 - num4 : 0);
+ }
+ }
+ }else{
+ Double num2_ = jsonObject1.getDouble("num2");
+ 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(num2_);
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ 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.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setCreateTime(new Date());
+ driver1.setCommission(driver1.getCommission() + num2_);
+ accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+ driverService.updateById(driver1);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //订单分账
+ fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num2_, 1);
+
+ num3 = (num3 >= num2_ ? num3 - num2_ : 0);
+ }
+ }
+ }
+ //处理代理商抽佣
+ if(num3 > 0 && null != driver){
+ Revenue revenue = new Revenue();
+ revenue.setType(1);
+ revenue.setUserType(3);
+ revenue.setUserId(driver.getAgentId());
+ revenue.setOrderId(order.getId());
+ revenue.setAmount(num3);
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ Agent agent = agentService.selectById(driver.getAgentId());
+ //订单分账
+ fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num3, 1);
+ }
+ }
+ }
+ }
+
+ driver = driverService.selectById(order.getDriverId());
+ //司机订单收入
+ Revenue revenue = new Revenue();
+ revenue.setType(1);
+ revenue.setUserType(2);
+ revenue.setUserId(driver.getId());
+ revenue.setOrderId(order.getId());
+ revenue.setAmount(order.getPayMoney() + order.getDiscountedPrice() + order.getDiscountAmount());
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(1);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
+ driver.setCommission(driver.getCommission() + order.getPayMoney());
+ accountChangeDetail.setExplain("订单收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
+ //订单收入
+ fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), order.getPayMoney(), 1);
+
+ if(null != order.getCouponId()){
+ accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
+ driver.setCommission(driver.getCommission() + order.getDiscountedPrice());
+ accountChangeDetail.setExplain("优惠券收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(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(order.getDiscountedPrice()) >= 0){
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
+
+ }
+ if(null != order.getDiscountAmount() && 0 < order.getDiscountAmount()){
+ accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(1);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
+ driver.setCommission(driver.getCommission() + order.getDiscountAmount());
+ accountChangeDetail.setExplain("折扣优惠收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //补贴中分账
+ Double discountedPrice = order.getDiscountAmount();
+ 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(order.getDiscountAmount()) >= 0){
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
+ }
+ }
+
+
+ /**
+ * 余额支付分账
+ * @param order
+ * @throws Exception
+ */
+ public void saveCommissionYE(Order order) throws Exception{
//司机收入和代理商抽成(先分佣，后抽成)
//司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
Driver driver = driverService.selectById(order.getDriverId());
@@ -1439,19 +1895,19 @@
- Double payMoney = order.getPayMoney();//todo 司机订单收入归并到佣金中一起提现
+ //todo 司机订单收入归并到佣金中一起提现
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
if(null != systemConfig){
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
Double num2 = jsonObject.getDouble("num2");
Double num3 = jsonObject.getDouble("num3");
if(order.getOrderMoney().compareTo(num2) >= 0){//订单金额大于num2开始分佣
- payMoney = payMoney - num3;//司机收入
+
SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
if(null != systemConfig1){
JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
- //司机推荐首单收入
- if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && count == 1){
+ //司机推荐用户收入
+ if(null != appUser.getInviterType() && appUser.getInviterType() == 2){
Double num1 = jsonObject1.getDouble("num1");
num1 = (num3 >= num1 ? num1 : num3);
@@ -1464,7 +1920,7 @@
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
- accountChangeDetail.setExplain("邀请用户首单奖励");
+ accountChangeDetail.setExplain("邀请用户奖励");
accountChangeDetail.setCreateTime(new Date());
driver1.setCommission(driver1.getCommission() + num1);
accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
@@ -1480,24 +1936,24 @@
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
- //补贴中分账
- Double num1_ = num1;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ //用户充值记录分账
+ Double num1_1 = num1;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
- if(surplusDividedAmount.compareTo(num1_) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num1_, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num1_);
+ if(surplusDividedAmount.compareTo(num1_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num1_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num1_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
rechargeRecord.setSurplusDividedAmount(0D);
rechargeRecordService.updateById(rechargeRecord);
- num1_ -= surplusDividedAmount;
+ num1_1 -= surplusDividedAmount;
}else{
break;
}
@@ -1542,24 +1998,24 @@
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- //补贴中分账
- Double num5_ = num5;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ //用户充值记录分账
+ Double num5_1 = num5;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
- if(surplusDividedAmount.compareTo(num5_) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num5_, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num5_);
+ if(surplusDividedAmount.compareTo(num5_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num5_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num5_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
rechargeRecord.setSurplusDividedAmount(0D);
rechargeRecordService.updateById(rechargeRecord);
- num5_ -= surplusDividedAmount;
+ num5_1 -= surplusDividedAmount;
}else{
break;
}
@@ -1593,31 +2049,29 @@
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- //补贴中分账
- Double num6_ = num6;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ //用户充值记录分账
+ Double num6_1 = num6;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
- if(surplusDividedAmount.compareTo(num6_) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), num6_, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num6_);
+ if(surplusDividedAmount.compareTo(num6_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num6_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num6_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
rechargeRecord.setSurplusDividedAmount(0D);
rechargeRecordService.updateById(rechargeRecord);
- num6_ -= surplusDividedAmount;
+ num6_1 -= surplusDividedAmount;
}else{
break;
}
}
}
-
-
num3 = (num3 >= num6 ? num3 - num6 : 0);
}
num7 = (num3 >= num7 ? num7 : num3);
@@ -1645,24 +2099,24 @@
driverService.updateById(driver3);
accountChangeDetailService.saveData(accountChangeDetail);
- //补贴中分账
- Double num7_ = num7;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ //用户充值记录分账
+ Double num7_1 = num7;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
- if(surplusDividedAmount.compareTo(num7_) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver3.getMerchantNumber(), num7_, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num7_);
+ if(surplusDividedAmount.compareTo(num7_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num7_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num7_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver3.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
+ ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
rechargeRecord.setSurplusDividedAmount(0D);
rechargeRecordService.updateById(rechargeRecord);
- num7_ -= surplusDividedAmount;
+ num7_1 -= surplusDividedAmount;
}else{
break;
}
@@ -1699,21 +2153,21 @@
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- //补贴中分账
+ //用户充值记录分账
Double num3_1 = num3_;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num3_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num3_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(10000 == fengzhang.getCode()){
rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
rechargeRecord.setSurplusDividedAmount(0D);
rechargeRecordService.updateById(rechargeRecord);
num3_1 -= surplusDividedAmount;
@@ -1750,21 +2204,21 @@
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- //补贴中分账
+ //用户充值记录分账
Double num4_1 = num4;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num4_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), num4_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num4_1, 3);
+ if(10000 == fengzhang.getCode()){
rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num4_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
rechargeRecord.setSurplusDividedAmount(0D);
rechargeRecordService.updateById(rechargeRecord);
num4_1 -= surplusDividedAmount;
@@ -1804,21 +2258,21 @@
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- //补贴中分账
+ //用户充值记录分账
Double num2_1 = num2_;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num2_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num2_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num2_1, 3);
+ if(10000 == fengzhang.getCode()){
rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num2_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
rechargeRecord.setSurplusDividedAmount(0D);
rechargeRecordService.updateById(rechargeRecord);
num2_1 -= surplusDividedAmount;
@@ -1844,22 +2298,21 @@
revenueService.insert(revenue);
Agent agent = agentService.selectById(driver.getAgentId());
+ //用户充值记录分账
Double num3_1 = num3;
-
- //补贴中分账
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num3_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), agent.getMerchantNumber(), num3_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
+ ResultUtil fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(10000 == fengzhang.getCode()){
rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), agent.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
+ ResultUtil fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
rechargeRecord.setSurplusDividedAmount(0D);
rechargeRecordService.updateById(rechargeRecord);
num3_1 -= surplusDividedAmount;
@@ -1880,23 +2333,847 @@
revenue.setUserType(2);
revenue.setUserId(driver.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(payMoney + order.getDiscountedPrice() + order.getDiscountAmount());
+ revenue.setAmount(order.getPayMoney() + order.getDiscountedPrice() + order.getDiscountAmount());
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver.getId());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(1);
- accountChangeDetail.setOrderId(order.getId());
- accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
- driver.setCommission(driver.getCommission() + payMoney);
- accountChangeDetail.setExplain("订单收入");
- accountChangeDetail.setCreateTime(new Date());
+ AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
+ accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail1.setUserType(2);
+ accountChangeDetail1.setUserId(driver.getId());
+ accountChangeDetail1.setType(1);
+ accountChangeDetail1.setChangeType(1);
+ accountChangeDetail1.setOrderId(order.getId());
+ accountChangeDetail1.setOldData(driver.getCouponBalance() + driver.getCommission());
+ driver.setCommission(driver.getCommission() + order.getPayMoney());
+ accountChangeDetail1.setExplain("订单收入");
+ accountChangeDetail1.setCreateTime(new Date());
+ accountChangeDetail1.setNewData(driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail1);
+
+ //用户充值记录分账
+ Double num3_1 = order.getPayMoney();
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.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, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(2, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num3_1 -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
+
+
if(null != order.getCouponId()){
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
driver.setCommission(driver.getCommission() + order.getDiscountedPrice());
+ accountChangeDetail.setExplain("优惠券收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //补贴中分账
+ Double discountedPrice = order.getDiscountedPrice();
+ List<RechargeRecord> rechargeRecords1 = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords1) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(order.getDiscountedPrice()) >= 0){
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
+
+ }
+ if(null != order.getDiscountAmount() && 0 < order.getDiscountAmount()){
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(1);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
+ driver.setCommission(driver.getCommission() + order.getDiscountAmount());
+ accountChangeDetail.setExplain("折扣优惠收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
+ //补贴中分账
+ Double discountedPrice = order.getDiscountAmount();
+ List<RechargeRecord> rechargeRecords1 = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords1) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(order.getDiscountAmount()) >= 0){
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
+ }
+ }
+
+
+ /**
+ * 微信+余额支付分账
+ * @param order
+ * @throws Exception
+ */
+ public void saveCommissionWXANDYU(Order order) throws Exception{
+ //司机收入和代理商抽成(先分佣，后抽成)
+ //司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
+ Driver driver = driverService.selectById(order.getDriverId());
+ AppUser appUser = appUserService.selectById(order.getUserId());
+
+ //首单积分奖励
+ //司机推荐首单收入
+ List<Integer> state = Arrays.asList(107, 108, 109);
+ int count = this.selectCount(new EntityWrapper<Order>().eq("userId", 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);
+ }
+
+
+
+ //todo 司机订单收入归并到佣金中一起提现
+ SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
+ if(null != systemConfig){
+ JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+ Double num2 = jsonObject.getDouble("num2");
+ Double num3 = jsonObject.getDouble("num3");
+ if(order.getOrderMoney().compareTo(num2) >= 0){//订单金额大于num2开始分佣
+ SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
+ if(null != systemConfig1){
+ JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
+ //司机推荐用户收入
+ if(null != appUser.getInviterType() && appUser.getInviterType() == 2){
+ 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.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setExplain("邀请用户奖励");
+ accountChangeDetail.setCreateTime(new Date());
+ driver1.setCommission(driver1.getCommission() + num1);
+ accountChangeDetail.setNewData(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);
+
+ Double num1_1 = num1;
+ Double residueWeChatPayment = order.getResidueWeChatPayment();
+ Double residueBalancePayment = order.getResidueBalancePayment();
+ if(residueWeChatPayment.compareTo(num1_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num1_1, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num1_1);
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(0D);
+ num1_1 -= residueWeChatPayment;
+
+ //账户余额继续分账
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num1_1) >= 0){
+ ResultUtil fengzhang1 = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num1_1, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num1_1);
+ rechargeRecordService.updateById(rechargeRecord);
+ order.setResidueBalancePayment(residueBalancePayment - num1_1);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang1 = fengzhang(2, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num1_1 -= surplusDividedAmount;
+ order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+ }else{
+ break;
+ }
+ }
+ }
+ }
+
+ }
+ num3 = (num3 >= num1 ? num3 - num1 : 0);
+ }
+
+ //开始处理层级抽佣
+ if(num3 > 0 && null != driver & 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());//二级司机
+ if(null != driver2 && null != driver2.getInviterType() && driver2.getInviterType() == 2){
+ Driver driver3 = driverService.selectById(driver2.getInviterId());//三级级司机
+ 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){
+ Revenue revenue = new Revenue();
+ revenue.setType(2);
+ revenue.setUserType(2);
+ revenue.setUserId(driver1.getId());
+ revenue.setOrderId(order.getId());
+ revenue.setAmount(num5);
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ 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.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setCreateTime(new Date());
+ driver1.setCommission(driver1.getCommission() + num5);
+ accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+ driverService.updateById(driver1);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //订单分账
+ Double num5_1 = num5;
+ Double residueWeChatPayment = order.getResidueWeChatPayment();
+ Double residueBalancePayment = order.getResidueBalancePayment();
+ if(residueWeChatPayment.compareTo(num5_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num5_1, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num5_1);
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(0D);
+ num5_1 -= residueWeChatPayment;
+
+ //账户余额继续分账
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num5_1) >= 0){
+ ResultUtil fengzhang1 = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num5_1, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num5_1);
+ rechargeRecordService.updateById(rechargeRecord);
+ order.setResidueBalancePayment(residueBalancePayment - num5_1);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang1 = fengzhang(2, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num5_1 -= surplusDividedAmount;
+ order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+ }else{
+ break;
+ }
+ }
+ }
+ }
+
+ num3 = (num3 >= num5 ? num3 - num5 : 0);
+ }
+ num6 = (num3 >= num6 ? num6 : num3);
+ if(num6 > 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.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver2.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOldData(driver2.getCouponBalance() + driver2.getCommission());
+ accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setCreateTime(new Date());
+ driver2.setCommission(driver2.getCommission() + num6);
+ accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
+ driverService.updateById(driver2);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //订单分账
+ Double num6_1 = num6;
+ Double residueWeChatPayment = order.getResidueWeChatPayment();
+ Double residueBalancePayment = order.getResidueBalancePayment();
+ if(residueWeChatPayment.compareTo(num6_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num6_1, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num6_1);
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(0D);
+ num6_1 -= residueWeChatPayment;
+
+ //账户余额继续分账
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num6_1) >= 0){
+ ResultUtil fengzhang1 = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num6_1, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num6_1);
+ rechargeRecordService.updateById(rechargeRecord);
+ order.setResidueBalancePayment(residueBalancePayment - num6_1);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang1 = fengzhang(2, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num6_1 -= surplusDividedAmount;
+ order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+ }else{
+ break;
+ }
+ }
+ }
+ }
+ num3 = (num3 >= num6 ? num3 - num6 : 0);
+ }
+ num7 = (num3 >= num7 ? num7 : num3);
+ if(num7 > 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.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver3.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOldData(driver3.getCouponBalance() + driver3.getCommission());
+ accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setCreateTime(new Date());
+ driver3.setCommission(driver3.getCommission() + num7);
+ accountChangeDetail.setNewData(driver3.getCouponBalance() + driver3.getCommission());
+ driverService.updateById(driver3);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //订单分账
+ Double num7_1 = num7;
+ Double residueWeChatPayment = order.getResidueWeChatPayment();
+ Double residueBalancePayment = order.getResidueBalancePayment();
+ if(residueWeChatPayment.compareTo(num7_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num7_1, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num7_1);
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(0D);
+ num7_1 -= residueWeChatPayment;
+
+ //账户余额继续分账
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num7_1) >= 0){
+ ResultUtil fengzhang1 = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num7_1, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num7_1);
+ rechargeRecordService.updateById(rechargeRecord);
+ order.setResidueBalancePayment(residueBalancePayment - num7_1);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang1 = fengzhang(2, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num7_1 -= surplusDividedAmount;
+ order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+ }else{
+ break;
+ }
+ }
+ }
+ }
+
+ num3 = (num3 >= num7 ? num3 - num7 : 0);
+ }
+ }else{
+ Double num3_ = jsonObject1.getDouble("num3");
+ Double num4 = jsonObject1.getDouble("num4");
+ num3_ = (num3 >= num3_ ? num3_ : num3);
+ if(num3_ > 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.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ 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.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setCreateTime(new Date());
+ driver1.setCommission(driver1.getCommission() + num3_);
+ accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+ driverService.updateById(driver1);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //订单分账
+ Double num3_1 = num3_;
+ Double residueWeChatPayment = order.getResidueWeChatPayment();
+ Double residueBalancePayment = order.getResidueBalancePayment();
+ if(residueWeChatPayment.compareTo(num3_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num3_1, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num3_1);
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(0D);
+ num3_1 -= residueWeChatPayment;
+
+ //账户余额继续分账
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num3_1) >= 0){
+ ResultUtil fengzhang1 = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
+ rechargeRecordService.updateById(rechargeRecord);
+ order.setResidueBalancePayment(residueBalancePayment - num3_1);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang1 = fengzhang(2, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num3_1 -= surplusDividedAmount;
+ order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+ }else{
+ break;
+ }
+ }
+ }
+ }
+
+ num3 = (num3 >= num3_ ? num3 - num3_ : 0);
+ }
+ num4 = (num3 >= num4 ? num4 : num3);
+ if(num4 > 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.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver2.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOldData(driver2.getCouponBalance() + driver2.getCommission());
+ accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setCreateTime(new Date());
+ driver2.setCommission(driver2.getCommission() + num4);
+ accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
+ driverService.updateById(driver2);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //订单分账
+ Double num4_1 = num4;
+ Double residueWeChatPayment = order.getResidueWeChatPayment();
+ Double residueBalancePayment = order.getResidueBalancePayment();
+ if(residueWeChatPayment.compareTo(num4_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num4_1, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num4_1);
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(0D);
+ num4_1 -= residueWeChatPayment;
+
+ //账户余额继续分账
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num4_1) >= 0){
+ ResultUtil fengzhang1 = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num4_1, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num4_1);
+ rechargeRecordService.updateById(rechargeRecord);
+ order.setResidueBalancePayment(residueBalancePayment - num4_1);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang1 = fengzhang(2, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num4_1 -= surplusDividedAmount;
+ order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+ }else{
+ break;
+ }
+ }
+ }
+ }
+
+ num3 = (num3 >= num4 ? num3 - num4 : 0);
+ }
+ }
+ }else{
+ Double num2_ = jsonObject1.getDouble("num2");
+ 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(num2_);
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ 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.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setCreateTime(new Date());
+ driver1.setCommission(driver1.getCommission() + num2_);
+ accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+ driverService.updateById(driver1);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //订单分账
+ Double num2_1 = num2_;
+ Double residueWeChatPayment = order.getResidueWeChatPayment();
+ Double residueBalancePayment = order.getResidueBalancePayment();
+ if(residueWeChatPayment.compareTo(num2_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num2_1, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num2_1);
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(0D);
+ num2_1 -= residueWeChatPayment;
+
+ //账户余额继续分账
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num2_1) >= 0){
+ ResultUtil fengzhang1 = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num2_1, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num2_1);
+ rechargeRecordService.updateById(rechargeRecord);
+ order.setResidueBalancePayment(residueBalancePayment - num2_1);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang1 = fengzhang(2, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num2_1 -= surplusDividedAmount;
+ order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+ }else{
+ break;
+ }
+ }
+ }
+ }
+
+ num3 = (num3 >= num2_ ? num3 - num2_ : 0);
+ }
+ }
+ }
+ //处理代理商抽佣
+ if(num3 > 0 && null != driver){
+ Revenue revenue = new Revenue();
+ revenue.setType(1);
+ revenue.setUserType(3);
+ revenue.setUserId(driver.getAgentId());
+ revenue.setOrderId(order.getId());
+ revenue.setAmount(num3);
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ Agent agent = agentService.selectById(driver.getAgentId());
+ //订单分账
+ Double num3_1 = num3;
+ Double residueWeChatPayment = order.getResidueWeChatPayment();
+ Double residueBalancePayment = order.getResidueBalancePayment();
+ if(residueWeChatPayment.compareTo(num3_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num3_1, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num3_1);
+ }else{
+ ResultUtil fengzhang = fengzhang(1, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(0D);
+ num3_1 -= residueWeChatPayment;
+
+ //账户余额继续分账
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num3_1) >= 0){
+ ResultUtil fengzhang1 = fengzhang(1, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
+ rechargeRecordService.updateById(rechargeRecord);
+ order.setResidueBalancePayment(residueBalancePayment - num3_1);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang1 = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num3_1 -= surplusDividedAmount;
+ order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+ }else{
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ driver = driverService.selectById(order.getDriverId());
+ //司机订单收入
+ Revenue revenue = new Revenue();
+ revenue.setType(1);
+ revenue.setUserType(2);
+ revenue.setUserId(driver.getId());
+ revenue.setOrderId(order.getId());
+ revenue.setAmount(order.getPayMoney() + order.getDiscountedPrice() + order.getDiscountAmount());
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
+ accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail1.setUserType(2);
+ accountChangeDetail1.setUserId(driver.getId());
+ accountChangeDetail1.setType(1);
+ accountChangeDetail1.setChangeType(1);
+ accountChangeDetail1.setOrderId(order.getId());
+ accountChangeDetail1.setOldData(driver.getCouponBalance() + driver.getCommission());
+ driver.setCommission(driver.getCommission() + order.getPayMoney());
+ accountChangeDetail1.setExplain("订单收入");
+ accountChangeDetail1.setCreateTime(new Date());
+ accountChangeDetail1.setNewData(driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail1);
+
+ //订单分账
+ Double num3_1 = order.getPayMoney();
+ Double residueWeChatPayment = order.getResidueWeChatPayment();
+ Double residueBalancePayment = order.getResidueBalancePayment();
+ if(residueWeChatPayment.compareTo(num3_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num3_1, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(order.getResidueWeChatPayment() - num3_1);
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(0D);
+ num3_1 -= residueWeChatPayment;
+
+ //账户余额继续分账
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num3_1) >= 0){
+ ResultUtil fengzhang1 = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
+ rechargeRecordService.updateById(rechargeRecord);
+ order.setResidueBalancePayment(residueBalancePayment - num3_1);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang1 = fengzhang(2, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num3_1 -= surplusDividedAmount;
+ order.setResidueBalancePayment(residueBalancePayment - surplusDividedAmount);
+ }else{
+ break;
+ }
+ }
+ }
+ }
+ this.updateById(order);
+
+ if(null != order.getCouponId()){
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
+ driver.setCommission(driver.getCommission() + order.getDiscountedPrice());
+ accountChangeDetail.setExplain("优惠券收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
//补贴中分账
Double discountedPrice = order.getDiscountedPrice();
List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
@@ -1923,7 +3200,20 @@
}
if(null != order.getDiscountAmount() && 0 < order.getDiscountAmount()){
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(1);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
driver.setCommission(driver.getCommission() + order.getDiscountAmount());
+ accountChangeDetail.setExplain("折扣优惠收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
//补贴中分账
Double discountedPrice = order.getDiscountAmount();
List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
@@ -1948,156 +3238,20 @@
}
}
}
- accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
- driverService.updateById(driver);
- accountChangeDetailService.saveData(accountChangeDetail);
-
- //支付成功---->异步分账----->10s钟后再进行确认收货
- //确认收货后才能进行提现（结算接口）
- //异步分账
-
- if(order.getPayType() == 1){//微信支付
- //分账司机收入
- fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), order.getOrderNo(), payMoney, 1);
-
- if(payMoney.compareTo(order.getPayMoney()) < 0){//司机获取部分需将剩余的分给平台
- Double money = order.getPayMoney() - payMoney + order.getDiscountedPrice();
- fengzhang(3, null, "553021440975", order.getId().longValue(), order.getOrderNo(), money, 1);
- }
- }
- if(order.getPayType() == 2){//余额支付(使用用户的充值数据分账)
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", order.getUserId())
- .eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
- for (RechargeRecord rechargeRecord : rechargeRecords) {
- Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
- if(surplusDividedAmount.compareTo(payMoney) >= 0){
- //分账司机收入
- ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getOrderNumber(), payMoney, 1);
- if(10000 == fengzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - payMoney);
- rechargeRecordService.updateById(rechargeRecord);
- }
- break;
- }else{
- ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
- if(10000 == fengzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(0D);
- rechargeRecordService.updateById(rechargeRecord);
- payMoney -= surplusDividedAmount;
- }else{
- break;
- }
- }
- }
-
-
-
- if(payMoney.compareTo(order.getPayMoney()) < 0){//司机获取部分需将剩余的分给平台
- Double money = order.getPayMoney() - payMoney;
-
- List<RechargeRecord> rechargeRecords1 = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", order.getUserId())
- .eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
- for (RechargeRecord rechargeRecord : rechargeRecords1) {
- Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
- if(surplusDividedAmount.compareTo(money) >= 0){
- //分账司机收入
- ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getOrderNumber(), money, 1);
- if(10000 == fengzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - money);
- rechargeRecordService.updateById(rechargeRecord);
- }
- break;
- }else{
- ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
- if(10000 == fengzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(0D);
- rechargeRecordService.updateById(rechargeRecord);
- payMoney -= surplusDividedAmount;
- }else{
- break;
- }
- }
- }
- }
- }
-
- if(order.getPayType() == 4){//微信+余额(使用用户的充值数据分账)
- Double xj = order.getPayMoney() - order.getBalancePayment();
- if(xj > 0){
- //分账司机收入
- fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), order.getOrderNo(), payMoney, 1);
-
- if(payMoney.compareTo(order.getPayMoney()) < 0){//司机获取部分需将剩余的分给平台
- Double money = order.getPayMoney() - payMoney + order.getDiscountedPrice();
- fengzhang(3, null, "553021440975", order.getId().longValue(), order.getOrderNo(), money, 1);
- }
- }else{
- Double balancePayment = order.getBalancePayment();
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", order.getUserId())
- .eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
- for (RechargeRecord rechargeRecord : rechargeRecords) {
- Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
- if(surplusDividedAmount.compareTo(balancePayment) >= 0){
- //分账司机收入
- ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getOrderNumber(), balancePayment, 1);
- if(10000 == fengzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - balancePayment);
- rechargeRecordService.updateById(rechargeRecord);
- }
- break;
- }else{
- ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
- if(10000 == fengzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(0D);
- rechargeRecordService.updateById(rechargeRecord);
- balancePayment -= surplusDividedAmount;
- }else{
- break;
- }
- }
- }
-
- if(payMoney.compareTo(order.getPayMoney()) < 0){//司机获取部分需将剩余的分给平台
- Double money = order.getPayMoney() - payMoney;
-
- List<RechargeRecord> rechargeRecords1 = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", order.getUserId())
- .eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
- for (RechargeRecord rechargeRecord : rechargeRecords1) {
- Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
- if(surplusDividedAmount.compareTo(money) >= 0){
- //分账司机收入
- ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getOrderNumber(), money, 1);
- if(10000 == fengzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - money);
- rechargeRecordService.updateById(rechargeRecord);
- }
- break;
- }else{
- ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
- if(10000 == fengzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(0D);
- rechargeRecordService.updateById(rechargeRecord);
- payMoney -= surplusDividedAmount;
- }else{
- break;
- }
- }
- }
- }
- }
- }
}
+
/**
* 分账操作
* @param amount
*/
- public ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, String merOrderId, Double amount, Integer sourceType){
+ public ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, Integer rechargeRecordId, String merOrderId, Double amount, Integer sourceType){
DivisionRecord divisionRecord = new DivisionRecord();
divisionRecord.setUserType(userType);
divisionRecord.setUserId(id);
divisionRecord.setOrderId(orderId);
+ divisionRecord.setRechargeRecordId(rechargeRecordId);
divisionRecord.setSourceType(sourceType);
divisionRecord.setAmount(amount);
divisionRecord.setMerchantNumber(merchantNumber);
--
Gitblit v1.7.1