From 7cbdb488dba7018984e19dde8be9c459a5bf3eaf Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 19 十一月 2025 16:41:32 +0800
Subject: [PATCH] update
---
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index ae4e981..0db8ff9 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1122,8 +1122,11 @@
* @throws Exception
*/
@Override
- public void payOrderCrossCityCallback(Integer id, String order_id, Integer type,String no) throws Exception {
+ public void payOrderCrossCityCallback(Integer id, String order_id, Integer type,String no,String out_trade_no) throws Exception {
OrderCrossCity orderCrossCity = this.selectById(id);
+ orderCrossCity.setOutTradeNo(out_trade_no);
+
+
PaymentRecord query = paymentRecordService.query(1, orderCrossCity.getUserId(), 1, Integer.valueOf(id), 3, type, 1);
if(null != query && query.getState() == 1){
//添加交易明细
@@ -1564,7 +1567,7 @@
orderCancelService.updateById(orderCancel);
//添加已收入明细
- incomeService.saveData(1, orderCrossCity.getCompanyId(), 3, orderCrossCity.getId(), 3, query.getMoney());
+ incomeService.saveData(1, orderCrossCity.getCompanyId(), 3, orderCrossCity.getId(), 3, query.getMoney(),null);
this.deleteTask(id);//删除定时任务
@@ -1823,8 +1826,9 @@
* @throws Exception
*/
@Override
- public void payCancelOrderCrossCity(Integer id, String order_id, Integer type) throws Exception {
+ public void payCancelOrderCrossCity(Integer id, String order_id, Integer type,String out_trade_no) throws Exception {
OrderCrossCity orderCrossCity = this.selectById(id);
+ orderCrossCity.setOutTradeNo(out_trade_no);
PaymentRecord query = paymentRecordService.query(1, orderCrossCity.getUserId(), 1, Integer.valueOf(id), 3, type, 1);
if(null != query){
//添加交易明细
@@ -1849,7 +1853,7 @@
}
//添加已收入明细
- incomeService.saveData(1, orderCrossCity.getCompanyId(), 3, orderCrossCity.getId(), 3, query.getAmount());
+ incomeService.saveData(1, orderCrossCity.getCompanyId(), 3, orderCrossCity.getId(), 3, query.getAmount(),out_trade_no);
this.deleteTask(orderCrossCity.getId());//删除定时任务
@@ -2603,7 +2607,7 @@
this.updateById(orderCrossCity);
//添加已收入明细
- incomeService.saveData(2, orderCrossCity.getDriverId(), 6, orderCrossCity.getId(), 3, money);
+ incomeService.saveData(2, orderCrossCity.getDriverId(), 6, orderCrossCity.getId(), 3, money,null);
Driver driver = driverService.selectById(orderCrossCity.getDriverId());
driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -2621,7 +2625,7 @@
}
@Override
- public void payThankYouFeeCallback(Integer orderId, String order_id, Integer payType) throws Exception {
+ public void payThankYouFeeCallback(Integer orderId, String order_id, Integer payType, String out_trade_no) throws Exception {
OrderCrossCity orderCrossCity = this.selectById(orderId);
UserInfo userInfo = userInfoService.selectById(orderCrossCity.getUserId());
PaymentRecord query = paymentRecordService.query(3, userInfo.getId(), 1, orderId, 3, payType, 1);
@@ -2640,7 +2644,7 @@
this.updateById(orderCrossCity);
//添加已收入明细
- incomeService.saveData(2, orderCrossCity.getDriverId(), 6, orderCrossCity.getId(), 3, query.getAmount());
+ incomeService.saveData(2, orderCrossCity.getDriverId(), 6, orderCrossCity.getId(), 3, query.getAmount(),out_trade_no);
Driver driver = driverService.selectById(orderCrossCity.getDriverId());
driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(new BigDecimal(query.getAmount())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(new BigDecimal(query.getAmount())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
--
Gitblit v1.7.1