From 5ac328adc442d47b6039ed924e6de1162c90cbe0 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 20 十一月 2025 21:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index ef7bcc0..d00b11d 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -11,7 +11,7 @@
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
import com.stylefeng.guns.modular.crossCity.server.impl.OrderCrossCityServiceImpl;
-import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
+import com.stylefeng.guns.modular.huifu.biz.DouGongPayUtil;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.dao.OrderPrivateCarMapper;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
@@ -27,7 +27,6 @@
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
-import org.bouncycastle.crypto.tls.MACAlgorithm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
@@ -638,7 +637,7 @@
orderCancelService.updateById(orderCancel);
//添加已收入明细
- incomeService.saveData(1, orderTaxi.getCompanyId(), 3, orderTaxi.getId(), 2, query.getMoney());
+ incomeService.saveData(1, orderTaxi.getCompanyId(), 3, orderTaxi.getId(), 2, query.getMoney(),null);
this.deleteTask(id);//删除定时任务
@@ -1946,8 +1945,9 @@
* @throws Exception
*/
@Override
- public void payOrderTaxiCallback(Integer id, String order_id, Integer type,Integer paymentId) throws Exception {
+ public void payOrderTaxiCallback(Integer id, String order_id, Integer type,Integer paymentId,String out_trade_no) throws Exception {
OrderTaxi orderTaxi = this.selectById(id);
+ orderTaxi.setOutTradeNo(out_trade_no);
PaymentRecord query = paymentRecordService.query(1, orderTaxi.getUserId(), 1, Integer.valueOf(id), 2, type, 1);
if(null != query && query.getState() == 1){
//添加交易明细
@@ -2032,8 +2032,9 @@
* @throws Exception
*/
@Override
- public void payCancelOrderTaxi(Integer id, String order_id, Integer type) throws Exception {
+ public void payCancelOrderTaxi(Integer id, String order_id, Integer type,String out_trade_no) throws Exception {
OrderTaxi orderTaxi = this.selectById(id);
+ orderTaxi.setOutTradeNo(out_trade_no);
PaymentRecord query = paymentRecordService.query(1, orderTaxi.getUserId(), 1, Integer.valueOf(id), 2, type, 1);
if(null != query){
//添加交易明细
@@ -2058,7 +2059,7 @@
}
//添加已收入明细
- incomeService.saveData(1, orderTaxi.getCompanyId(), 3, orderTaxi.getId(), 2, query.getAmount());
+ incomeService.saveData(1, orderTaxi.getCompanyId(), 3, orderTaxi.getId(), 2, query.getAmount(),out_trade_no);
this.deleteTask(orderTaxi.getId());//删除定时任务
@@ -2208,7 +2209,7 @@
this.updateById(orderTaxi);
//添加已收入明细
- incomeService.saveData(2, orderTaxi.getDriverId(), 6, orderTaxi.getId(), 2, money);
+ incomeService.saveData(2, orderTaxi.getDriverId(), 6, orderTaxi.getId(), 2, money,null);
Driver driver = driverService.selectById(orderTaxi.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());
@@ -2226,7 +2227,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 {
OrderTaxi orderTaxi = this.selectById(orderId);
UserInfo userInfo = userInfoService.selectById(orderTaxi.getUserId());
PaymentRecord query = paymentRecordService.query(3, userInfo.getId(), 1, orderId, 2, payType, 1);
@@ -2245,7 +2246,7 @@
this.updateById(orderTaxi);
//添加已收入明细
- incomeService.saveData(2, orderTaxi.getDriverId(), 6, orderTaxi.getId(), 2, query.getAmount());
+ incomeService.saveData(2, orderTaxi.getDriverId(), 6, orderTaxi.getId(), 2, query.getAmount(),out_trade_no);
Driver driver = driverService.selectById(orderTaxi.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