优化支付和退费相关业务

src/main/java/thyyxxk/wxservice_server/service/SavePayResultService.java

@@ -111,7 +111,7 @@ public class SavePayResultService {
         SaveGhFeeResponse data = template.postForObject(hrgApiUrl + "/payRegistrationFormHaiCi",
                 param, SaveGhFeeResponse.class);
         log.info("保存挂号信息: \n参数：{}，\n结果：{}", param, data);
-        if (null != data && (data.getResultCode() == 0 || data.getMessage().contains("挂号成功"))) {
+        if (null != data && data.getResultCode() == 0) {
             dao.updateSuccessHisStatus(order.getTradeNo());
             HisRegister hisRegister = dao.selectRegisterDateDiff(order.getTradeNo());
             if (null != hisRegister) {

src/main/java/thyyxxk/wxservice_server/service/WxPayNotifyService.java

@@ -9,6 +9,7 @@ import thyyxxk.wxservice_server.constant.TradeState;
 import thyyxxk.wxservice_server.dao.WxApiDao;
 import thyyxxk.wxservice_server.entity.wxapi.PaymentNotify;
 import thyyxxk.wxservice_server.entity.wxapi.WxPayOrder;
+import thyyxxk.wxservice_server.utils.TradeVectorUtil;
 import thyyxxk.wxservice_server.utils.WxPaySignUtil;
 
 import java.nio.charset.StandardCharsets;
@@ -39,6 +40,10 @@ public class WxPayNotifyService {
         log.info("微信扫码支付通知解密：{}", ciphertext);
         JSONObject payer = cipherObj.getJSONObject("payer");
         String tradeNo = cipherObj.getString("out_trade_no");
+        if (TradeVectorUtil.tradeNoBeingQuery(tradeNo)) {
+            log.info("订单号【{}】正在业务中，无需继续解密。", tradeNo);
+            return;
+        }
         String openId = payer.getString("openid");
         TradeState tradeState = TradeState.get(cipherObj.getString("trade_state"));
         if (!tradeState.equals(TradeState.SUCCESS)) {