From 06057d33c65653f80ccf716a396b89052e2d8eb6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 03 六月 2023 02:06:31 +0800
Subject: [PATCH] 更新部分代码
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index d0e7e06..2083d82 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -718,6 +718,7 @@
if("2".equals(status)){
return ResultUtil.error("失败");
}
+ String merOrderId = jsonObject.getString("merOrderId");
String payCode = jsonObject.getString("payCode");
if(ToolUtil.isNotEmpty(payCode)){
new Thread(new Runnable() {
@@ -734,13 +735,7 @@
return;
}
QueryOrder queryOrder = new QueryOrder();
- /**
- * 原请求订单号(必填) 字段长度最长：32位
- */
- queryOrder.setOriginalMerOrderId(out_trade_no);
- /**
- * 1：支付查询 2：退款查询 3：确认收货查询 4：结算查询 5：充值查询 6：转账查询 7：异步分账查询(必填) 字段长度最长：1位
- */
+ queryOrder.setOriginalMerOrderId(merOrderId);
queryOrder.setQueryType("1");
TrhRequest<QueryOrder> request = new TrhRequest();
InterfaceResponse execute1 = request.execute(queryOrder, QueryOrder.SERVICE_CODE);
@@ -942,6 +937,7 @@
registerVO.setUserName(name);
registerVO.setCertId(number);
registerVO.setNotifyUrl(callbackPath + notifyUrl);
+ registerVO.setParameter1(uid.toString());
TrhRequest<Register> request = new TrhRequest();
InterfaceResponse execute = request.execute(registerVO, Register.SERVICE_CODE);
if(!"0000".equals(execute.getCode())){
@@ -953,6 +949,10 @@
return ResultUtil.error("失败");
}
if("0".equals(status)){
+ driver.setMerchantIDCode(number);
+ driver.setMerchantName(name);
+ driver.setMerchantPhone(phone);
+ this.updateById(driver);
return ResultUtil.error("处理中");
}
String userId = jsonObject.getString("userId");
--
Gitblit v1.7.1