This commit is contained in:
HH 2022-04-01 10:23:09 +08:00
parent 855f141777
commit 00eee67629
3 changed files with 8 additions and 3 deletions

View File

@ -3,7 +3,7 @@ package com.ghy.common.adapay;
import com.ghy.common.adapay.callback.DrawCashCallback; import com.ghy.common.adapay.callback.DrawCashCallback;
import com.ghy.common.adapay.callback.PayCallback; import com.ghy.common.adapay.callback.PayCallback;
import com.ghy.common.adapay.callback.RefundCallback; 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.PayReplyMapping;
import com.ghy.common.adapay.callback.mapping.RefundReplyMapping; import com.ghy.common.adapay.callback.mapping.RefundReplyMapping;
import com.ghy.common.adapay.callback.model.Expend; import com.ghy.common.adapay.callback.model.Expend;
@ -56,7 +56,7 @@ public class AdapayService {
cashParam.put("notify_url", adapayProperties.getNotifyUrl()); cashParam.put("notify_url", adapayProperties.getNotifyUrl());
cashParam.put("remark", remark); cashParam.put("remark", remark);
cashParam.put("fee_mode", feeMode); cashParam.put("fee_mode", feeMode);
DrawCashMapping.putCallback(orderNo, callback); DrawCashReplyMapping.putCallback(orderNo, callback);
return Drawcash.create(cashParam); return Drawcash.create(cashParam);
} }

View File

@ -1,5 +1,6 @@
package com.ghy.common.adapay.callback; 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.PayReplyMapping;
import com.ghy.common.adapay.callback.mapping.RefundReplyMapping; import com.ghy.common.adapay.callback.mapping.RefundReplyMapping;
import com.huifu.adapay.core.AdapayCore; import com.huifu.adapay.core.AdapayCore;
@ -47,6 +48,10 @@ public class AdapayCallbackController {
case "payment.close.failed": case "payment.close.failed":
RefundReplyMapping.putReply(event); RefundReplyMapping.putReply(event);
break; break;
case "cash.succeeded":
case "cash.failed":
DrawCashReplyMapping.putReply(event);
break;
default: default:
log.warn("UNKNOWN EVENT TYPE [{}]", type); log.warn("UNKNOWN EVENT TYPE [{}]", type);
return "NG"; return "NG";

View File

@ -13,7 +13,7 @@ import java.util.concurrent.ConcurrentHashMap;
* *
* @author HH 2022/4/1 * @author HH 2022/4/1
*/ */
public class DrawCashMapping { public class DrawCashReplyMapping {
/** /**
* 临时保存支付结果 * 临时保存支付结果