From f58cca364b731eac2d60a440ffaa804be3cd43fd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 30 六月 2023 10:32:28 +0800
Subject: [PATCH] 修改bug
---
driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/DriverServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/DriverServiceImpl.java
index 400320c..5e0516b 100644
--- a/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -127,11 +127,13 @@
//账号审核拒绝后的处理
if(null != driver && driver.getApprovalStatus() == 3){
try {
+ driver = new Driver();
driver = setDriverParamete(driver, driverRegisterWarpper);
+ driver.setCreateTime(new Date());
}catch (Exception e){
return ResultUtil.error(e.getMessage());
}
- this.updateAllColumnById(driver);
+ this.insert(driver);
}
//新账号
if(null == driver){
@@ -188,7 +190,7 @@
driver.setIdcard(driverRegisterWarpper.getIdcard());
driver.setIdcardBack(driverRegisterWarpper.getIdcardBack());
driver.setIdcardFront(driverRegisterWarpper.getIdcardFront());
- driver.setDriverLicenseNumber(driverRegisterWarpper.getDriverLicenseNumber());
+ driver.setDriverLicenseNumber(driverRegisterWarpper.getIdcard());
driver.setDriverLicense(driverRegisterWarpper.getDriverLicense());
driver.setFirstCertificateTime(driverRegisterWarpper.getFirstCertificateTime());
//注册地
@@ -227,6 +229,9 @@
*/
@Override
public ResultUtil<TokenWarpper> driverLogin(String receiver, String phone, String code) throws Exception {
+ if(ToolUtil.isEmpty(receiver)){
+ receiver = "+86";
+ }
String value = redisUtil.getValue(receiver + phone);
if(!"12345".equals(code) && ToolUtil.isEmpty(value)){
return ResultUtil.error("短信验证码无效");
@@ -693,6 +698,7 @@
String out_trade_no = sdf.format(new Date()) + UUIDUtil.getNumberRandom(3);
RechargeRecord rechargeRecord = new RechargeRecord();
rechargeRecord.setType(2);
+ rechargeRecord.setPayMethod(type);
rechargeRecord.setUserId(uid);
rechargeRecord.setCode(out_trade_no);
rechargeRecord.setAmount(amount);
@@ -738,10 +744,14 @@
String trade_state = map.get("trade_state");
String transaction_id = map.get("transaction_id");
if("REFUND".equals(trade_state) || "NOTPAY".equals(trade_state) || "CLOSED".equals(trade_state) || "REVOKED".equals(trade_state) || "PAYERROR".equals(trade_state)){
- rechargeRecordService.deleteById(rechargeRecord1.getId());
+ rechargeRecord1.setRemark(trade_state);
+ rechargeRecordService.updateById(rechargeRecord1);
return;
}
if("SUCCESS".equals(trade_state)){
+ rechargeRecord1.setRemark("SUCCESS");
+ rechargeRecordService.updateById(rechargeRecord1);
+
Driver driver1 = DriverServiceImpl.this.selectById(uid);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
accountChangeDetail.setUserType(2);
@@ -772,7 +782,8 @@
num++;
}
if(10 == num){
- rechargeRecordService.deleteById(rechargeRecord1.getId());
+ rechargeRecord1.setRemark("支付超时");
+ rechargeRecordService.updateById(rechargeRecord1);
}
}
}catch (Exception e){
@@ -814,10 +825,13 @@
String tradeStatus = map.get("tradeStatus");
String tradeNo = map.get("tradeNo");
if("TRADE_CLOSED".equals(tradeStatus) || "TRADE_FINISHED".equals(tradeStatus)){
- rechargeRecordService.deleteById(rechargeRecord1.getId());
+ rechargeRecord1.setRemark(tradeStatus);
+ rechargeRecordService.updateById(rechargeRecord1);
return;
}
if("TRADE_SUCCESS".equals(tradeStatus)){
+ rechargeRecord1.setRemark("TRADE_SUCCESS");
+ rechargeRecordService.updateById(rechargeRecord1);
Driver driver1 = DriverServiceImpl.this.selectById(uid);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
accountChangeDetail.setUserType(2);
@@ -848,7 +862,8 @@
num++;
}
if(10 == num){
- rechargeRecordService.deleteById(rechargeRecord1.getId());
+ rechargeRecord1.setRemark("支付超时");
+ rechargeRecordService.updateById(rechargeRecord1);
}
}
}catch (Exception e){
--
Gitblit v1.7.1