From 12c9a7158a55e52a61ea9ef454741e0322233fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Tue, 25 Aug 2020 15:48:55 +0800
Subject: [PATCH] :arrow_up: Upgrading dependencies. #1723 up wxjava3.9.0

---
 pigx-common/pigx-common-bom/pom.xml           |  4 ++--
 .../controller/PayGoodsOrderController.java   | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 1592cb940..dcbfd4222 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -23,8 +23,8 @@
 		<druid.version>1.1.21</druid.version>
 		<mysql.connector.version>8.0.21</mysql.connector.version>
 		<swagger.core.version>1.5.22</swagger.core.version>
-		<mp.weixin.version>3.8.0</mp.weixin.version>
-		<ijpay.version>2.6.3</ijpay.version>
+		<mp.weixin.version>3.9.0</mp.weixin.version>
+		<ijpay.version>2.7.0</ijpay.version>
 		<groovy.version>3.0.3</groovy.version>
 		<security.oauth.version>2.3.6.RELEASE</security.oauth.version>
 		<fastjson.version>1.2.73</fastjson.version>
diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java
index f62363640..38e05453f 100755
--- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java
+++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java
@@ -58,7 +58,8 @@ public class PayGoodsOrderController {
 
 	/**
 	 * 商品订单
-	 * @param goods 商品
+	 *
+	 * @param goods    商品
 	 * @param response
 	 * @return R
 	 */
@@ -85,9 +86,10 @@ public class PayGoodsOrderController {
 
 	/**
 	 * oauth
-	 * @param goods 商品信息
-	 * @param state appid
-	 * @param code 回调code
+	 *
+	 * @param goods        商品信息
+	 * @param state        appid
+	 * @param code         回调code
 	 * @param modelAndView
 	 * @return
 	 * @throws WxErrorException
@@ -97,7 +99,7 @@ public class PayGoodsOrderController {
 	@GetMapping("/wx")
 	public ModelAndView wx(PayGoodsOrder goods, String state, String code, ModelAndView modelAndView) {
 		WxMpService wxMpService = PayConfigParmaInitRunner.mpServiceMap.get(state);
-		WxMpOAuth2AccessToken wxMpOAuth2AccessToken = wxMpService.oauth2getAccessToken(code);
+		WxMpOAuth2AccessToken wxMpOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(code);
 		goods.setUserId(wxMpOAuth2AccessToken.getOpenId());
 		goods.setAmount(goods.getAmount());
 		modelAndView.setViewName("pay");
@@ -107,7 +109,8 @@ public class PayGoodsOrderController {
 
 	/**
 	 * 分页查询
-	 * @param page 分页对象
+	 *
+	 * @param page          分页对象
 	 * @param payGoodsOrder 商品订单表
 	 * @return
 	 */
@@ -119,6 +122,7 @@ public class PayGoodsOrderController {
 
 	/**
 	 * 通过id查询商品订单表
+	 *
 	 * @param goodsOrderId id
 	 * @return R
 	 */
@@ -130,6 +134,7 @@ public class PayGoodsOrderController {
 
 	/**
 	 * 新增商品订单表
+	 *
 	 * @param payGoodsOrder 商品订单表
 	 * @return R
 	 */
@@ -143,6 +148,7 @@ public class PayGoodsOrderController {
 
 	/**
 	 * 修改商品订单表
+	 *
 	 * @param payGoodsOrder 商品订单表
 	 * @return R
 	 */
@@ -156,6 +162,7 @@ public class PayGoodsOrderController {
 
 	/**
 	 * 通过id删除商品订单表
+	 *
 	 * @param goodsOrderId id
 	 * @return R
 	 */