From cad915058c3c53bf328a8ae9ca9bc7de099caba7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 06 二月 2021 15:27:49 +0800
Subject: [PATCH] 接口bug修改
---
src/main/java/com/yeshi/buwan/controller/WXController.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/WXController.java b/src/main/java/com/yeshi/buwan/controller/WXController.java
index b2ab888..195f3da 100644
--- a/src/main/java/com/yeshi/buwan/controller/WXController.java
+++ b/src/main/java/com/yeshi/buwan/controller/WXController.java
@@ -1,7 +1,5 @@
package com.yeshi.buwan.controller;
-import com.yeshi.buwan.domain.vip.VIPOrderRecord;
-import com.yeshi.buwan.exception.vip.VIPException;
import com.yeshi.buwan.service.inter.vip.VIPService;
import com.yeshi.buwan.util.StringUtil;
import com.yeshi.buwan.util.user.VipUtil;
@@ -13,7 +11,6 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.entity.wx.WXAPPInfo;
-import org.yeshi.utils.wx.WXPayV3Util;
import javax.annotation.Resource;
import javax.crypto.Cipher;
@@ -30,7 +27,6 @@
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.Base64;
-import java.util.Date;
@Controller
@RequestMapping("wx")
@@ -108,18 +104,9 @@
String tradeState = decript.optString("trade_state");
//鏀粯鎴愬姛
if (tradeState.equalsIgnoreCase("SUCCESS")) {
- boolean isPaySuccess = WXPayV3Util.isPaySuccess(outTradeNo, wxappInfo);
- if (isPaySuccess) {
- BigDecimal money = new BigDecimal(decript.optJSONObject("amount").optInt("total")).divide(new BigDecimal(100), 2, RoundingMode.FLOOR);
- String id = VIPOrderUtil.getIdFromOutOrderNo(outTradeNo);
- try {
- vipService.paySuccess(id, VIPOrderRecord.PAY_WAY_WX, money, new Date());
- } catch (VIPException e) {
- logger.error("璁㈠崟鏀粯鎴愬姛澶勭悊鍑洪敊锛歿}", id, e);
- }
- }
+ String id = VIPOrderUtil.getIdFromOutOrderNo(outTradeNo);
+ vipService.checkOrderPayState(id);
}
-
break;
}
}
--
Gitblit v1.8.0