liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-11-20 16:52:36 +08:00
parent 7604d29431
commit edb8a5bd54
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
business/partner/purchase/tao_vegetable/callback.go
View File

@@ -3,8 +3,6 @@ package tao_vegetable
import ( import (
"git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/platformapi/tao_vegetable" "git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
"net/http" "net/http"
"strings" "strings"
@@ -13,11 +11,12 @@ import (
// OnCallbackMsg 淘宝回调接口 // OnCallbackMsg 淘宝回调接口
func OnCallbackMsg(orderStatus, orderId string, msg interface{}) (response *tao_vegetable.CallBackResult) { func OnCallbackMsg(orderStatus, orderId string, msg interface{}) (response *tao_vegetable.CallBackResult) {
if CurPurchaseHandler != nil { if CurPurchaseHandler != nil {
jxutils.CallMsgHandlerAsync(func() { return CurPurchaseHandler.onOrderMsg(orderStatus, orderId, msg)
response = CurPurchaseHandler.onOrderMsg(orderStatus, orderId, msg) //jxutils.CallMsgHandlerAsync(func() {
}, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDTaoVegetable)) // response = CurPurchaseHandler.onOrderMsg(orderStatus, orderId, msg)
//}, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDTaoVegetable))
} }
return response return tao_vegetable.CallBackResultInfo(nil)
} }
func forwardOrderToGy(msg *mtwmapi.CallbackMsg, orderStatus string) { func forwardOrderToGy(msg *mtwmapi.CallbackMsg, orderStatus string) {

5
business/partner/purchase/tao_vegetable/order.go
View File

@@ -351,13 +351,8 @@ func (c *PurchaseHandler) onOrderMsg(orderStatus, orderId string, orderCallback
// 商户接单/支付完成代表新订单 // 商户接单/支付完成代表新订单
if msg.OrderStatus == tao_vegetable.OrderStatusPayFinsh { if msg.OrderStatus == tao_vegetable.OrderStatusPayFinsh {
order, orderMap, err2 := c.getOrder("", msg.BizOrderId, msg.StoreId) order, orderMap, err2 := c.getOrder("", msg.BizOrderId, msg.StoreId)
globals.SugarLogger.Debugf("=======msg:= %s", utils.Format4Output(msg, false))
globals.SugarLogger.Debugf("=======order:= %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("=======orderMap:= %s", utils.Format4Output(orderMap, false))
globals.SugarLogger.Debugf("=======err2:= %v", err2)
if err = err2; err == nil { if err = err2; err == nil {
err = partner.CurOrderManager.OnOrderNew(order, status) err = partner.CurOrderManager.OnOrderNew(order, status)
globals.SugarLogger.Debugf("=======err:= %s", utils.Format4Output(err, false))
if err == nil { if err == nil {
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
if msg.OrderStatus == tao_vegetable.OrderStatusPayFinsh { if msg.OrderStatus == tao_vegetable.OrderStatusPayFinsh {