danial/kami_gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: 修复验证错误

Browse Source
This commit is contained in:
danial
2024-10-17 03:08:48 +08:00
parent 2e9bb2019a
commit 3a996e4bcb
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conf/app.conf
View File

@@ -51,7 +51,7 @@ notify_url = http://kami_gateway:12309/appleCard/notify
; 提交卡密接口
submit_card_url = http://kami_backend:12401/api/cardInfo/jdCard/submit
; url = https://shop.task.mf178.cn/userapi/card/submit_card
query_card_url = http://kami_backend:12401/api/cardInfo/jdCard/query
query_card_url = http://kami_backend:12401/cardInfo/jdCard/query
notify_url = http://kami_gateway:12309/jdCard/notify
[tMallGame]

18
internal/entities/supplier/third_party/jd.go vendored
View File

@@ -144,20 +144,20 @@ func (c *JDCardImpl) PayNotify() {
attach := strings.TrimSpace(c.GetString("merchantId"))
orderInfo := order.GetOrderByBankOrderId(attach) // OrderId
if orderInfo.BankOrderId == "" || len(orderInfo.BankOrderId) == 0 {
logs.Error("【APPLE】回调的订单号不存在，订单号=", attach)
logs.Error("【JD】回调的订单号不存在，订单号=", attach)
c.Ctx.WriteString("FAIL")
return
}
roadInfo := road.GetRoadInfoByRoadUid(orderInfo.RoadUid)
if roadInfo.RoadUid == "" || len(roadInfo.RoadUid) == 0 {
logs.Error("【APPLE】支付通道已经关系或者删除，不进行回调")
logs.Error("【JD】支付通道已经关系或者删除，不进行回调")
c.Ctx.WriteString("FAIL")
return
}
merchantUid := orderInfo.MerchantUid
merchantInfo := merchant.GetMerchantByUid(merchantUid)
if merchantInfo.MerchantUid == "" || len(merchantInfo.MerchantUid) == 0 {
logs.Error("【APPLE】快付回调失败，该商户不存在或者已经删除，商户uid=", merchantUid)
logs.Error("【JD】快付回调失败，该商户不存在或者已经删除，商户uid=", merchantUid)
c.Ctx.WriteString("FAIL")
return
}
@@ -169,12 +169,12 @@ func (c *JDCardImpl) PayNotify() {
//"sign": strings.TrimSpace(c.GetString("sign")),
"remark": strings.TrimSpace(c.GetString("remark")),
}
tmpSign := utils.TmpEncrypt(attach + params["merchantId"] + params["timestamp"])
if tmpSign != params["sign"] {
logs.Error("【APPLE】回调签名错误，签名=", params["sign"], "计算签名=", tmpSign)
c.Ctx.WriteString("FAIL")
return
}
//tmpSign := utils.TmpEncrypt(attach + params["merchantId"] + params["timestamp"])
//if tmpSign != params["sign"] {
// logs.Error("【APPLE】回调签名错误，签名=", params["sign"], "计算签名=", tmpSign)
// c.Ctx.WriteString("FAIL")
// return
//}
orderInfo.BankTransId = params["merchantId"]
if params["status"] == "1" {
// TODO 订单支付成功