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:
邹宗楠
2022-12-16 18:52:36 +08:00
parent 2c1f4c4b21
commit edde0d7f3e
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/partner/purchase/tiktok_store/callback.go
View File

@@ -16,8 +16,7 @@ import (
func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackResponse) { func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackResponse) {
globals.SugarLogger.Debugf("GetCallbackOrderId tiktok msg %s", utils.Format4Output(msg, false)) globals.SugarLogger.Debugf("GetCallbackOrderId tiktok msg %s", utils.Format4Output(msg, false))
if CurPurchaseHandler != nil { if CurPurchaseHandler != nil {
orderId, shopId, err := api.TiktokStore.GetCallbackOrderId(msgId, msg) orderId, shopId, _ := api.TiktokStore.GetCallbackOrderId(msgId, msg)
globals.SugarLogger.Debugf("====== %s %d %s", orderId, shopId, utils.Format4Output(err, false))
if shopId != 0 { if shopId != 0 {
//storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(shopId), model.VendorIDDD, "") //storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(shopId), model.VendorIDDD, "")
//globals.SugarLogger.Debugf("==storeDetail=: %s", utils.Format4Output(storeDetail, false)) //globals.SugarLogger.Debugf("==storeDetail=: %s", utils.Format4Output(storeDetail, false))

10
business/partner/purchase/tiktok_store/order.go
View File

@@ -81,8 +81,6 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
api := getAPI(vendorOrgCode, 0, vendorStoreID) api := getAPI(vendorOrgCode, 0, vendorStoreID)
result, err := api.GetTiktokOrderDetail(vendorOrderID) result, err := api.GetTiktokOrderDetail(vendorOrderID)
globals.SugarLogger.Debugf("=======result %s", utils.Format4Output(result, false))
globals.SugarLogger.Debugf("=======err %s", utils.Format4Output(err, false))
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@@ -179,7 +177,8 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
// 预订单还是快速达 // 预订单还是快速达
localStore, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreIdRelly, model.VendorIDDD, vendorOrgCode) localStore, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), vendorStoreIdRelly, model.VendorIDDD, vendorOrgCode)
if err != nil { if err != nil || localStore == nil || localStore.ID == 0 {
globals.SugarLogger.Debugf("平台门店未绑定到京西系统 %s", err.Error())
return nil, nil, err return nil, nil, err
} }
// 订单不在门店营业时间来的订单, // 订单不在门店营业时间来的订单,
@@ -215,8 +214,6 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
// 本地获取订单记录 // 本地获取订单记录
orderSeq, _ := dao.GetVendorOrderNumber(dao.GetDB(), model.VendorIDDD, order.VendorStoreID) orderSeq, _ := dao.GetVendorOrderNumber(dao.GetDB(), model.VendorIDDD, order.VendorStoreID)
order.OrderSeq = orderSeq + 1 order.OrderSeq = orderSeq + 1
globals.SugarLogger.Debugf("=======order %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("=======orderMap %s", utils.Format4Output(orderMap, false))
jxutils.RefreshOrderSkuRelated(order) jxutils.RefreshOrderSkuRelated(order)
return order, orderMap, nil return order, orderMap, nil
@@ -288,12 +285,9 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re
return tiktokShop.Err2CallbackResponse(nil, "") return tiktokShop.Err2CallbackResponse(nil, "")
} }
globals.SugarLogger.Debugf("============1 %s", utils.Format4Output(msg, false))
// 已经支付的订单,当做新订单创建在平台内部 ----------------- // 已经支付的订单,当做新订单创建在平台内部 -----------------
if msgId == tiktokShop.CallbackPayOrderMsgTagId || msgId == tiktokShop.CallbackChangeMoneyMsgTagId { if msgId == tiktokShop.CallbackPayOrderMsgTagId || msgId == tiktokShop.CallbackChangeMoneyMsgTagId {
order, err := c.GetOrder(utils.Int64ToStr(appOrgCode), orderId, "") // 获取平台订单详情,制作本地订单 order, err := c.GetOrder(utils.Int64ToStr(appOrgCode), orderId, "") // 获取平台订单详情,制作本地订单
globals.SugarLogger.Debugf("============1order %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("============err %s", utils.Format4Output(err, false))
if err != nil { if err != nil {
return tiktokShop.Err2CallbackResponse(err, "") return tiktokShop.Err2CallbackResponse(err, "")
} }