~chenkun/IgoTravel.git

			@@ -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é.");

			@@ -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;
			}

	DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverIGOTravel/guns-parent.iml	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/Tingg/TinggPayoutUtil.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史