Merge pull request jeequan#1 from binarywang/update_weixin_java_pay_2…

….8.0 weixin-java-pay采用最新的2.8.0版本
m0o0m · Sep 6, 2017 · ddae755 · ddae755
2 parents b7f1157 + a030600
commit ddae755
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/xxpay4spring-cloud/xxpay-service/pom.xml b/xxpay4spring-cloud/xxpay-service/pom.xml
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>com.github.binarywang</groupId>
 			<artifactId>weixin-java-pay</artifactId>
-			<version>2.7.7</version>
+			<version>2.8.0</version>
 		</dependency>
 		<!--ali_pay-->
 		<dependency>

diff --git a/...loud/xxpay-service/src/main/java/org/xxpay/service/controller/Notify4WxPayController.java b/...loud/xxpay-service/src/main/java/org/xxpay/service/controller/Notify4WxPayController.java
@@ -1,7 +1,7 @@
 package org.xxpay.service.controller;
 
-import com.github.binarywang.wxpay.bean.WxPayOrderNotifyResponse;
-import com.github.binarywang.wxpay.bean.result.WxPayOrderNotifyResult;
+import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
@@ -70,7 +70,7 @@ public String doWxPayRes(HttpServletRequest request, HttpServletResponse respons
 			payContext.put("parameters", result);
 			// 验证业务数据是否正确,验证通过后返回PayOrder和WxPayConfig对象
 			if(!verifyWxPayParams(payContext)) {
-				return WxPayOrderNotifyResponse.fail((String) payContext.get("retMsg"));
+				return WxPayNotifyResponse.fail((String) payContext.get("retMsg"));
 			}
 			PayOrder payOrder = (PayOrder) payContext.get("payOrder");
 			WxPayConfig wxPayConfig = (WxPayConfig) payContext.get("wxPayConfig");
@@ -83,25 +83,25 @@ public String doWxPayRes(HttpServletRequest request, HttpServletResponse respons
 				int updatePayOrderRows = payOrderService.updateStatus4Success(payOrder.getPayOrderId());
 				if (updatePayOrderRows != 1) {
 					_log.error("{}更新支付状态失败,将payOrderId={},更新payStatus={}失败", logPrefix, payOrder.getPayOrderId(), PayConstant.PAY_STATUS_SUCCESS);
-					return WxPayOrderNotifyResponse.fail("处理订单失败");
+					return WxPayNotifyResponse.fail("处理订单失败");
 				}
 				_log.error("{}更新支付状态成功,将payOrderId={},更新payStatus={}成功", logPrefix, payOrder.getPayOrderId(), PayConstant.PAY_STATUS_SUCCESS);
 				payOrder.setStatus(PayConstant.PAY_STATUS_SUCCESS);
 			}
 			// 业务系统后端通知
 			doNotify(payOrder);
 			_log.info("====== 完成接收微信支付回调通知 ======");
-			return WxPayOrderNotifyResponse.success("处理成功");
+			return WxPayNotifyResponse.success("处理成功");
 		} catch (WxPayException e) {
 			//出现业务错误
 			_log.error(e, "微信回调结果异常,异常原因");
 			_log.info("{}请求数据result_code=FAIL", logPrefix);
 			_log.info("err_code:", e.getErrCode());
 			_log.info("err_code_des:", e.getErrCodeDes());
-			return WxPayOrderNotifyResponse.fail(e.getMessage());
+			return WxPayNotifyResponse.fail(e.getMessage());
 		} catch (Exception e) {
 			_log.error(e, "微信回调结果异常,异常原因");
-			return WxPayOrderNotifyResponse.fail(e.getMessage());
+			return WxPayNotifyResponse.fail(e.getMessage());
 		}
 	}