From ddd4919fdd5c5dd4fc96eb99e590403cad58bbd7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 03 六月 2023 02:03:18 +0800
Subject: [PATCH] 更新支付
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 1043 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 740 insertions(+), 303 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..8535c55 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,12 @@
@Autowired
private IDivisionRecordService divisionRecordService;
+ @Autowired
+ private IRechargeRecordService rechargeRecordService;
+
+ @Value("${wx.appletsAppid}")
+ private String appletsAppid;
+
@Value("${callbackPath}")
private String callbackPath;//支付回调网关地址
@@ -166,7 +172,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 +455,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 +478,9 @@
/**
* 订单推送逻辑
- * @param order
*/
- public void pushOrder(Order order){
+ public void pushOrder(Long orderId){
+ Order order = this.selectById(orderId);
/**
* 1.先找最大推单范围内的优推司机 -》 距离最近
* 没有1 - 》
@@ -515,7 +522,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 +556,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 +574,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 +758,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 +785,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 +802,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 +892,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 +900,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<>();
@@ -911,13 +908,13 @@
paymentOrderGood.setGoodsName("服务费");
goodsDetail.add(paymentOrderGood);
paymentOrder.setGoodsDetail(goodsDetail);
- paymentOrder.setFrontUrl("");
+ paymentOrder.setFrontUrl(callbackPath + "/base/order/orderPayCallback");
paymentOrder.setNotifyUrl(callbackPath + "/base/order/orderPayCallback");
paymentOrder.setParameter1(order.getId().toString());
TrhRequest<PaymentOrder> request = new TrhRequest();
InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
+ if(!"0000".equals(execute.getCode())){
return ResultUtil.error(execute.getMsg());
}
JSONObject jsonObject = JSON.parseObject(execute.getResult());
@@ -928,8 +925,57 @@
if("0".equals(status)){
return ResultUtil.error("处理中");
}
+ String merOrderId = jsonObject.getString("merOrderId");
String payCode = jsonObject.getString("payCode");
this.updateById(order);
+
+ if(ToolUtil.isNotEmpty(payCode)){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ int num = 1;
+ int wait = 0;
+ while (num <= 10){
+ int min = 5000;
+ wait += (min * num);
+ Order order1 = OrderServiceImpl.this.selectById(order.getId());
+ if(order1.getState() != 107){
+ return;
+ }
+ QueryOrder queryOrder = new QueryOrder();
+ queryOrder.setOriginalMerOrderId(merOrderId);
+ queryOrder.setQueryType("1");
+ TrhRequest<QueryOrder> request = new TrhRequest();
+ InterfaceResponse execute1 = request.execute(queryOrder, QueryOrder.SERVICE_CODE);
+ if("0000".equals(execute1.getCode())){
+ JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
+ String status1 = jsonObject1.getString("status");
+ if("0".equals(status1)){//待处理
+ Thread.sleep(wait);
+ num++;
+ }
+ if("1".equals(status1)){//成功
+ String merOrderId = jsonObject1.getString("merOrderId");
+ ResultUtil resultUtil = orderPayCallback(order1.getId().toString(), merOrderId);
+
+ break;
+ }
+ if("2".equals(status1) || 10 == num){//失败
+ break;
+ }
+ }else{
+ Thread.sleep(wait);
+ num++;
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }).start();
+ }
+
return ResultUtil.success(payCode);
}
@@ -958,22 +1004,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());
+ driver.setCommission(driver.getCommission() + coupon.getCouponPreferentialAmount());
+ 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);
@@ -1031,10 +1077,27 @@
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.getBalance() + driver.getBackgroundBalance() + 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.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.insert(accountChangeDetail);
}
}
order.setPayType(1);
order.setPayMoney(payMoney);
+ order.setBalancePayment(payMoney > appUser.getAccountBalance() ? appUser.getAccountBalance() : payMoney);
payMoney = payMoney > appUser.getAccountBalance() ? payMoney - appUser.getAccountBalance() : 0D;
@@ -1056,16 +1119,15 @@
if(0 < payMoney){//还需要调起微信支付
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String out_trade_no = sdf.format(new Date()) + order.getId();
-// ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
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");
paymentOrder.setAsynSplitFlag("1");
- paymentOrder.setAppid("");
+ paymentOrder.setAppid(appletsAppid);
paymentOrder.setOpenid(appUser.getOpenid());
paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
List<PaymentOrderGood> goodsDetail = new ArrayList<>();
@@ -1073,13 +1135,14 @@
paymentOrderGood.setGoodsName("服务费");
goodsDetail.add(paymentOrderGood);
paymentOrder.setGoodsDetail(goodsDetail);
- paymentOrder.setFrontUrl("");
+ paymentOrder.setFrontUrl(callbackPath + "/base/order/orderPayCallback");
paymentOrder.setNotifyUrl(callbackPath + "/base/order/orderPayCallback");
paymentOrder.setParameter1(order.getId().toString());
+ paymentOrder.setParameter2(accountChangeDetail.getId().toString());
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());
@@ -1090,92 +1153,72 @@
if("0".equals(status)){
return ResultUtil.error("处理中");
}
+ String merOrderId = jsonObject.getString("merOrderId");
String payCode = jsonObject.getString("payCode");
this.updateById(order);
+
+ if(ToolUtil.isNotEmpty(payCode)){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ int num = 1;
+ int wait = 0;
+ while (num <= 10){
+ int min = 5000;
+ wait += (min * num);
+ Order order1 = OrderServiceImpl.this.selectById(order.getId());
+ if(order1.getState() != 107){
+ return;
+ }
+ QueryOrder queryOrder = new QueryOrder();
+ queryOrder.setOriginalMerOrderId(merOrderId);
+ queryOrder.setQueryType("1");
+ TrhRequest<QueryOrder> request = new TrhRequest();
+ InterfaceResponse execute1 = request.execute(queryOrder, QueryOrder.SERVICE_CODE);
+ if("0000".equals(execute1.getCode())){
+ JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
+ String status1 = jsonObject1.getString("status");
+ if("0".equals(status1)){//待处理
+ Thread.sleep(wait);
+ num++;
+ }
+ if("1".equals(status1)){//成功
+ String merOrderId = jsonObject1.getString("merOrderId");
+ ResultUtil resultUtil = orderPayCallback(order1.getId().toString(), merOrderId);
+
+ break;
+ }
+ if("2".equals(status1) || 10 == num){//失败
+ Double m = accountChangeDetail.getOldData() - accountChangeDetail.getNewData();
+ AppUser appUser1 = appUserService.selectById(order1.getUserId());
+ appUser1.setAccountBalance(appUser1.getAccountBalance() + m);
+ appUserService.updateById(appUser1);
+ accountChangeDetailService.deleteById(accountChangeDetail.getId());
+ break;
+ }
+ }else{
+ Thread.sleep(wait);
+ num++;
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }).start();
+ }
return ResultUtil.success(payCode);
+ }else{
+ order.setPayType(2);
+ order.setPayMoney(payMoney);
+ order.setPayTime(new Date());
+ order.setState(108);
+ this.updateById(order);
- // TODO: 2023/5/18 取消支付后需要处理优惠券数据回退
-//
-//
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// try {
-// int num = 1;
-// int wait = 0;
-// while (num <= 10){
-// int min = 5000;
-// wait += (min * num);
-// Order order1 = OrderServiceImpl.this.selectById(order.getId());
-// if(order1.getState() != 107){
-// return;
-// }
-//
-// /**
-// * SUCCESS--支付成功
-// * REFUND--转入退款
-// * NOTPAY--未支付
-// * CLOSED--已关闭
-// * REVOKED--已撤销(刷卡支付)
-// * USERPAYING--用户支付中
-// * PAYERROR--支付失败(其他原因，如银行返回失败)
-// * ACCEPT--已接收，等待扣款
-// */
-// ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(out_trade_no, "");
-// if(resultUtil.getCode() == 200){
-// Map<String, String> map = resultUtil.getData();
-// String trade_type = map.get("trade_type");
-// String trade_state = map.get("trade_state");
-// String transaction_id = map.get("transaction_id");
-// if("REFUND".equals(trade_state) || "NOTPAY".equals(trade_state) || "CLOSED".equals(trade_state) || "REVOKED".equals(trade_state) || "PAYERROR".equals(trade_state)){
-// AccountChangeDetail accountChangeDetail1 = accountChangeDetailService.selectById(accountChangeDetail.getId());
-// AppUser appUser1 = appUserService.selectById(accountChangeDetail1.getUserId());
-// Double b = accountChangeDetail1.getOldData() - accountChangeDetail1.getNewData();
-// appUser1.setAccountBalance(appUser1.getAccountBalance() + b);
-// appUserService.updateById(appUser1);
-//
-// accountChangeDetailService.deleteById(accountChangeDetail.getId());
-// return;
-// }
-// if("SUCCESS".equals(trade_state)){
-// order1.setPayTime(new Date());
-// order1.setState(108);
-// order1.setOrderNo(transaction_id);
-// OrderServiceImpl.this.updateById(order1);
-//
-// //处理抽成及收入
-// saveCommission(order1);
-// return;
-// }
-// if("USERPAYING".equals(trade_state) || "ACCEPT".equals(trade_state)){
-// Thread.sleep(wait);
-// num++;
-// }
-// }else{
-// Thread.sleep(wait);
-// num++;
-// }
-// if(10 == num){
-// AccountChangeDetail accountChangeDetail1 = accountChangeDetailService.selectById(accountChangeDetail.getId());
-// AppUser appUser1 = appUserService.selectById(accountChangeDetail1.getUserId());
-// Double b = accountChangeDetail1.getOldData() - accountChangeDetail1.getNewData();
-// appUser1.setAccountBalance(appUser1.getAccountBalance() + b);
-// appUserService.updateById(appUser1);
-//
-// accountChangeDetailService.deleteById(accountChangeDetail.getId());
-// }
-// }
-// }catch (Exception e){
-// e.printStackTrace();
-// }
-// }
-// }).start();
-// return weixinpay;
+ //处理佣金和收入记录
+ saveCommission(order);
}
-// order.setPayTime(new Date());
-// this.updateById(order);
-
-
return ResultUtil.success();
}
@@ -1206,135 +1249,6 @@
pushOrderInfoWarpper.setState(order.getState());
pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
}
-
- //支付成功---->异步分账----->10s钟后再进行确认收货
- //确认收货后才能进行提现（结算接口）
- //异步分账
- List<Revenue> revenues = revenueService.selectList(new EntityWrapper<Revenue>().eq("orderId", order.getId()));
- Complete complete = new Complete();
- complete.setOriginalMerOrderId(transaction_id);
- complete.setNotifyUrl(callbackPath + "/base/order/ledgerCallback");
- List<PamentOrderUser> splitList = new ArrayList<>();
- for (Revenue revenue : revenues) {
- if(revenue.getUserType() == 2){//司机
- Driver driver = driverService.selectById(revenue.getUserId());
- PamentOrderUser pamentOrderUser = new PamentOrderUser();
- pamentOrderUser.setSplitUserId(driver.getMerchantNumber());
- pamentOrderUser.setSplitAmount(revenue.getAmount().toString());
- pamentOrderUser.setSplitType("2");
- splitList.add(pamentOrderUser);
-
- DivisionRecord divisionRecord = new DivisionRecord();
- divisionRecord.setUserType(1);
- divisionRecord.setUserId(revenue.getUserId());
- divisionRecord.setOrderId(order.getId());
- divisionRecord.setMerOrderId(transaction_id);
- divisionRecord.setSourceType(1);
- divisionRecord.setAmount(revenue.getAmount());
- divisionRecord.setMerchantNumber(driver.getMerchantNumber());
- divisionRecord.setState(1);
- divisionRecord.setCreateTime(new Date());
- divisionRecordService.insert(divisionRecord);
- }
- if(revenue.getUserType() == 3){//代理商
- Agent agent = agentService.selectById(revenue.getUserId());
- PamentOrderUser pamentOrderUser = new PamentOrderUser();
- pamentOrderUser.setSplitUserId(agent.getMerchantNumber());
- pamentOrderUser.setSplitAmount(revenue.getAmount().toString());
- pamentOrderUser.setSplitType("2");
- splitList.add(pamentOrderUser);
-
- DivisionRecord divisionRecord = new DivisionRecord();
- divisionRecord.setUserType(2);
- divisionRecord.setUserId(revenue.getUserId());
- divisionRecord.setOrderId(order.getId());
- divisionRecord.setMerOrderId(transaction_id);
- divisionRecord.setSourceType(1);
- divisionRecord.setAmount(revenue.getAmount());
- divisionRecord.setMerchantNumber(agent.getMerchantNumber());
- divisionRecord.setState(1);
- divisionRecord.setCreateTime(new Date());
- divisionRecordService.insert(divisionRecord);
- }
-
- }
- complete.setSplitList(splitList);
- TrhRequest<Complete> request = new TrhRequest();
- InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
- return ResultUtil.error(execute.getMsg());
- }
- JSONObject jsonObject = JSON.parseObject(execute.getResult());
- String status = jsonObject.getString("status");
- if("2".equals(status)){
- return ResultUtil.error("失败");
- }
- if("0".equals(status)){
- return ResultUtil.error("处理中");
- }
-
- //使用优惠券的情况，通过转账接口将优惠券的收入转到司机电子账簿
- if(null != order.getCouponId()){
- List<PlatformRechargeRecord> platformRechargeRecords = platformRechargeRecordService.selectList(new EntityWrapper<PlatformRechargeRecord>().eq("state", 2).last(" and balance > 0 order by payTime"));
- Double discountedPrice = order.getDiscountedPrice();
- Driver driver = driverService.selectById(order.getDriverId());
-
- UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
- Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(order.getDriverId());
- accountChangeDetail.setCreateTime(new Date());
- accountChangeDetail.setOldData(driver.getCouponBalance());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(7);
- accountChangeDetail.setOrderId(order.getId());
- accountChangeDetail.setExplain("优惠券收入");
- driver.setCouponBalance(driver.getCouponBalance() + coupon.getCouponPreferentialAmount());
- accountChangeDetail.setNewData(driver.getCouponBalance());
- driverService.updateById(driver);
- accountChangeDetailService.insert(accountChangeDetail);
-
-
- for (PlatformRechargeRecord platformRechargeRecord : platformRechargeRecords) {
- if(discountedPrice == 0){
- break;
- }
-
- if(platformRechargeRecord.getBalance().compareTo(discountedPrice) >= 0){
- discountedPrice = 0D;
- platformRechargeRecord.setBalance(platformRechargeRecord.getBalance() - discountedPrice);
- platformRechargeRecordService.updateById(platformRechargeRecord);
- }else{
-
- }
-
- Transfer transfer = new Transfer();
- transfer.setDepositMerOrderId("6831518911582834611");
- transfer.setToUserId(driver.getMerchantNumber());
- transfer.setAmount(discountedPrice.toString());
- transfer.setOrderName("");
- transfer.setNotifyUrl("");
- transfer.setParameter1(order.getId().toString());
-
- TrhRequest<Transfer> request1 = new TrhRequest();
- InterfaceResponse execute1 = request1.execute(transfer, Transfer.SERVICE_CODE);
- if(!"0000".equals(execute1.getResult())){
- return ResultUtil.error(execute1.getMsg());
- }
- JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
- String status1 = jsonObject1.getString("status");
- if("2".equals(status1)){
- return ResultUtil.error("失败");
- }
- if("0".equals(status1)){
- return ResultUtil.error("处理中");
- }
- }
- }
-
-
return ResultUtil.success();
}
@@ -1431,7 +1345,7 @@
//司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
Driver driver = driverService.selectById(order.getDriverId());
AppUser appUser = appUserService.selectById(order.getUserId());
- Double payMoney = order.getPayMoney();
+ Double payMoney = order.getPayMoney();//todo 司机订单收入归并到佣金中一起提现
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
if(null != systemConfig){
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
@@ -1457,11 +1371,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);
@@ -1473,22 +1387,46 @@
revenue.setAmount(num1);
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"));
+ 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_);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num1_ -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
}
num3 = (num3 >= num1 ? num3 - num1 : 0);
}
//开始处理层级抽佣
- 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 +1442,42 @@
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);
+
+ //补贴中分账
+ Double num5_ = num5;
+ 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(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_);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num5_ -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
+
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 +1493,43 @@
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);
+
+ //补贴中分账
+ Double num6_ = num6;
+ 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(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_);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num6_ -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
+
+
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,20 +1545,45 @@
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);
+
+ //补贴中分账
+ Double num7_ = num7;
+ 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(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_);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver3.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num7_ -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
+
num3 = (num3 >= num7 ? num3 - num7 : 0);
}
}else{
Double num3_ = jsonObject1.getDouble("num3");
Double num4 = jsonObject1.getDouble("num4");
num3_ = (num3 >= num3_ ? num3_ : num3);
- if(num3_ > 0){
+ if(num3_ > 0 && null != driver1){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
@@ -1585,17 +1599,42 @@
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);
+
+ //补贴中分账
+ Double num3_1 = num3_;
+ 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(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);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num3_1 -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
+
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,20 +1650,45 @@
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);
+
+ //补贴中分账
+ Double num4_1 = num4;
+ 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(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);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver2.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num4_1 -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
+
num3 = (num3 >= num4 ? num3 - num4 : 0);
}
}
}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,19 +1704,44 @@
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);
+
+ //补贴中分账
+ Double num2_1 = num2_;
+ 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(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);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver1.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num2_1 -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
+
num3 = (num3 >= num2_ ? num3 - num2_ : 0);
}
}
}
//处理代理商抽佣
- if(num3 > 0){
+ if(num3 > 0 && null != driver){
Revenue revenue = new Revenue();
revenue.setType(1);
revenue.setUserType(3);
@@ -1661,6 +1750,32 @@
revenue.setAmount(num3);
revenue.setCreateTime(new Date());
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"));
+ 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);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), agent.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num3_1 -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
}
}
}
@@ -1671,7 +1786,7 @@
revenue.setUserType(2);
revenue.setUserId(driver.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(payMoney + order.getDiscountedPrice());
+ revenue.setAmount(payMoney + order.getDiscountedPrice() + order.getDiscountAmount());
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1682,20 +1797,342 @@
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());
+ 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;
+ }
+ }
+ }
+
}
- accountChangeDetail.setNewData(driver.getBalance() + driver.getCouponBalance());
+ if(null != order.getDiscountAmount() && 0 < order.getDiscountAmount()){
+ accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(order.getDriverId());
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setExplain("折扣优惠收入");
+ driver.setCommission(driver.getCommission() + order.getDiscountAmount());
+ accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.insert(accountChangeDetail);
+ //补贴中分账
+ Double discountedPrice = order.getDiscountAmount();
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(order.getDiscountAmount()) >= 0){
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
+ }
+ accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + 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(), order.getOrderNo(), 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(), order.getOrderNo(), 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(), order.getOrderNo(), 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(), order.getOrderNo(), 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(), order.getOrderNo(), 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(), order.getOrderNo(), 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(), order.getOrderNo(), 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(), order.getOrderNo(), surplusDividedAmount, 1);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ payMoney -= surplusDividedAmount;
+ }else{
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
}
/**
+ * 分账操作
+ * @param amount
+ */
+ public ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, String merOrderId, Double amount, Integer sourceType){
+ DivisionRecord divisionRecord = new DivisionRecord();
+ divisionRecord.setUserType(userType);
+ divisionRecord.setUserId(id);
+ divisionRecord.setOrderId(orderId);
+ divisionRecord.setSourceType(sourceType);
+ divisionRecord.setAmount(amount);
+ divisionRecord.setMerchantNumber(merchantNumber);
+ divisionRecord.setState(1);
+ divisionRecord.setCreateTime(new Date());
+ divisionRecordService.insert(divisionRecord);
+
+ Complete complete = new Complete();
+ complete.setOriginalMerOrderId(merOrderId);
+ complete.setNotifyUrl(callbackPath + "/base/order/ledgerCallback");
+ complete.setParameter1(divisionRecord.getId().toString());
+ //分账方列表
+ List<PamentOrderUser> splitList = new ArrayList<>();
+ PamentOrderUser pamentOrderUser = new PamentOrderUser();
+ pamentOrderUser.setSplitUserId(merchantNumber);
+ pamentOrderUser.setSplitAmount(amount.toString());
+ pamentOrderUser.setSplitType("1");
+ splitList.add(pamentOrderUser);
+ complete.setSplitList(splitList);
+ TrhRequest<Complete> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);//分账操作
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");//0：待处理 1：成功 2：失败
+ String merOrderId1 = jsonObject.getString("merOrderId");
+ if(2 == status){
+ System.err.println("订单支付成功后的分账处理异常失败");
+ return ResultUtil.error("订单支付成功后的分账处理异常失败");
+ }
+ if(1 == status){
+ divisionRecord.setMerOrderId(merOrderId1);
+ divisionRecord.setPayTime(new Date());
+ divisionRecord.setState(2);
+ divisionRecordService.updateById(divisionRecord);
+ //间隔10秒开始调用确认收货后开始提现
+
+ new Timer().schedule(new TimerTask() {//确认收货和提现
+ @Override
+ public void run() {
+ confirmReceipt(merchantNumber, merOrderId, divisionRecord);
+ }
+ }, 15000);
+ return ResultUtil.success();
+ }
+ }else{
+ System.err.println("订单支付成功后的分账处理异常 ：" + execute.getMsg());
+ return ResultUtil.error("订单支付成功后的分账处理异常 ：" + execute.getMsg());
+ }
+ return ResultUtil.error("未知异常");
+ }
+
+
+
+
+ /**
+ * 分账后的确认收货
+ * @param divisionRecord
+ */
+ public void confirmReceipt(String merchantNumber, String orderNumber, DivisionRecord divisionRecord){
+ Receive receive = new Receive();
+ receive.setOriginalMerOrderId(orderNumber);
+ receive.setAsynMerOrderId(divisionRecord.getMerOrderId());
+ receive.setRcvAmount(divisionRecord.getAmount().toString());
+ List<ReceiveUser> splitList = new ArrayList<>();
+ ReceiveUser receiveUser = new ReceiveUser();
+ receiveUser.setSplitUserId(merchantNumber);
+ receiveUser.setRcvSplitAmount(divisionRecord.getAmount().toString());
+ splitList.add(receiveUser);
+ receive.setSplitList(splitList);
+ TrhRequest<Receive> request = new TrhRequest();
+ InterfaceResponse execute1 = request.execute(receive, Receive.SERVICE_CODE);//确认收货
+ if("0000".equals(execute1.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute1.getResult());
+ String merOrderId = jsonObject.getString("merOrderId");
+ System.err.println("分账确认收货成功");
+ }else{
+ System.err.println("分账确认收货异常" + execute1.getMsg());
+ }
+ }
+
+
+ /**
+ * 转账
+ * @param id
+ * @param merOrderId
+ * @param toUserId
+ * @param amount
+ * @param notifyUrl
+ * @return
+ */
+ public ResultUtil 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)));
+ transfer.setOrderName("补贴");
+ transfer.setNotifyUrl(notifyUrl);
+ transfer.setParameter1(id.toString());
+ TrhRequest<Transfer> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(transfer, Transfer.SERVICE_CODE);
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");//0：待处理；1：成功；2：失败
+ if(2 == status){
+ System.err.println("转账失败");
+ return ResultUtil.error("转账失败");
+ }
+ return ResultUtil.success();
+ }else{
+ System.err.println("转账失败：" + execute.getMsg());
+ return ResultUtil.error(execute.getMsg());
+ }
+ }
+
+
+
+ /**
* 获取乘客行程
* @param uid
* @param pageNum
--
Gitblit v1.7.1