From 5ee4dfad6e7b48885e205f8f945276b5d4ca5670 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:34:27 +0800
Subject: [PATCH] 修改支付
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 488 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 388 insertions(+), 100 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 49c1200..af5bc2e 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
@@ -12,11 +12,15 @@
import com.supersavedriving.user.modular.system.util.*;
import com.supersavedriving.user.modular.system.util.GaoDe.MapUtil;
import com.supersavedriving.user.modular.system.util.GaoDe.model.District;
+import com.supersavedriving.user.modular.system.util.MallBook.model.*;
+import com.supersavedriving.user.modular.system.util.MallBook.util.Transfer;
+import com.supersavedriving.user.modular.system.util.MallBook.util.TrhRequest;
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 org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.geo.Circle;
import org.springframework.data.geo.Distance;
import org.springframework.data.geo.Metrics;
@@ -29,6 +33,7 @@
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
+import java.net.InetAddress;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -89,6 +94,18 @@
@Autowired
private IRevenueService revenueService;
+
+ @Autowired
+ private IAgentService agentService;
+
+ @Autowired
+ private IPlatformRechargeRecordService platformRechargeRecordService;
+
+ @Autowired
+ private IDivisionRecordService divisionRecordService;
+
+ @Value("${callbackPath}")
+ private String callbackPath;//支付回调网关地址
@@ -370,11 +387,13 @@
String startAddress = travelOrder.getStartAddress();
startAddress = startAddress.replaceAll("& #40;", "(");
startAddress = startAddress.replaceAll("& #41;", ")");
- travelOrder.setStartAddress(startAddress);;
- String endAddress = travelOrder.getEndAddress();
- endAddress = endAddress.replaceAll("& #40;", "(");
- endAddress = endAddress.replaceAll("& #41;", ")");
- travelOrder.setEndAddress(endAddress);
+ travelOrder.setStartAddress(startAddress);
+ if(ToolUtil.isNotEmpty(travelOrder.getEndAddress())){
+ String endAddress = travelOrder.getEndAddress();
+ endAddress = endAddress.replaceAll("& #40;", "(");
+ endAddress = endAddress.replaceAll("& #41;", ")");
+ travelOrder.setEndAddress(endAddress);
+ }
order = new Order();
BeanUtils.copyProperties(travelOrder, order);
@@ -383,7 +402,6 @@
order.setUserName(appUser.getNickname());
}
order.setUserId(uid);
- order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3));
order.setSource(1);
order.setHallOrder(0);
order.setStatus(1);
@@ -397,6 +415,7 @@
}
d = Double.valueOf(distance.get("distance")) / 1000;
order.setEstimatedMileage(d);
+ order.setEstimatedTime(Integer.valueOf(distance.get("duration")) / 60);
}
String city = "";
District geocode = MapUtil.geocode(order.getStartLng(), order.getStartLat());
@@ -412,6 +431,9 @@
return ResultUtil.error("司机还未上班");
}
Driver driver = driverService.selectById(travelOrder.getDriverId());
+ if(driver.getServerStatus() == 2){
+ return ResultUtil.error("司机正在服务中");
+ }
order.setAgentId(driver.getAgentId());
order.setBranchOfficeId(driver.getBranchOfficeId());
order.setOrderTakingTime(new Date());
@@ -420,11 +442,13 @@
driverService.updateById(driver);
appUser.setCancelCount(0);
+ appUser.setIsException(1);
appUserService.updateById(appUser);
}
for (Integer i = 0; i < travelOrder.getDriverNum(); i++) {
order.setId(null);
+ order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3));
this.insert(order);
//推送状态
@@ -611,6 +635,9 @@
this.updateById(order);
AppUser appUser = appUserService.selectById(uid);
appUser.setCancelCount(appUser.getCancelCount() + 1);
+ if(appUser.getCancelCount() >= 3){
+ appUser.setIsException(2);
+ }
appUserService.updateById(appUser);
Driver driver = driverService.selectById(order.getDriverId());
if(null != driver){
@@ -676,6 +703,7 @@
}
d = Double.valueOf(distance.get("distance")) / 1000;
order.setEstimatedMileage(d);
+ order.setEstimatedTime(Integer.valueOf(distance.get("duration")) / 60);
}
String city = "";
District geocode = MapUtil.geocode(order.getStartLng().toString(), order.getStartLat().toString());
@@ -689,6 +717,14 @@
Order orderPrice = getOrderPrice(1, d, 0, order1, city);
order.setEstimatedPrice(orderPrice.getEstimatedPrice());
this.updateById(order);
+
+ PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+ pushOrderInfoWarpper.setId(order.getId());
+ pushOrderInfoWarpper.setState(order.getState());
+ pushOrderInfoWarpper.setEndAddress(order.getEndAddress());
+ pushOrderInfoWarpper.setEndLat(order.getEndLat());
+ pushOrderInfoWarpper.setEndLng(order.getEndLng());
+ pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
return ResultUtil.success();
}
@@ -704,20 +740,24 @@
Order order = this.selectById(orderId);
OrderPriceWarpper orderPriceWarpper = new OrderPriceWarpper();
BeanUtils.copyProperties(order, orderPriceWarpper);
- 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.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);
}
- orderPriceWarpper.setDiscount(0D);
- orderPriceWarpper.setDiscountAmount(0D);
- orderPriceWarpper.setPayType(1);//微信支付
- orderPriceWarpper.setPayMoney(orderMoney);
return orderPriceWarpper;
}
@@ -737,6 +777,8 @@
OrderPriceWarpper orderPriceWarpper = new OrderPriceWarpper();
BeanUtils.copyProperties(order, orderPriceWarpper);
AppUser appUser = appUserService.selectById(uid);
+ 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());
orderPriceWarpper.setBalance(appUser.getAccountBalance());
orderPriceWarpper.setDiscount(0D);
orderPriceWarpper.setDiscountAmount(0D);
@@ -745,7 +787,6 @@
//先算优惠券
Coupon coupon = userToCouponService.queryCoupon(uid, orderMoney);
if(null != coupon && null == couponId){
- orderMoney = orderMoney - coupon.getCouponPreferentialAmount();
orderPriceWarpper.setDiscountedPrice(coupon.getCouponPreferentialAmount());
orderPriceWarpper.setCouponId(coupon.getId());
}
@@ -756,10 +797,10 @@
orderPriceWarpper.setDiscountedPrice(coupon1.getCouponPreferentialAmount());
orderPriceWarpper.setCouponId(couponId);
}
- if(payType == 1 && appUser.getHavDiscount() == 1){//使用余额抵扣
+ if(payType == 1 && appUser.getHavDiscount() == 1 && balance >= orderMoney){//使用余额抵扣
orderPriceWarpper.setDiscount(9D);
- orderPriceWarpper.setDiscountAmount(orderMoney * 0.1);
- orderMoney = orderMoney * 0.9;
+ 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);
@@ -838,19 +879,58 @@
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);
}
}
order.setPayType(1);
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());
+// 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);
+ paymentOrder.setAmount(String.valueOf(payMoney * 100));
+ paymentOrder.setOrderName("代驾服务费");
+ paymentOrder.setPayType("WX_MINI");
+ paymentOrder.setTransferType("0");
+ paymentOrder.setAsynSplitFlag("1");
+ paymentOrder.setAppid("");
+ paymentOrder.setOpenid(appUser.getOpenid());
+ paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
+ List<PaymentOrderGood> goodsDetail = new ArrayList<>();
+ PaymentOrderGood paymentOrderGood = new PaymentOrderGood();
+ paymentOrderGood.setGoodsName("服务费");
+ goodsDetail.add(paymentOrderGood);
+ paymentOrder.setGoodsDetail(goodsDetail);
+ paymentOrder.setFrontUrl("");
+ paymentOrder.setNotifyUrl(callbackPath + "/base/order/orderPayCallback");
+ paymentOrder.setParameter1(order.getId().toString());
+
+ TrhRequest<PaymentOrder> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
+ if(!"0000".equals(execute.getResult())){
+ return ResultUtil.error(execute.getMsg());
+ }
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ String status = jsonObject.getString("status");
+ if("2".equals(status)){
+ return ResultUtil.error("失败");
+ }
+ if("0".equals(status)){
+ return ResultUtil.error("处理中");
+ }
+ String payCode = jsonObject.getString("payCode");
this.updateById(order);
- return weixinpay;
+ return ResultUtil.success(payCode);
}
@@ -866,10 +946,27 @@
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());
+ 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);
}
}
@@ -895,6 +992,7 @@
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(1);
accountChangeDetail.setUserId(appUser.getId());
accountChangeDetail.setCreateTime(new Date());
@@ -928,6 +1026,7 @@
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());
@@ -940,6 +1039,7 @@
payMoney = payMoney > appUser.getAccountBalance() ? payMoney - appUser.getAccountBalance() : 0D;
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(1);
accountChangeDetail.setUserId(appUser.getId());
accountChangeDetail.setCreateTime(new Date());
@@ -956,88 +1056,128 @@
if(0 < payMoney){//还需要调起微信支付
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String out_trade_no = sdf.format(new Date()) + order.getId();
- ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
+// ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
- 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;
- }
+ PaymentOrder paymentOrder = new PaymentOrder();
+ paymentOrder.setBizOrderId(out_trade_no);
+ paymentOrder.setAmount(String.valueOf(payMoney * 100));
+ paymentOrder.setOrderName("代驾服务费");
+ paymentOrder.setPayType("WX_MINI");
+ paymentOrder.setTransferType("0");
+ paymentOrder.setAsynSplitFlag("1");
+ paymentOrder.setAppid("");
+ paymentOrder.setOpenid(appUser.getOpenid());
+ paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
+ List<PaymentOrderGood> goodsDetail = new ArrayList<>();
+ PaymentOrderGood paymentOrderGood = new PaymentOrderGood();
+ paymentOrderGood.setGoodsName("服务费");
+ goodsDetail.add(paymentOrderGood);
+ paymentOrder.setGoodsDetail(goodsDetail);
+ paymentOrder.setFrontUrl("");
+ paymentOrder.setNotifyUrl(callbackPath + "/base/order/orderPayCallback");
+ paymentOrder.setParameter1(order.getId().toString());
- /**
- * 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);
+ TrhRequest<PaymentOrder> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
+ if(!"0000".equals(execute.getResult())){
+ return ResultUtil.error(execute.getMsg());
+ }
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ String status = jsonObject.getString("status");
+ if("2".equals(status)){
+ return ResultUtil.error("失败");
+ }
+ if("0".equals(status)){
+ return ResultUtil.error("处理中");
+ }
+ String payCode = jsonObject.getString("payCode");
+ this.updateById(order);
+ return ResultUtil.success(payCode);
- 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;
+ // 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;
}
- order.setPayTime(new Date());
- this.updateById(order);
+// order.setPayTime(new Date());
+// this.updateById(order);
return ResultUtil.success();
+
}
/**
@@ -1066,8 +1206,144 @@
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();
}
+
+
+
+
+
+
+
/**
@@ -1106,6 +1382,7 @@
//增加积分变动记录
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setCreateTime(new Date());
@@ -1126,6 +1403,7 @@
//增加积分变动记录
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setCreateTime(new Date());
@@ -1174,6 +1452,7 @@
if(num1 > 0){
Driver driver1 = driverService.selectById(appUser.getInviterId());
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
@@ -1220,6 +1499,7 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
@@ -1245,6 +1525,7 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver2.getId());
accountChangeDetail.setType(1);
@@ -1270,6 +1551,7 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver3.getId());
accountChangeDetail.setType(1);
@@ -1298,6 +1580,7 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
@@ -1323,6 +1606,7 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver2.getId());
accountChangeDetail.setType(1);
@@ -1351,6 +1635,7 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
@@ -1391,6 +1676,7 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver.getId());
accountChangeDetail.setType(1);
@@ -1435,4 +1721,6 @@
notInvoiceOrder.setPageNum((notInvoiceOrder.getPageNum() - 1) * notInvoiceOrder.getPageSize());;
return this.baseMapper.queryNotInvoiceOrder(uid, notInvoiceOrder);
}
+
+
}
--
Gitblit v1.7.1