From 0001861cc63fc670646a103284b9eaefb193e91f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 10 八月 2024 17:31:48 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SettlementRecordController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SettlementRecordController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SettlementRecordController.java
index 956b9ce..f9111eb 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SettlementRecordController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SettlementRecordController.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.api;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.SettlementRecord;
import com.stylefeng.guns.modular.system.service.IDriverService;
@@ -137,7 +138,7 @@
* @return
*/
@ResponseBody
- @PostMapping("/base/settlementRecord/querySettlementAmount")
+ @PostMapping("/base/settlementRecord/paymentSettlementAmountCallback")
public CallbackResponse paymentSettlementAmountCallback(@RequestBody CallbackRequest callbackRequest){
CallbackResponse callbackResponse = new CallbackResponse();
try {
@@ -161,12 +162,14 @@
Integer payType = Integer.valueOf(out_trade_no.substring(18, 19));
Integer id = Integer.valueOf(out_trade_no.substring(19));
- SettlementRecord settlementRecord = settlementRecordService.selectById(id);
- settlementRecord.setPayType(payType);
- settlementRecord.setPaymentStatus(2);
- settlementRecord.setPayTime(new Date());
- settlementRecord.setCode(order_id);
- settlementRecordService.updateById(settlementRecord);
+ List<SettlementRecord> settlementRecords = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("driverId", id).eq("paymentStatus", 1));
+ for (SettlementRecord settlementRecord : settlementRecords) {
+ settlementRecord.setPayType(payType);
+ settlementRecord.setPaymentStatus(2);
+ settlementRecord.setPayTime(new Date());
+ settlementRecord.setCode(order_id);
+ settlementRecordService.updateById(settlementRecord);
+ }
callbackResponse.setCheckout_request_id(order_id);
callbackResponse.setMerchant_transaction_id(out_trade_no);
--
Gitblit v1.7.1