pipIrr-SV.git - Gitblit

			@@ -69,12 +69,12 @@
			//private final String appid = com.dy.pipIrrWechat.wechatpay.PayInfo.appid;
			//private final String secret = com.dy.pipIrrWechat.wechatpay.PayInfo.secret;
			//private final String mchid = com.dy.pipIrrWechat.wechatpay.PayInfo.mchid;
			private final String schema = com.dy.pipIrrWechat.wechatpay.PayInfo.schema;
			private final String signType = com.dy.pipIrrWechat.wechatpay.PayInfo.signType;
			private final String description = com.dy.pipIrrWechat.wechatpay.PayInfo.description;
			private final String loginUrl = com.dy.pipIrrWechat.wechatpay.PayInfo.loginUrl;
			private final String notifyUrl = com.dy.pipIrrWechat.wechatpay.PayInfo.notifyUrl;
			private final String grantType = com.dy.pipIrrWechat.wechatpay.PayInfo.grantType;
			//private final String schema = com.dy.pipIrrWechat.wechatpay.PayInfo.schema;
			//private final String signType = com.dy.pipIrrWechat.wechatpay.PayInfo.signType;
			//private final String description = com.dy.pipIrrWechat.wechatpay.PayInfo.description;
			//private final String loginUrl = com.dy.pipIrrWechat.wechatpay.PayInfo.loginUrl;
			//private final String notifyUrl = com.dy.pipIrrWechat.wechatpay.PayInfo.notifyUrl;
			//private final String grantType = com.dy.pipIrrWechat.wechatpay.PayInfo.grantType;

			// 平台证书公钥
			private final Map CERTIFICATE_MAP = new HashMap();
			@@ -109,9 +109,9 @@
			queryParams.put("appid", PayInfo.appid);
			queryParams.put("secret", PayInfo.secret);
			queryParams.put("js_code", jsCode);
			queryParams.put("grant_type", grantType);
			queryParams.put("grant_type", com.dy.pipIrrWechat.wechatpay.PayInfo.grantType);
			Map<String, String> headerParams = new HashMap<>();
			JSONObject job = restTemplateUtil.get(loginUrl, queryParams, headerParams);
			JSONObject job = restTemplateUtil.get(com.dy.pipIrrWechat.wechatpay.PayInfo.loginUrl, queryParams, headerParams);

			if(job.getLong("errcode") != null && job.getLong("errcode") >= -1) {
			return BaseResponseUtils.buildFail("登录凭证校验失败");
			@@ -163,7 +163,7 @@
			Long timestamp = System.currentTimeMillis() / 1000;

			byte[] certFileBs = WxCertUtil.getKey_pemBytes(resourceLoader) ;
			String header = schema + " " + payHelper.getToken(method, httpUrl, "", nonceStr, timestamp, certFileBs);
			String header = com.dy.pipIrrWechat.wechatpay.PayInfo.schema + " " + payHelper.getToken(method, httpUrl, "", nonceStr, timestamp, certFileBs);

			Map<String, String> headers = new HashMap<>();
			headers.put("Authorization", header);
			@@ -260,10 +260,10 @@
			JSONObject job_body = new JSONObject();
			job_body.put("appid", PayInfo.appid);
			job_body.put("mchid", PayInfo.mchid);
			job_body.put("description", description);
			job_body.put("description", com.dy.pipIrrWechat.wechatpay.PayInfo.description);
			job_body.put("out_trade_no", orderNumber);
			job_body.put("attach", DataSourceContext.get());
			job_body.put("notify_url", notifyUrl);
			job_body.put("notify_url", com.dy.pipIrrWechat.wechatpay.PayInfo.notifyUrl);

			//订单金额
			JSONObject job_amount = new JSONObject();
			@@ -285,7 +285,7 @@

			String body = job_body.toJSONString();
			byte[] certFileBs = WxCertUtil.getKey_pemBytes(resourceLoader) ;
			String header = schema + " " + payHelper.getToken(method, httpUrl, body, nonceStr, timestamp, certFileBs);
			String header = com.dy.pipIrrWechat.wechatpay.PayInfo.schema + " " + payHelper.getToken(method, httpUrl, body, nonceStr, timestamp, certFileBs);

			Map<String, String> headers = new HashMap<>();
			headers.put("Authorization", header);
			@@ -333,7 +333,7 @@
			job_result.put("timeStamp", timeStamp);
			job_result.put("nonceStr", nonceStr);
			job_result.put("package", pkg);
			job_result.put("signType", signType);
			job_result.put("signType", com.dy.pipIrrWechat.wechatpay.PayInfo.signType);
			job_result.put("paySign", paySign);

			return BaseResponseUtils.buildSuccess(job_result) ;

	pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientSv.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -126,11 +126,7 @@
			@SsoAop()
			public BaseResponse<QueryResultVo<List<VoIntake>>> getIntakes(QueryVo vo) {
			try {
			QueryResultVo<List<VoIntake>> res = intakeSv.getIntakes(vo);
			if (res == null) {
			return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
			}
			return BaseResponseUtils.buildSuccess(res);
			return BaseResponseUtils.buildSuccess(intakeSv.getIntakes(vo));
			} catch (Exception e) {
			log.error("获取取水口记录异常", e);
			return BaseResponseUtils.buildException(e.getMessage());

			@@ -112,6 +112,12 @@
			return BaseResponseUtils.buildErrorMsg(WechatResultCode.PHONE_NUMBER_CANNOT_BE_NULL.getMessage());
			}

			Long clientId = clientSv.getClientIdByPhone(phoneNumber);
			if(clientId == null) {
			return BaseResponseUtils.buildErrorMsg("该手机号对应的农户不存在");
			}


			// 生成6位验证码并转为Json格式
			String securityCode = String.valueOf(RandomCode.genCode());
			JSONObject param = new JSONObject();

			@@ -82,4 +82,5 @@
			public Integer unbindWechat(Long sessionId) {
			return seOpenIdMapper.deleteByPrimaryKey(sessionId);
			}

			}