From 9cb962fc73d55a13787b6b4bc7aed716fe220e2f Mon Sep 17 00:00:00 2001 From: DengBiao <2319963317@qq.com> Date: Mon, 25 Sep 2023 10:57:25 +0800 Subject: [PATCH] update --- app/admin/svc/order/svc_central_kitchen_for_school_order.go | 2 +- app/customer/hdl/hdl_call_back.go | 6 +++++- app/customer/md/alipay.go | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/admin/svc/order/svc_central_kitchen_for_school_order.go b/app/admin/svc/order/svc_central_kitchen_for_school_order.go index 8b5cca3..462a597 100644 --- a/app/admin/svc/order/svc_central_kitchen_for_school_order.go +++ b/app/admin/svc/order/svc_central_kitchen_for_school_order.go @@ -193,7 +193,7 @@ func CentralKitchenForSchoolOrderRefundAudit(req md.CentralKitchenForSchoolOrder if req.State == 1 { returnDay.State = enum.CentralKitchenForSchoolUserRefundDayStateForAuditPass userWithDay.State = enum.CentralKitchenForSchoolUserWithDayStateForCancel - outRequestNo := "r" + returnDay.OutTradeNo + outRequestNoSuffix + outRequestNo := "r_" + returnDay.OutTradeNo + outRequestNoSuffix dealReturnOrdMap[returnDay.OutTradeNo] = struct { OutRequestNo string `json:"out_request_no"` Amount float64 `json:"amount"` diff --git a/app/customer/hdl/hdl_call_back.go b/app/customer/hdl/hdl_call_back.go index 687ba20..968ace8 100644 --- a/app/customer/hdl/hdl_call_back.go +++ b/app/customer/hdl/hdl_call_back.go @@ -21,7 +21,11 @@ func AlipayJsApiCallBack(c *gin.Context) { e.OutErr(c, e.ERR_INVALID_ARGS, "反射失败") return } - + if args.GmtRefund != "" { + //TODO::退款通知不需要处理 + c.String(200, "success") + return + } _, err := svc.DealCentralKitchenForSchoolOrderCallBack(args.OutTradeNo, args.TradeStatus) if err != nil { e.OutErr(c, e.ERR, err.Error()) diff --git a/app/customer/md/alipay.go b/app/customer/md/alipay.go index c798fd0..637bb55 100644 --- a/app/customer/md/alipay.go +++ b/app/customer/md/alipay.go @@ -10,6 +10,7 @@ type AliPayCallback struct { Charset string `json:"charset"` FundBillList string `json:"fund_bill_list"` GmtCreate string `json:"gmt_create"` + GmtRefund string `json:"gmt_refund"` GmtPayment string `json:"gmt_payment"` InvoiceAmount string `json:"invoice_amount"` OrderType string `json:"order_type"`