From 13d2bd6a27f941cfd8f096a7ae2def858a565363 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:01:34 +0800
Subject: [PATCH] 修改2.0 bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/SettlementRecordController.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 5b31f26..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;
@@ -83,19 +84,19 @@
@ResponseBody
@PostMapping("/api/settlementRecord/queryHistoricalSettlement")
- @ApiOperation(value = "获取结算历史记录", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "获取结算历史记录【2.0】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<QueryHistoricalSettlement>> queryHistoricalSettlement(Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<QueryHistoricalSettlement>> queryHistoricalSettlement(Integer language, Integer pageNum, Integer size, HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- List<QueryHistoricalSettlement> queryHistoricalSettlements = settlementRecordService.queryHistoricalSettlement(uid, pageNum, size);
+ List<QueryHistoricalSettlement> queryHistoricalSettlements = settlementRecordService.queryHistoricalSettlement(language, uid, pageNum, size);
return ResultUtil.success(queryHistoricalSettlements);
}catch (Exception e){
e.printStackTrace();
@@ -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 {
@@ -158,13 +159,17 @@
String order_id = payments.getPayer_transaction_id();
if(ToolUtil.isNotEmpty(out_trade_no)){
Integer language = Integer.valueOf(out_trade_no.substring(17, 18));
- Integer id = Integer.valueOf(out_trade_no.substring(18));
+ 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.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