diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java b/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java index f5cfa147..08b3395d 100644 --- a/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java +++ b/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java @@ -3,7 +3,7 @@ package com.ghy.common.adapay; import com.ghy.common.adapay.callback.DrawCashCallback; import com.ghy.common.adapay.callback.PayCallback; import com.ghy.common.adapay.callback.RefundCallback; -import com.ghy.common.adapay.callback.mapping.DrawCashMapping; +import com.ghy.common.adapay.callback.mapping.DrawCashReplyMapping; import com.ghy.common.adapay.callback.mapping.PayReplyMapping; import com.ghy.common.adapay.callback.mapping.RefundReplyMapping; import com.ghy.common.adapay.callback.model.Expend; @@ -56,7 +56,7 @@ public class AdapayService { cashParam.put("notify_url", adapayProperties.getNotifyUrl()); cashParam.put("remark", remark); cashParam.put("fee_mode", feeMode); - DrawCashMapping.putCallback(orderNo, callback); + DrawCashReplyMapping.putCallback(orderNo, callback); return Drawcash.create(cashParam); } diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/callback/AdapayCallbackController.java b/ghy-common/src/main/java/com/ghy/common/adapay/callback/AdapayCallbackController.java index 31c77588..bedfc210 100644 --- a/ghy-common/src/main/java/com/ghy/common/adapay/callback/AdapayCallbackController.java +++ b/ghy-common/src/main/java/com/ghy/common/adapay/callback/AdapayCallbackController.java @@ -1,5 +1,6 @@ package com.ghy.common.adapay.callback; +import com.ghy.common.adapay.callback.mapping.DrawCashReplyMapping; import com.ghy.common.adapay.callback.mapping.PayReplyMapping; import com.ghy.common.adapay.callback.mapping.RefundReplyMapping; import com.huifu.adapay.core.AdapayCore; @@ -47,6 +48,10 @@ public class AdapayCallbackController { case "payment.close.failed": RefundReplyMapping.putReply(event); break; + case "cash.succeeded": + case "cash.failed": + DrawCashReplyMapping.putReply(event); + break; default: log.warn("UNKNOWN EVENT TYPE [{}]", type); return "NG"; diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/callback/mapping/DrawCashMapping.java b/ghy-common/src/main/java/com/ghy/common/adapay/callback/mapping/DrawCashReplyMapping.java similarity index 97% rename from ghy-common/src/main/java/com/ghy/common/adapay/callback/mapping/DrawCashMapping.java rename to ghy-common/src/main/java/com/ghy/common/adapay/callback/mapping/DrawCashReplyMapping.java index 21ffae1a..67d0cc37 100644 --- a/ghy-common/src/main/java/com/ghy/common/adapay/callback/mapping/DrawCashMapping.java +++ b/ghy-common/src/main/java/com/ghy/common/adapay/callback/mapping/DrawCashReplyMapping.java @@ -13,7 +13,7 @@ import java.util.concurrent.ConcurrentHashMap; * * @author HH 2022/4/1 */ -public class DrawCashMapping { +public class DrawCashReplyMapping { /** * 临时保存支付结果