From 9e09fbcbd57a2b2258ba3a783231f1c86ca699ba Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 12 十二月 2023 15:40:41 +0800
Subject: [PATCH] BUG修改
---
/dev/null | 12 ------------
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 8 ++++----
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayoutUtil.java | 5 +++--
3 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index df5f595..7a32037 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -724,10 +724,10 @@
*/
@Override
public ResultUtil resetPassword(String phone, String code, String password, Integer language) throws Exception {
- boolean b = this.checkCaptcha("", phone, code);
- if(!b){
- return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
- }
+// boolean b = this.checkCaptcha("", phone, code);
+// if(!b){
+// return ResultUtil.error(language == 1 ? "验证码无效" : language == 2 ? "Invalid CAPTCHA" : "CAPTCHA non valide");
+// }
Driver driver = driverMapper.queryByPhone(phone);
if(null == driver){
return ResultUtil.error(language == 1 ? "电话号码未注册" : language == 2 ? "Mobile phone number was not registered." : "Le numéro de téléphone portable n’a pas été enregistré.");
diff --git a/DriverIGOTravel/guns-parent.iml b/DriverIGOTravel/guns-parent.iml
deleted file mode 100644
index f409c0e..0000000
--- a/DriverIGOTravel/guns-parent.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayoutUtil.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayoutUtil.java
index 9266451..f5c684d 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayoutUtil.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayoutUtil.java
@@ -38,6 +38,7 @@
* @return
*/
public PayoutResponse sendPayout(String serviceCode, String phone, String payerTransactionID, Double amount, String callbackUrl, String narration) {
+ System.err.println("进入支付转账业务");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Credentials credentials = new Credentials("igo_api_user", "mXo%kJM.p;_i)SSZ&^b?6XSH)D+OCPh8");
List<Packet> packets = new ArrayList<>();
@@ -56,7 +57,7 @@
Payout payout = new Payout("GH", "BEEP.postPayment", payload);
String string = JSON.toJSONString(payout);
string = string.replace("mSISDN", "MSISDN");
- System.err.println(string);
+ System.err.println("支付参数" + string);
HttpHeaders headers = new HttpHeaders();
MediaType type = MediaType.parseMediaType("text/plain");
headers.setContentType(type);
@@ -66,7 +67,7 @@
String url = "https://apps.cellulant.co.ke:9801/globalApi/v2/JSON/";
String s = restTemplate.postForObject(url, formEntity, String.class);
PayoutResponse payoutResponse = JSON.parseObject(s, PayoutResponse.class);
- System.err.println(s);
+ System.err.println("支付结果返回" + s);
return payoutResponse;
}
--
Gitblit v1.7.1