支付修改

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/original/ali/OriginalAliAppTemplate.java

@@ -167,6 +167,11 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
             log.info("关单返回：{}", JSONObject.toJSONString(response));
 
             closePayment.setStatus(TradeStatusEnum.succeeded);
+            //交易不存在
+            if("ACQ.TRADE_NOT_EXIST".equals(response.getSubCode())){
+                closePayment.setHasNotify(false);
+                return BaseResult.succeed(closePayment);
+            }
             if (response.isSuccess()) {
                 return BaseResult.succeed(closePayment);
             } else {

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/original/wx/OriginalWxAppTemplate.java

@@ -168,7 +168,7 @@ public class OriginalWxAppTemplate implements PaymentTemplate {
         WxPayOrderCloseV3Request param = new WxPayOrderCloseV3Request();
         param.setMchid(MERCHANT_ID);
         param.setOutTradeNo(closePayment.getPaymentNo());
-
+        closePayment.setHasNotify(false);
         try {
             getWxPayService(closePayment.getPaymentClient())
                     .closeOrderV3(param);