From aad87bdfab3ef685a27b3540b1114b36059c8cc7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 01 六月 2023 23:33:21 +0800
Subject: [PATCH] 提交数据库
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 188 +++++++++++++++++++++++++----------------------
1 files changed, 100 insertions(+), 88 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 af5bc2e..82dae7f 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
@@ -104,6 +104,9 @@
@Autowired
private IDivisionRecordService divisionRecordService;
+ @Value("${wx.appletsAppid}")
+ private String appletsAppid;
+
@Value("${callbackPath}")
private String callbackPath;//支付回调网关地址
@@ -166,7 +169,7 @@
}
if(nearbyDriverWarppers.size() > 0){
NearbyDriverWarpper nearbyDriverWarpper = nearbyDriverWarppers.get(0);
- Map<String, String> distance = MapUtil.getDistance(nearbyDriverWarpper.getLonLat(), estimatedCosts.getLng() + "," + estimatedCosts.getLat(), 1);
+ Map<String, String> distance = MapUtil.getDistance(nearbyDriverWarpper.getLonLat(), estimatedCosts.getStartLng() + "," + estimatedCosts.getStartLat(), 1);
if(null != distance){
distance.get("distance");//距离(M)
String duration = distance.get("duration");//时间（S）
@@ -449,18 +452,19 @@
for (Integer i = 0; i < travelOrder.getDriverNum(); i++) {
order.setId(null);
order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3));
- this.insert(order);
-
- //推送状态
- pushUtil.pushOrderStatus(uid, 1, order.getId(), order.getState());
- if(null != order.getDriverId()){
- PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
- pushOrderInfoWarpper.setId(order.getId());
- pushOrderInfoWarpper.setState(order.getState());
- pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
- }else{
- //推单
- pushOrder(order);
+ boolean insert = this.insert(order);
+ if(insert){
+ //推送状态
+ pushUtil.pushOrderStatus(uid, 1, order.getId(), order.getState());
+ if(null != order.getDriverId()){
+ PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+ pushOrderInfoWarpper.setId(order.getId());
+ pushOrderInfoWarpper.setState(order.getState());
+ pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
+ }else{
+ //推单
+ pushOrder(order.getId());
+ }
}
}
return ResultUtil.success(order.getId());
@@ -471,9 +475,9 @@
/**
* 订单推送逻辑
- * @param order
*/
- public void pushOrder(Order order){
+ public void pushOrder(Long orderId){
+ Order order = this.selectById(orderId);
/**
* 1.先找最大推单范围内的优推司机 -》 距离最近
* 没有1 - 》
@@ -515,7 +519,7 @@
continue;
}
Driver driver1 = driverService.selectById(youTuiDriver.getDriverId());
- if(driver1.getServerStatus() == 2){
+ if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1){
continue;
}
Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
@@ -549,13 +553,14 @@
driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
if(driverIds.size() > 0){
- List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2).eq("serverStatus", 1).eq("status", 1).in("id", driverIds));
+ List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2)
+ .eq("serverStatus", 1).eq("openOrderQRCode", 0).eq("status", 1).in("id", driverIds));
if(drivers.size() == 0){
continue;
}
- Integer integral = null;
- Double score = null;
+ Integer integral = null;//积分
+ Double score = null;//评分
Double d = null;
for (Driver driver1 : drivers) {
String value = redisUtil.getValue("DRIVER" + driver1.getId());
@@ -566,19 +571,27 @@
integral = driver1.getIntegral();
score = driver1.getScore();
driver = driver1.getId();
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ d = wgs84;
continue;
}
if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) < 0){//积分相同对比评分
integral = driver1.getIntegral();
score = driver1.getScore();
driver = driver1.getId();
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ d = wgs84;
continue;
}
if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) == 0){//积分相同/评分相同对比距离
Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
Double wgs84 = distance.get("WGS84");
- if(d == null || d.compareTo(wgs84) > 0){
+ if(d.compareTo(wgs84) > 0){
d = wgs84;
+ integral = driver1.getIntegral();
+ score = driver1.getScore();
driver = driver1.getId();
continue;
}
@@ -742,22 +755,6 @@
BeanUtils.copyProperties(order, orderPriceWarpper);
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());
- if(null == order.getPayTime()){
- AppUser appUser = appUserService.selectById(uid);
- orderPriceWarpper.setBalance(appUser.getAccountBalance());
- Double orderMoney = order.getOrderMoney();
- //先算优惠券
- Coupon coupon = userToCouponService.queryCoupon(uid, orderMoney);
- if(null != coupon){
- orderMoney = orderMoney - coupon.getCouponPreferentialAmount();
- orderPriceWarpper.setDiscountedPrice(coupon.getCouponPreferentialAmount());
- orderPriceWarpper.setCouponId(coupon.getId());
- }
- orderPriceWarpper.setDiscount(0D);
- orderPriceWarpper.setDiscountAmount(0D);
- orderPriceWarpper.setPayType(1);//微信支付
- orderPriceWarpper.setPayMoney(orderMoney);
- }
return orderPriceWarpper;
}
@@ -785,10 +782,15 @@
orderPriceWarpper.setPayType(1);//微信支付
Double orderMoney = order.getOrderMoney();
//先算优惠券
- Coupon coupon = userToCouponService.queryCoupon(uid, orderMoney);
- if(null != coupon && null == couponId){
- orderPriceWarpper.setDiscountedPrice(coupon.getCouponPreferentialAmount());
- orderPriceWarpper.setCouponId(coupon.getId());
+// 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();
}
if(null != couponId){
UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
@@ -797,20 +799,16 @@
orderPriceWarpper.setDiscountedPrice(coupon1.getCouponPreferentialAmount());
orderPriceWarpper.setCouponId(couponId);
}
- if(payType == 1 && appUser.getHavDiscount() == 1 && balance >= orderMoney){//使用余额抵扣
- 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();
- }
if(payType == 0){//不使用余额抵扣
orderPriceWarpper.setPayType(1);
}
- if(payType == 1 && balance >= orderMoney){//使用余额抵扣
+ if(payType == 1 && balance.compareTo(orderMoney) >= 0){//使用余额抵扣
orderPriceWarpper.setPayType(2);
}
- if(payType == 1 && balance < orderMoney){//使用余额抵扣部分
+ if(payType == 1 && balance.compareTo(orderMoney) < 0){//使用余额抵扣部分
orderPriceWarpper.setPayType(4);
}
+
orderPriceWarpper.setPayMoney(orderMoney);
return orderPriceWarpper;
}
@@ -891,10 +889,6 @@
order.setPayMoney(payMoney);
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String out_trade_no = sdf.format(new Date()) + order.getId();
-// ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
-// this.updateById(order);
-
-
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setBizOrderId(out_trade_no);
@@ -903,7 +897,7 @@
paymentOrder.setPayType("WX_MINI");
paymentOrder.setTransferType("0");
paymentOrder.setAsynSplitFlag("1");
- paymentOrder.setAppid("");
+ paymentOrder.setAppid(appletsAppid);
paymentOrder.setOpenid(appUser.getOpenid());
paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
List<PaymentOrderGood> goodsDetail = new ArrayList<>();
@@ -917,7 +911,7 @@
TrhRequest<PaymentOrder> request = new TrhRequest();
InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
+ if(!"0000".equals(execute.getCode())){
return ResultUtil.error(execute.getMsg());
}
JSONObject jsonObject = JSON.parseObject(execute.getResult());
@@ -930,6 +924,24 @@
}
String payCode = jsonObject.getString("payCode");
this.updateById(order);
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ QueryOrder queryOrder = new QueryOrder();
+ /**
+ * 原请求订单号(必填) 字段长度最长：32位
+ */
+ queryOrder.setOriginalMerOrderId("202108310351001");
+ /**
+ * 1：支付查询 2：退款查询 3：确认收货查询 4：结算查询 5：充值查询 6：转账查询 7：异步分账查询(必填) 字段长度最长：1位
+ */
+ queryOrder.setQueryType("1");
+ TrhRequest<QueryOrder> request = new TrhRequest();
+ request.execute(queryOrder, QueryOrder.SERVICE_CODE);
+ }
+ }).start();
+
return ResultUtil.success(payCode);
}
@@ -958,22 +970,22 @@
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setCreateTime(new Date());
- accountChangeDetail.setOldData(driver.getCouponBalance());
+ accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(7);
accountChangeDetail.setOrderId(order.getId());
accountChangeDetail.setExplain("优惠券收入");
driver.setCouponBalance(driver.getCouponBalance() + coupon.getCouponPreferentialAmount());
- accountChangeDetail.setNewData(driver.getCouponBalance());
+ accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
driverService.updateById(driver);
accountChangeDetailService.insert(accountChangeDetail);
}
}
if(appUser.getHavDiscount() == 1){//9折
- payMoney = payMoney * 0.9;
order.setDiscount(9D);
order.setDiscountAmount(payMoney * 0.1);
+ payMoney = payMoney * 0.9;
}
order.setPayType(2);
@@ -1060,7 +1072,7 @@
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setBizOrderId(out_trade_no);
- paymentOrder.setAmount(String.valueOf(payMoney * 100));
+ paymentOrder.setAmount(String.valueOf(Double.valueOf(payMoney * 100).intValue()));
paymentOrder.setOrderName("代驾服务费");
paymentOrder.setPayType("WX_MINI");
paymentOrder.setTransferType("0");
@@ -1079,7 +1091,7 @@
TrhRequest<PaymentOrder> request = new TrhRequest();
InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
+ if(!"0000".equals(execute.getCode())){
return ResultUtil.error(execute.getMsg());
}
JSONObject jsonObject = JSON.parseObject(execute.getResult());
@@ -1261,7 +1273,7 @@
complete.setSplitList(splitList);
TrhRequest<Complete> request = new TrhRequest();
InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
+ if(!"0000".equals(execute.getCode())){
return ResultUtil.error(execute.getMsg());
}
JSONObject jsonObject = JSON.parseObject(execute.getResult());
@@ -1286,13 +1298,13 @@
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setCreateTime(new Date());
- accountChangeDetail.setOldData(driver.getCouponBalance());
+ accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(7);
accountChangeDetail.setOrderId(order.getId());
accountChangeDetail.setExplain("优惠券收入");
driver.setCouponBalance(driver.getCouponBalance() + coupon.getCouponPreferentialAmount());
- accountChangeDetail.setNewData(driver.getCouponBalance());
+ accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
driverService.updateById(driver);
accountChangeDetailService.insert(accountChangeDetail);
@@ -1320,7 +1332,7 @@
TrhRequest<Transfer> request1 = new TrhRequest();
InterfaceResponse execute1 = request1.execute(transfer, Transfer.SERVICE_CODE);
- if(!"0000".equals(execute1.getResult())){
+ if(!"0000".equals(execute1.getCode())){
return ResultUtil.error(execute1.getMsg());
}
JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
@@ -1457,11 +1469,11 @@
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getCommission());
+ accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
driver1.setCommission(driver1.getCommission() + num1);
- accountChangeDetail.setNewData(driver1.getCommission());
+ accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
@@ -1478,17 +1490,17 @@
}
//开始处理层级抽佣
- if(null != driver.getInviterType() && driver.getInviterType() == 2){
+ if(null != driver & null != driver.getInviterType() && driver.getInviterType() == 2){
Driver driver1 = driverService.selectById(driver.getInviterId());//一级司机
- if(null != driver1.getInviterType() && driver1.getInviterType() == 2){
+ if(null != driver1 && null != driver1.getInviterType() && driver1.getInviterType() == 2){
Driver driver2 = driverService.selectById(driver1.getInviterId());//二级司机
- if(null != driver2.getInviterType() && driver2.getInviterType() == 2){
+ if(null != driver2 && null != driver2.getInviterType() && driver2.getInviterType() == 2){
Driver driver3 = driverService.selectById(driver2.getInviterId());//三级级司机
Double num5 = jsonObject1.getDouble("num5");
Double num6 = jsonObject1.getDouble("num6");
Double num7 = jsonObject1.getDouble("num7");
num5 = (num3 >= num5 ? num5 : num3);
- if(num5 > 0){
+ if(num5 > 0 && null != driver1){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
@@ -1504,17 +1516,17 @@
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getCommission());
+ accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
driver1.setCommission(driver1.getCommission() + num5);
- accountChangeDetail.setNewData(driver1.getCommission());
+ accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
num3 = (num3 >= num5 ? num3 - num5 : 0);
}
num6 = (num3 >= num6 ? num6 : num3);
- if(num6 > 0){
+ if(num6 > 0 && null != driver2){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
@@ -1530,17 +1542,17 @@
accountChangeDetail.setUserId(driver2.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver2.getCommission());
+ accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
driver2.setCommission(driver2.getCommission() + num6);
- accountChangeDetail.setNewData(driver2.getCommission());
+ accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
num3 = (num3 >= num6 ? num3 - num6 : 0);
}
num7 = (num3 >= num7 ? num7 : num3);
- if(num7 > 0){
+ if(num7 > 0 && null != driver3){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
@@ -1556,11 +1568,11 @@
accountChangeDetail.setUserId(driver3.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver3.getCommission());
+ accountChangeDetail.setOldData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
driver3.setCommission(driver3.getCommission() + num7);
- accountChangeDetail.setNewData(driver3.getCommission());
+ accountChangeDetail.setNewData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
driverService.updateById(driver3);
accountChangeDetailService.saveData(accountChangeDetail);
num3 = (num3 >= num7 ? num3 - num7 : 0);
@@ -1569,7 +1581,7 @@
Double num3_ = jsonObject1.getDouble("num3");
Double num4 = jsonObject1.getDouble("num4");
num3_ = (num3 >= num3_ ? num3_ : num3);
- if(num3_ > 0){
+ if(num3_ > 0 && null != driver1){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
@@ -1585,17 +1597,17 @@
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getCommission());
+ accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
driver1.setCommission(driver1.getCommission() + num3_);
- accountChangeDetail.setNewData(driver1.getCommission());
+ accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
num3 = (num3 >= num3_ ? num3 - num3_ : 0);
}
num4 = (num3 >= num4 ? num4 : num3);
- if(num4 > 0){
+ if(num4 > 0 && null != driver2){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
@@ -1611,11 +1623,11 @@
accountChangeDetail.setUserId(driver2.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver2.getCommission());
+ accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
driver2.setCommission(driver2.getCommission() + num4);
- accountChangeDetail.setNewData(driver2.getCommission());
+ accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
num3 = (num3 >= num4 ? num3 - num4 : 0);
@@ -1624,7 +1636,7 @@
}else{
Double num2_ = jsonObject1.getDouble("num2");
num2_ = (num3 >= num2_ ? num2_ : num3);
- if(num2_ > 0){
+ if(num2_ > 0 && null != driver1){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
@@ -1640,11 +1652,11 @@
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getCommission());
+ accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
driver1.setCommission(driver1.getCommission() + num2_);
- accountChangeDetail.setNewData(driver1.getCommission());
+ accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
num3 = (num3 >= num2_ ? num3 - num2_ : 0);
@@ -1652,7 +1664,7 @@
}
}
//处理代理商抽佣
- if(num3 > 0){
+ if(num3 > 0 && null != driver){
Revenue revenue = new Revenue();
revenue.setType(1);
revenue.setUserType(3);
@@ -1682,14 +1694,14 @@
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(1);
accountChangeDetail.setOrderId(order.getId());
- accountChangeDetail.setOldData(driver.getBalance() + driver.getCouponBalance());
+ accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
accountChangeDetail.setExplain("订单收入");
accountChangeDetail.setCreateTime(new Date());
driver.setBalance(driver.getBalance() + payMoney);
if(null != order.getCouponId()){
driver.setCouponBalance(driver.getCouponBalance() + order.getDiscountedPrice());
}
- accountChangeDetail.setNewData(driver.getBalance() + driver.getCouponBalance());
+ accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
driverService.updateById(driver);
accountChangeDetailService.saveData(accountChangeDetail);
}
--
Gitblit v1.7.1