From f938ddb895cdcdfc925cfaa268c0ed8638f3b2a3 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 17 八月 2023 11:39:25 +0800
Subject: [PATCH] update
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 1275 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 775 insertions(+), 500 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 967297b..02a3d6b 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,9 @@
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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -46,6 +49,8 @@
*/
@Service
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
+
+ Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
@Autowired
private ISystemConfigService systemConfigService;
@@ -107,6 +112,12 @@
@Autowired
private IRechargeRecordService rechargeRecordService;
+ @Autowired
+ private IOrderService orderService;
+
+ @Autowired
+ private ICompanyFundFlowService companyFundFlowService;
+
@Value("${wx.appletsAppid}")
private String appletsAppid;
@@ -145,7 +156,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){
@@ -160,7 +173,7 @@
int i = 0;
Double scope = 5D;
while (true){
- List<NearbyDriverWarpper> nearbyDriverWarppers = driverService.queryDriverPosition(estimatedCosts.getLng().toString(), estimatedCosts.getLat().toString(), scope);
+ List<NearbyDriverWarpper> nearbyDriverWarppers = driverService.queryDriverPosition(estimatedCosts.getStartLng().toString(), estimatedCosts.getStartLat().toString(), scope);
if(nearbyDriverWarppers.size() == 0){
scope += 5;
i++;
@@ -199,9 +212,10 @@
* @return
*/
public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city){
- distance = new BigDecimal(distance).setScale(0, BigDecimal.ROUND_UP).doubleValue();
order = getOrderInitialPrice(order);
- SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5));
+ Integer driverId = order.getDriverId();
+ Driver driver = driverService.selectById(driverId);
+ SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5).eq("companyId",driver.getBranchOfficeId()));
if(null == systemConfig){
if(type == 1){//预估金额
order.setEstimatedPrice(0D);
@@ -214,7 +228,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");
@@ -259,12 +273,14 @@
order.setStartDistance(distance);//起步里程
order.setStartPrice(num4);//起步价
}else{
- BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num3)).setScale(2, BigDecimal.ROUND_HALF_EVEN);//超出起步里程
- BigDecimal divide = subtract.divide(new BigDecimal(num5), 2, BigDecimal.ROUND_HALF_EVEN);
- BigDecimal multiply = divide.multiply(new BigDecimal(num6));
+ Double distance1 = distance;//原始里程
order.setStartDistance(num3);//起步里程
order.setStartPrice(num4);//起步价
- order.setOverDriveDistance(subtract.doubleValue());//超出起步里程
+ order.setOverDriveDistance(new BigDecimal(distance1 - num3).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//超出起步里程
+
+ distance = new BigDecimal(distance).setScale(0, RoundingMode.UP).doubleValue();//向上取整
+ BigDecimal divide = new BigDecimal(distance - num3).divide(new BigDecimal(num5), 2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal multiply = divide.multiply(new BigDecimal(num6));
order.setOverDrivePrice(multiply.doubleValue());//超出起步里程费
//计算长途费（超出长途起始公里，费用开始按照长途规则计算。）
@@ -279,10 +295,10 @@
}
//计算长途里程超出的部分
if(distance.compareTo(num8) > 0){
- BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num8)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
- BigDecimal divide1 = subtract1.divide(new BigDecimal(num10), 2, BigDecimal.ROUND_HALF_EVEN);
+ order.setOverLongDistance(new BigDecimal(distance1 - num8).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//超出长途里程
+
+ BigDecimal divide1 = new BigDecimal(distance - num8).divide(new BigDecimal(num10), 2, BigDecimal.ROUND_HALF_EVEN);
BigDecimal multiply1 = divide1.multiply(new BigDecimal(num11));
- order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
}
}
@@ -300,26 +316,29 @@
Double num7 = extraCost.getDouble("num7");//恶劣天气超出公里
Double num8 = extraCost.getDouble("num8");//恶劣天气超出公里单价 X/公里
Double num9 = extraCost.getDouble("num9");//恶劣天气最高收取金额
+ Double num10 = extraCost.getDouble("num10");//节假日收费
+// Double num11 = extraCost.getDouble("num11");//恶劣天气最高收取金额
+// Double num12 = extraCost.getDouble("num12");//恶劣天气最高收取金额
//等待费用
- if(waitTime.compareTo(num1) >= 0){
- order.setWaitTime(num1);//等待时长
+ if(waitTime.compareTo(num1 * 60) >= 0){
+ order.setWaitTime(num1 * 60);//等待时长
order.setWaitTimePrice(num2);//等待费用
- Integer w = waitTime - num3;
- BigDecimal multiply = new BigDecimal(w).multiply(new BigDecimal(num4));
+ Integer w = waitTime - (num1 * 60);
+ BigDecimal multiply = new BigDecimal(w).divide(new BigDecimal(60), 0, RoundingMode.UP).multiply(new BigDecimal(num4));
order.setOutWaitTime(w);//等待时长超出分钟
order.setOutWaitTimePrice(multiply.doubleValue());//等待时长超出费用
}
//恶劣天气
- systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8));
+ systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8).eq("companyId",driver.getBranchOfficeId()));
if(null != systemConfig){
JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
Integer num11 = jsonObject1.getInteger("num1");//开启恶劣天气计价
if(1 == num11){
- boolean badWeather = WeatherUtil.isBadWeather(city);
- if(badWeather){
+// boolean badWeather = WeatherUtil.isBadWeather(city);
+// if(badWeather){
order.setBadWeatherDistance(num5);//恶劣天气公里
order.setBadWeatherPrice(num6);//恶劣天气费
if(distance.compareTo(num7) > 0){
@@ -339,14 +358,27 @@
order.setOverBadWeatherPrice(subtract.doubleValue());//恶劣天气超出公里费
}
}
- }
+// }
+ }
+ }
+
+
+
+ //节假日
+ systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 9).eq("companyId",driver.getBranchOfficeId()));
+ if(null != systemConfig){
+ JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
+ Integer num11 = jsonObject1.getInteger("num1");//开启恶劣天气计价
+ if(1 == num11){
+ BigDecimal bigDecimal = new BigDecimal(num10);
+ order.setHolidayPrice(bigDecimal.doubleValue());
}
}
//计算总金额
BigDecimal bigDecimal = new BigDecimal(order.getStartPrice() + order.getOverDrivePrice() + order.getLongDistancePrice() + order.getOverLongDistancePrice() +
- order.getWaitTimePrice() + order.getOutWaitTimePrice() + order.getBadWeatherPrice() + order.getOverBadWeatherPrice() - order.getDiscountAmount()).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ order.getWaitTimePrice() + order.getOutWaitTimePrice() + order.getBadWeatherPrice() + order.getOverBadWeatherPrice()+order.getHolidayPrice() - order.getDiscountAmount()).setScale(2, BigDecimal.ROUND_HALF_EVEN);
if(type == 1){//预估价
order.setEstimatedPrice(bigDecimal.doubleValue());
@@ -385,6 +417,7 @@
order.setCouponId(null);//优惠券
order.setDiscountAmount(0D);//折扣优惠金额
order.setDiscount(0D);//折扣
+ order.setHolidayPrice(0D);
return order;
}
@@ -449,6 +482,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));
@@ -473,7 +507,7 @@
for (Integer i = 0; i < travelOrder.getDriverNum(); i++) {
order.setId(null);
- order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3));
+ order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(5));
boolean insert = this.insert(order);
if(insert){
//推送状态
@@ -489,6 +523,7 @@
}
}
}
+ redisUtil.setStrValue("newOrder", "true");
return ResultUtil.success(order.getId());
}
@@ -500,6 +535,14 @@
*/
public void pushOrder(Long orderId){
try {
+ Order order = this.selectById(orderId);
+ /**
+ * 1.先找最大推单范围内的优推司机 -》 距离最近
+ * 没有1 - 》
+ * 2.按照后台推送配置在范围内查找合适司机
+ * 合适司：积分 > 评分 > 距离
+ * 3.司机没有接单直接将订单置入大厅
+ */
boolean lock = redisUtil.lock(5);
if(!lock){
int num1 = 1;
@@ -513,14 +556,12 @@
}
}
}
- Order order = this.selectById(orderId);
- /**
- * 1.先找最大推单范围内的优推司机 -》 距离最近
- * 没有1 - 》
- * 2.按照后台推送配置在范围内查找合适司机
- * 合适司：积分 > 评分 > 距离
- * 3.司机没有接单直接将订单置入大厅
- */
+ 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();
@@ -548,7 +589,7 @@
YouTuiDriver youTuiDriver1 = null;
if(driverIds.size() > 0){
List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds)
- .eq("state", 2).last(" and (surplusQuantity > 0 or now() < endTime) and now() < failureTime"));
+ .eq("state", 2).last(" and surplusQuantity > 0 and now() < endTime and now() < failureTime"));
Double d = null;
for (YouTuiDriver youTuiDriver : youTuiDrivers) {
String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
@@ -556,7 +597,8 @@
continue;
}
Driver driver1 = driverService.selectById(youTuiDriver.getDriverId());
- if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1){
+ int count = orderService.selectCount(new EntityWrapper<Order>().eq("driverId", youTuiDriver.getDriverId()).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201, 401)));
+ if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1 || count > 0){
continue;
}
DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId()).eq("status", 1));
@@ -612,6 +654,10 @@
if(null == driverWork){
continue;
}
+ int count = orderService.selectCount(new EntityWrapper<Order>().eq("driverId", driver1.getId()).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201, 401)));
+ if(count > 0){
+ continue;
+ }
if(integral == null || integral.compareTo(driver1.getIntegral()) < 0){//积分大
integral = driver1.getIntegral();
@@ -659,13 +705,20 @@
@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);
-
+ if(order1.getState() != 101 && order1.getState() != 201 && order1.getState() != 301 && order1.getDriverId().compareTo(driver1.getId()) != 0){
driver1.setServerStatus(1);
driverService.updateById(driver1);
+ }
+
+ if(order1.getState() == 201 || order1.getState() == 301 || (order1.getState() == 101 && null == order1.getDriverId())){
+ driver1.setServerStatus(1);
+ driverService.updateById(driver1);
+ }
+ if(order1.getState() == 201 || (order1.getState() == 101 && null == order1.getDriverId())){
+ order1.setHallOrder(1);
+ OrderServiceImpl.this.updateById(order1);
ExtraPushOrder(order);
+ redisUtil.setStrValue("lobbyOrder", "true");
}
}
}, num4 * 1000);
@@ -673,6 +726,7 @@
order.setHallOrder(1);
this.updateById(order);
ExtraPushOrder(order);
+ redisUtil.setStrValue("lobbyOrder", "true");
}
redisUtil.unlock();
}catch (Exception e){
@@ -712,7 +766,7 @@
for (Driver driver1 : drivers) {
String value = redisUtil.getValue("DRIVER" + driver1.getId());
if (ToolUtil.isEmpty(value)) {
- return;
+ continue;
}
pushUtil.pushGrabOrderExtras(driver1.getId(), 2);
}
@@ -744,6 +798,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){
@@ -761,8 +816,10 @@
PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
pushOrderInfoWarpper.setId(order.getId());
pushOrderInfoWarpper.setState(order.getState());
+ pushOrderInfoWarpper.setCancelObject(1);
pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
}
+ redisUtil.setStrValue("cancelOrder", "true");
return ResultUtil.success();
}
@@ -802,6 +859,12 @@
@Override
public ResultUtil editOrderEndAddress(Integer uid, EditOrderEndAddress editOrderEndAddress) throws Exception {
Order order = this.selectById(editOrderEndAddress.getOrderId());
+
+ String endAddress = editOrderEndAddress.getEndAddress();
+ endAddress = endAddress.replaceAll("& #40;", "(");
+ endAddress = endAddress.replaceAll("& #41;", ")");
+ editOrderEndAddress.setEndAddress(endAddress);
+
order.setEndAddress(editOrderEndAddress.getEndAddress());
order.setEndLat(editOrderEndAddress.getEndLat().toString());
order.setEndLng(editOrderEndAddress.getEndLng().toString());
@@ -847,17 +910,37 @@
* @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());
+ orderPriceWarpper.setPayMoney(order.getPayMoney());
+ orderPriceWarpper.setOrderMoney(order.getOrderMoney());
+ if(order.getState() < 107){
+ orderPriceWarpper.setPayMoney(order.getOrderMoney());
+ }
return orderPriceWarpper;
}
@@ -882,18 +965,22 @@
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());
- orderMoney = new BigDecimal(orderMoney * 0.9).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ orderPriceWarpper.setDiscount(9.5D);
+ orderPriceWarpper.setDiscountAmount(new BigDecimal(orderMoney * 0.05).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ orderMoney = new BigDecimal(orderMoney * 0.95).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}
if(null != couponId){
UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
@@ -945,7 +1032,7 @@
return ResultUtil.error("不允许支付");
}
if(orderPayment.getPayType() == 2){
- Double payMoney = order.getOrderMoney() * (appUser.getHavDiscount() == 1 ? 0.9 : 1);
+ Double payMoney = order.getOrderMoney() * (appUser.getHavDiscount() == 1 ? 0.95 : 1);
if(appUser.getAccountBalance() < payMoney){
return ResultUtil.error("账户余额不足");
}
@@ -975,27 +1062,14 @@
* @throws Exception
*/
public ResultUtil weixinPay(Order order, AppUser appUser, Integer couponId) throws Exception{
- Double payMoney = order.getOrderMoney();
- if(null != couponId){
- UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
- if(userToCoupon.getValidCount() > 0){
- userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
- userToCouponService.updateById(userToCoupon);
- Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
- payMoney = payMoney - coupon.getCouponPreferentialAmount();
- order.setCouponId(coupon.getId());
- order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
- userToCouponService.updateById(userToCoupon);
- }
- }
+ Double payMoney = order.getPayMoney();
order.setPayType(1);
- order.setPayMoney(payMoney);
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String out_trade_no = sdf.format(new Date()) + order.getId();
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setBizOrderId(out_trade_no);
- paymentOrder.setAmount(String.valueOf(Double.valueOf(payMoney * 100).intValue()));
+ paymentOrder.setAmount(new BigDecimal(payMoney).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
paymentOrder.setOrderName("代驾服务费");
paymentOrder.setPayType("WX_MINI");
paymentOrder.setTransferType("0");
@@ -1084,35 +1158,7 @@
* @return
*/
public ResultUtil balancePayment(Order order, AppUser appUser, Integer couponId) throws Exception{
- Double payMoney = order.getOrderMoney();
- if(null != couponId){
- UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
- if(userToCoupon.getValidCount() > 0){
- userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
- userToCouponService.updateById(userToCoupon);
- Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
- 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);
- }
- }
-
+ Double payMoney = order.getPayMoney();
if(appUser.getHavDiscount() == 1){//9.5折
order.setDiscount(9.5D);
order.setDiscountAmount(payMoney * 0.05);
@@ -1135,7 +1181,7 @@
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(1);
accountChangeDetail.setUserId(appUser.getId());
accountChangeDetail.setCreateTime(new Date());
@@ -1144,13 +1190,13 @@
accountChangeDetail.setChangeType(2);
accountChangeDetail.setOrderId(order.getId());
accountChangeDetail.setExplain("代驾服务费");
- appUser.setAccountBalance(appUser.getAccountBalance() - payMoney);
+ appUser.setAccountBalance(new BigDecimal(appUser.getAccountBalance()).subtract(new BigDecimal(payMoney)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setNewData(appUser.getAccountBalance());
appUserService.updateById(appUser);
accountChangeDetailService.insert(accountChangeDetail);
//处理佣金和收入记录
- saveCommission(order);
+ saveCommissionYE(order);
return ResultUtil.success();
}
@@ -1164,42 +1210,11 @@
* @throws Exception
*/
public ResultUtil weixinAndBalancePayment(Order order, AppUser appUser, Integer couponId) throws Exception{
- Double payMoney = order.getOrderMoney();
- if(null != couponId){
- UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
- if(userToCoupon.getValidCount() > 0){
- userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
- userToCouponService.updateById(userToCoupon);
- Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
- 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);
- }
- }
+ Double payMoney = order.getPayMoney();
order.setPayType(1);
- order.setPayMoney(payMoney);
- order.setBalancePayment(payMoney > appUser.getAccountBalance() ? appUser.getAccountBalance() : payMoney);
-
- payMoney = payMoney > appUser.getAccountBalance() ? payMoney - appUser.getAccountBalance() : 0D;
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(1);
accountChangeDetail.setUserId(appUser.getId());
accountChangeDetail.setCreateTime(new Date());
@@ -1208,18 +1223,33 @@
accountChangeDetail.setChangeType(2);
accountChangeDetail.setOrderId(order.getId());
accountChangeDetail.setExplain("代驾服务费");
- appUser.setAccountBalance(appUser.getAccountBalance() > payMoney ? appUser.getAccountBalance() - payMoney : 0);
+
+ Double wx_p = 0D;
+ if(payMoney.compareTo(appUser.getAccountBalance()) > 0){//支付金额大于账户余额
+ wx_p = new BigDecimal(payMoney).subtract(new BigDecimal(appUser.getAccountBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ order.setBalancePayment(appUser.getAccountBalance());
+ order.setWeChatPayment(wx_p);
+ appUser.setAccountBalance(0D);
+ }else{
+ order.setBalancePayment(payMoney);
+ order.setWeChatPayment(0D);
+ appUser.setAccountBalance(new BigDecimal(appUser.getAccountBalance()).subtract(new BigDecimal(payMoney)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ }
accountChangeDetail.setNewData(appUser.getAccountBalance());
appUserService.updateById(appUser);
accountChangeDetailService.insert(accountChangeDetail);
- if(0 < payMoney){//还需要调起微信支付
+ order.setResidueBalancePayment(order.getBalancePayment());
+ order.setResidueWeChatPayment(order.getWeChatPayment());
+
+ if(0 < wx_p){//还需要调起微信支付
+ order.setPayType(4);
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String out_trade_no = sdf.format(new Date()) + order.getId();
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setBizOrderId(out_trade_no);
- paymentOrder.setAmount(String.valueOf(Double.valueOf(payMoney * 100).intValue()));
+ paymentOrder.setAmount(new BigDecimal(wx_p).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
paymentOrder.setOrderName("代驾服务费");
paymentOrder.setPayType("WX_MINI");
paymentOrder.setTransferType("0");
@@ -1286,7 +1316,7 @@
if("2".equals(status1) || 10 == num){//失败
Double m = accountChangeDetail.getOldData() - accountChangeDetail.getNewData();
AppUser appUser1 = appUserService.selectById(order1.getUserId());
- appUser1.setAccountBalance(appUser1.getAccountBalance() + m);
+ appUser1.setAccountBalance(new BigDecimal(appUser1.getAccountBalance()).add(new BigDecimal(m)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
appUserService.updateById(appUser1);
accountChangeDetailService.deleteById(accountChangeDetail.getId());
break;
@@ -1305,13 +1335,12 @@
return ResultUtil.success(payCode);
}else{
order.setPayType(2);
- order.setPayMoney(payMoney);
order.setPayTime(new Date());
order.setState(108);
this.updateById(order);
//处理佣金和收入记录
- saveCommission(order);
+ saveCommissionYE(order);
}
return ResultUtil.success();
@@ -1334,7 +1363,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()) {
@@ -1390,7 +1424,7 @@
//增加积分变动记录
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setCreateTime(new Date());
@@ -1411,7 +1445,7 @@
//增加积分变动记录
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setCreateTime(new Date());
@@ -1429,14 +1463,101 @@
/**
- * 处理订单收入及分佣抽成
+ * 微信支付分佣
* @param order
* @return
* @throws Exception
*/
- public void saveCommission(Order order) throws Exception{
- //司机收入和代理商抽成(先分佣，后抽成)
- //司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
+ public void saveCommissionWX(Order order) throws Exception{
+ saveGiveaway(order);//处理分佣
+ Driver 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(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(1);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getPayMoney())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setExplain("订单收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ 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(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getDiscountedPrice())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setExplain("优惠券收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //补贴中分账
+ Double balance = revenueService.queryCompanyBalance();//平台账户余额
+ 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<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice = new BigDecimal(discountedPrice).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+
+ CompanyFundFlow companyFundFlow = new CompanyFundFlow();
+ companyFundFlow.setBalance(new BigDecimal(balance));
+ companyFundFlow.setObjectType(1);
+ companyFundFlow.setDriverId(driver.getId());
+ companyFundFlow.setType(5);
+ companyFundFlow.setMoney(new BigDecimal(order.getDiscountedPrice()));
+ companyFundFlow.setCreateTime(new Date());
+ companyFundFlowService.insert(companyFundFlow);
+ }
+ }
+
+
+ /**
+ * 处理分佣
+ * @param order
+ */
+ public void saveGiveaway(Order order) throws Exception{
Driver driver = driverService.selectById(order.getDriverId());
AppUser appUser = appUserService.selectById(order.getUserId());
@@ -1450,7 +1571,7 @@
JSONObject jsonObject2 = JSON.parseObject(systemConfig1.getContent());
Integer num4 = jsonObject2.getInteger("num4");
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(2);
@@ -1467,35 +1588,50 @@
- 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");
+ Double num4_ = jsonObject.getDouble("num4");
if(order.getOrderMoney().compareTo(num2) >= 0){//订单金额大于num2开始分佣
- payMoney = payMoney - num3;//司机收入
+ AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
+ accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail1.setUserType(2);
+ accountChangeDetail1.setUserId(driver.getId());
+ accountChangeDetail1.setType(1);
+ accountChangeDetail1.setChangeType(9);
+ accountChangeDetail1.setOrderId(order.getId());
+ accountChangeDetail1.setOldData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail1.setExplain("订单信息费");
+ accountChangeDetail1.setCreateTime(new Date());
+ driver.setBalance(new BigDecimal(driver.getBalance()).subtract(new BigDecimal(num3)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail1.setNewData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail1);
+
SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
if(null != systemConfig1){
JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
- //司机推荐首单收入
- 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);
if(num1 > 0){
Driver driver1 = driverService.selectById(appUser.getInviterId());
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
- accountChangeDetail.setExplain("邀请用户首单奖励");
+ accountChangeDetail.setExplain("邀请用户奖励");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num1);
- accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
@@ -1508,31 +1644,32 @@
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", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
- if(surplusDividedAmount.compareTo(num1_) >= 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(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num1_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
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 = new BigDecimal(num1_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}else{
break;
}
}
}
}
- num3 = (num3 >= num1 ? num3 - num1 : 0);
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num1 ? v : 0);
}
//开始处理层级抽佣
@@ -1557,44 +1694,44 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num5);
- accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num5)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- //补贴中分账
- 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", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
- if(surplusDividedAmount.compareTo(num5_) >= 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(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num5_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
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 = new BigDecimal(num5_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}else{
break;
}
}
}
-
- num3 = (num3 >= num5 ? num3 - num5 : 0);
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num5)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num5 ? v : 0);
}
num6 = (num3 >= num6 ? num6 : num3);
if(num6 > 0 && null != driver2){
@@ -1608,45 +1745,44 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver2.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver2.getCouponBalance() + driver2.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num6);
- accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
+ driver2.setCommission(new BigDecimal(driver2.getCommission()).add(new BigDecimal(num6)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- //补贴中分账
- 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", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
- if(surplusDividedAmount.compareTo(num6_) >= 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(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num6_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
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 = new BigDecimal(num6_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}else{
break;
}
}
}
-
-
- num3 = (num3 >= num6 ? num3 - num6 : 0);
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num6)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num6 ? v : 0);
}
num7 = (num3 >= num7 ? num7 : num3);
if(num7 > 0 && null != driver3){
@@ -1660,44 +1796,44 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver3.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver3.getCouponBalance() + driver3.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver3.getCouponBalance()).add(new BigDecimal(driver3.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver3.setCommission(driver3.getCommission() + num7);
- accountChangeDetail.setNewData(driver3.getCouponBalance() + driver3.getCommission());
+ driver3.setCommission(new BigDecimal(driver3.getCommission()).add(new BigDecimal(num7)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver3.getCouponBalance()).add(new BigDecimal(driver3.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver3);
accountChangeDetailService.saveData(accountChangeDetail);
- //补贴中分账
- 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", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
- if(surplusDividedAmount.compareTo(num7_) >= 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(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num7_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
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 = new BigDecimal(num7_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}else{
break;
}
}
}
-
- num3 = (num3 >= num7 ? num3 - num7 : 0);
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num7)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num7 ? v : 0);
}
}else{
Double num3_ = jsonObject1.getDouble("num3");
@@ -1714,44 +1850,44 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num3_);
- accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num3_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- //补贴中分账
+ //司机充值记录分账
Double num3_1 = num3_;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num3_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num3_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
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;
+ num3_1 = new BigDecimal(num3_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}else{
break;
}
}
}
-
- num3 = (num3 >= num3_ ? num3 - num3_ : 0);
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num3_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num3_ ? v : 0);
}
num4 = (num3 >= num4 ? num4 : num3);
if(num4 > 0 && null != driver2){
@@ -1765,44 +1901,44 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver2.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver2.getCouponBalance() + driver2.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num4);
- accountChangeDetail.setNewData(driver2.getCouponBalance() + driver2.getCommission());
+ driver2.setCommission(new BigDecimal(driver2.getCommission()).add(new BigDecimal(num4)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- //补贴中分账
+ //司机充值记录分账
Double num4_1 = num4;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num4_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), num4_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num4_1);
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num4_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num4_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
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;
+ num4_1 = new BigDecimal(num4_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}else{
break;
}
}
}
-
- num3 = (num3 >= num4 ? num3 - num4 : 0);
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num4)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num4 ? v : 0);
}
}
}else{
@@ -1819,51 +1955,101 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num2_);
- accountChangeDetail.setNewData(driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num2_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- //补贴中分账
+ //司机充值记录分账
Double num2_1 = num2_;
- List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num2_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), num2_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num2_1);
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num2_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num2_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
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;
+ num2_1 = new BigDecimal(num2_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}else{
break;
}
}
}
-
- num3 = (num3 >= num2_ ? num3 - num2_ : 0);
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num2_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num2_ ? v : 0);
}
}
}
- //处理代理商抽佣
- if(num3 > 0 && null != driver){
+ //处理平台抽佣
+ if(num4_ > 0){
+ //先平台抽佣
+ num4_ = (num3 >= num4_ ? num4_ : num3);
Revenue revenue = new Revenue();
- revenue.setType(1);
+ revenue.setType(2);
+ revenue.setUserType(4);
+ revenue.setUserId(driver.getAgentId());
+ revenue.setOrderId(order.getId());
+ revenue.setAmount(num4_);
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+ //司机充值记录分账
+ Double num4_1 = num4_;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num4_1) >= 0){
+ ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num4_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num4_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num4_1 = new BigDecimal(num4_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ Double balance = revenueService.queryAgentBalance(driver.getAgentId());
+ //记录企业流水
+ CompanyFundFlow companyFundFlow = new CompanyFundFlow();
+ companyFundFlow.setType(3);
+ companyFundFlow.setObjectType(1);
+ companyFundFlow.setObjectId(null);
+ companyFundFlow.setBalance(new BigDecimal(balance));
+ companyFundFlow.setMoney(new BigDecimal(num4_));
+ companyFundFlow.setCreateTime(new Date());
+ companyFundFlowService.insert(companyFundFlow);
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num4_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num4_ ? v : 0);
+ }
+
+ //代理商分佣
+ if(num3 > 0 && null != driver){
+ Double balance = revenueService.queryAgentBalance(driver.getAgentId());
+ Revenue revenue = new Revenue();
+ revenue.setType(2);
revenue.setUserType(3);
revenue.setUserId(driver.getAgentId());
revenue.setOrderId(order.getId());
@@ -1872,244 +2058,39 @@
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", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(num3_1) >= 0){
- ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), agent.getMerchantNumber(), num3_1, callbackPath + "/base/order/zhaunzhangCallback");
- if(10000 == zhaunzhang.getCode()){
- rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - num3_1);
+ ResultUtil fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
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;
+ num3_1 = new BigDecimal(num3_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}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(payMoney + 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());
- if(null != order.getCouponId()){
- driver.setCommission(driver.getCommission() + order.getDiscountedPrice());
- //补贴中分账
- 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()){
- driver.setCommission(driver.getCommission() + order.getDiscountAmount());
- //补贴中分账
- 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;
- }
- }
- }
- }
- 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;
- }
- }
+ //记录企业流水
+ CompanyFundFlow companyFundFlow = new CompanyFundFlow();
+ companyFundFlow.setType(3);
+ companyFundFlow.setObjectType(2);
+ companyFundFlow.setObjectId(driver.getAgentId());
+ companyFundFlow.setBalance(new BigDecimal(balance));
+ companyFundFlow.setMoney(new BigDecimal(num3));
+ companyFundFlow.setCreateTime(new Date());
+ companyFundFlowService.insert(companyFundFlow);
}
}
}
@@ -2117,15 +2098,307 @@
}
+
+
+ /**
+ * 余额支付分账
+ * @param order
+ * @throws Exception
+ */
+ public void saveCommissionYE(Order order) throws Exception{
+ saveGiveaway(order);//分佣
+ Driver driver = driverService.selectById(order.getDriverId());
+ AppUser appUser = appUserService.selectById(order.getUserId());
+ //司机订单收入
+ Revenue revenue = new Revenue();
+ revenue.setType(1);
+ revenue.setUserType(2);
+ revenue.setUserId(driver.getId());
+ revenue.setOrderId(order.getId());
+ revenue.setAmount(order.getPayMoney() + order.getDiscountedPrice());//todo 折扣司机承担
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
+ accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail1.setUserType(2);
+ accountChangeDetail1.setUserId(driver.getId());
+ accountChangeDetail1.setType(1);
+ accountChangeDetail1.setChangeType(1);
+ accountChangeDetail1.setOrderId(order.getId());
+ accountChangeDetail1.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getPayMoney())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail1.setExplain("订单收入");
+ accountChangeDetail1.setCreateTime(new Date());
+ accountChangeDetail1.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ 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(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ 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 = new BigDecimal(num3_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+
+
+ if(null != order.getCouponId()){
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getDiscountedPrice())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setExplain("优惠券收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //补贴中分账
+ Double balance = revenueService.queryCompanyBalance();
+ 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<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice = new BigDecimal(discountedPrice).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ CompanyFundFlow companyFundFlow = new CompanyFundFlow();
+ companyFundFlow.setBalance(new BigDecimal(balance));
+ companyFundFlow.setObjectType(1);
+ companyFundFlow.setDriverId(driver.getId());
+ companyFundFlow.setType(5);
+ companyFundFlow.setMoney(new BigDecimal(order.getDiscountedPrice()));
+ companyFundFlow.setCreateTime(new Date());
+ companyFundFlowService.insert(companyFundFlow);
+
+ }
+ // TODO: 2023/6/25 折扣优惠由司机承担
+// if(null != order.getDiscountAmount() && 0 < order.getDiscountAmount()){
+// AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+// accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+// 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{
+ saveGiveaway(order);//分佣
+ Driver driver = driverService.selectById(order.getDriverId());
+ AppUser appUser = appUserService.selectById(order.getUserId());
+ //司机订单收入
+ 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(5));
+ accountChangeDetail1.setUserType(2);
+ accountChangeDetail1.setUserId(driver.getId());
+ accountChangeDetail1.setType(1);
+ accountChangeDetail1.setChangeType(1);
+ accountChangeDetail1.setOrderId(order.getId());
+ accountChangeDetail1.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getPayMoney())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail1.setExplain("订单收入");
+ accountChangeDetail1.setCreateTime(new Date());
+ accountChangeDetail1.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ 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(new BigDecimal(order.getResidueWeChatPayment()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ }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 = new BigDecimal(num3_1).subtract(new BigDecimal(residueWeChatPayment)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+
+ //账户余额继续分账
+ 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(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ order.setResidueBalancePayment(new BigDecimal(residueBalancePayment).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ }
+ 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 = new BigDecimal(num3_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ order.setResidueBalancePayment(new BigDecimal(residueBalancePayment).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ }else{
+ break;
+ }
+ }
+ }
+ }
+ this.updateById(order);
+
+ if(null != order.getCouponId()){
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getDiscountedPrice())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setExplain("优惠券收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
+ //补贴中分账
+ Double balance = revenueService.queryCompanyBalance();
+ 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<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice = new BigDecimal(discountedPrice).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+
+ CompanyFundFlow companyFundFlow = new CompanyFundFlow();
+ companyFundFlow.setBalance(new BigDecimal(balance));
+ companyFundFlow.setObjectType(1);
+ companyFundFlow.setDriverId(driver.getId());
+ companyFundFlow.setType(5);
+ companyFundFlow.setMoney(new BigDecimal(order.getDiscountedPrice()));
+ companyFundFlow.setCreateTime(new Date());
+ companyFundFlowService.insert(companyFundFlow);
+
+ }
+ }
+
+
+
/**
* 分账操作
* @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);
@@ -2141,7 +2414,7 @@
List<PamentOrderUser> splitList = new ArrayList<>();
PamentOrderUser pamentOrderUser = new PamentOrderUser();
pamentOrderUser.setSplitUserId(merchantNumber);
- pamentOrderUser.setSplitAmount(String.valueOf(Double.valueOf(amount * 100).intValue()));
+ pamentOrderUser.setSplitAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
pamentOrderUser.setSplitType("1");
splitList.add(pamentOrderUser);
complete.setSplitList(splitList);
@@ -2152,7 +2425,7 @@
Integer status = jsonObject.getInteger("status");//0：待处理 1：成功 2：失败
String merOrderId1 = jsonObject.getString("merOrderId");
if(2 == status){
- System.err.println("订单支付成功后的分账处理异常失败");
+ logger.warn("订单支付成功后的分账处理异常失败");
return ResultUtil.error("订单支付成功后的分账处理异常失败");
}
if(1 == status){
@@ -2160,20 +2433,21 @@
divisionRecord.setPayTime(new Date());
divisionRecord.setState(2);
divisionRecordService.updateById(divisionRecord);
- //间隔10秒开始调用确认收货后开始提现
+ //间隔1分钟开始调用确认收货后开始提现
new Timer().schedule(new TimerTask() {//确认收货和提现
@Override
public void run() {
confirmReceipt(merchantNumber, merOrderId, divisionRecord);
}
- }, 15000);
+ }, 60000);
return ResultUtil.success();
}
}else{
- System.err.println("订单支付成功后的分账处理异常 ：" + execute.getMsg());
+ logger.warn("订单支付成功后的分账处理异常 ：" + execute.getMsg());
return ResultUtil.error("订单支付成功后的分账处理异常 ：" + execute.getMsg());
}
+ logger.warn("未知异常");
return ResultUtil.error("未知异常");
}
@@ -2188,11 +2462,11 @@
Receive receive = new Receive();
receive.setOriginalMerOrderId(orderNumber);
receive.setAsynMerOrderId(divisionRecord.getMerOrderId());
- receive.setRcvAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
+ receive.setRcvAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
List<ReceiveUser> splitList = new ArrayList<>();
ReceiveUser receiveUser = new ReceiveUser();
receiveUser.setSplitUserId(merchantNumber);
- receiveUser.setRcvSplitAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
+ receiveUser.setRcvSplitAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
splitList.add(receiveUser);
receive.setSplitList(splitList);
TrhRequest<Receive> request = new TrhRequest();
@@ -2200,9 +2474,9 @@
if("0000".equals(execute1.getCode())){
JSONObject jsonObject = JSON.parseObject(execute1.getResult());
String merOrderId = jsonObject.getString("merOrderId");
- System.err.println("分账确认收货成功");
+ logger.warn("分账确认收货成功");
}else{
- System.err.println("分账确认收货异常" + execute1.getMsg());
+ logger.warn("分账确认收货异常" + execute1.getMsg());
}
}
@@ -2216,11 +2490,11 @@
* @param notifyUrl
* @return
*/
- public ResultUtil zhaunzhang(Integer id, String merOrderId, String toUserId, Double amount, String notifyUrl){
+ public ResultUtil<Double> zhaunzhang(Integer id, String merOrderId, String toUserId, Double amount, String notifyUrl){
Transfer transfer = new Transfer();
transfer.setDepositMerOrderId(merOrderId);
transfer.setToUserId(toUserId);
- transfer.setAmount(String.valueOf(Double.valueOf(amount * 100).intValue()));
+ transfer.setAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
transfer.setOrderName("补贴");
transfer.setNotifyUrl(notifyUrl);
transfer.setParameter1(id.toString());
@@ -2228,12 +2502,13 @@
InterfaceResponse execute = request.execute(transfer, Transfer.SERVICE_CODE);
if("0000".equals(execute.getCode())){
JSONObject jsonObject = JSON.parseObject(execute.getResult());
- Integer status = jsonObject.getInteger("status");//0：待处理；1：成功；2：失败
- if(2 == status){
+ String status = jsonObject.getString("status");//0：待处理；1：成功；2：失败
+ if("2" == status){
System.err.println("转账失败");
return ResultUtil.error("转账失败");
}
- return ResultUtil.success();
+ Double remainAmount = Double.valueOf(jsonObject.getInteger("remainAmount")) / 100;
+ return ResultUtil.success(remainAmount);
}else{
System.err.println("转账失败：" + execute.getMsg());
return ResultUtil.error(execute.getMsg());
--
Gitblit v1.7.1