From 4609dfe73e32c65cd3e8f91b26eec1a9bf096f9a Mon Sep 17 00:00:00 2001
From: yang_shj <yang_shj@hisuntech.com>
Date: Mon, 14 Mar 2022 16:56:02 +0800
Subject: [PATCH] =?UTF-8?q?feat=200=20=E6=94=AF=E4=BB=98=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/base/springcloud/dao/OrderMapper.java    | 2 +-
 .../com/base/springcloud/service/imp/OrderServiceImp.java  | 2 +-
 .../base/springcloud/service/imp/WecPaymentServiceImp.java | 4 ++--
 .../main/resources/com/base/payment/mapper/OrderMapper.xml | 7 +++++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/payment-base-app/src/main/java/com/base/springcloud/dao/OrderMapper.java b/payment-base-app/src/main/java/com/base/springcloud/dao/OrderMapper.java
index 4e8e18d..b59c4ff 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/dao/OrderMapper.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/dao/OrderMapper.java
@@ -28,5 +28,5 @@ public interface OrderMapper {
 
 	Order origOrderInfo(@Param("orderId") String orderId);
 
-	int superRefundCount(String id);
+	int superPayCount(String id);
 }
\ No newline at end of file
diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/OrderServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/OrderServiceImp.java
index 4dc6861..a367fe0 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/OrderServiceImp.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/OrderServiceImp.java
@@ -122,7 +122,7 @@ public class OrderServiceImp implements OrderService {
 	public void superPayCount(String id) {
 		if(StringUtils.isBlank(id))
 			return;
-		int count = orderMapper.superRefundCount(id);
+		int count = orderMapper.superPayCount(id);
 		if(count <= 0)
 			throw new BusinessException(ErrorConstant.SUPER_PAY_ORDER_COUNT_FAL);
 	}
diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/WecPaymentServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/WecPaymentServiceImp.java
index d92018e..2600510 100644
--- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/WecPaymentServiceImp.java
+++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/WecPaymentServiceImp.java
@@ -68,8 +68,8 @@ public class WecPaymentServiceImp implements WecPaymentService {
 		wxRefundAmountVo.setRefund(refundBO.getRefundAmount());
 		wxpayRefundVo.setAmount(wxRefundAmountVo);
 		String refundRsp = WxpayUtils.refund(wxpayRefundVo,refundBO.getMchId(),refundBO.getMchPrivateKey(),refundBO.getCertificate(),refundBO.getSerialNo());
-		Map<String, String> resultMap = StringHelper.json2map(refundRsp);
-		if(PaymentConstant.WX_SUCCESS.equals(resultMap.get("status")))
+		JSONObject jsonObject = JSONObject.parseObject(refundRsp);
+		if(PaymentConstant.WX_SUCCESS.equals(jsonObject.getString("status")))
 			return true;
 		return false;
 	}
diff --git a/payment-base-app/src/main/resources/com/base/payment/mapper/OrderMapper.xml b/payment-base-app/src/main/resources/com/base/payment/mapper/OrderMapper.xml
index f705345..0b38f66 100644
--- a/payment-base-app/src/main/resources/com/base/payment/mapper/OrderMapper.xml
+++ b/payment-base-app/src/main/resources/com/base/payment/mapper/OrderMapper.xml
@@ -184,4 +184,11 @@
       id = #{orderId,jdbcType=VARCHAR}
     </where>
   </select>
+  <update id="superPayCount" parameterType="java.lang.String">
+    update pay_order
+    set retry_count = retry_count + 1
+    <where>
+      id = #{id,jdbcType=VARCHAR}
+    </where>
+  </update>
 </mapper>
\ No newline at end of file