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-11-25 16:27:51 +08:00
parent 3538b5a809
commit 3df9487a73
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -764,6 +764,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
if err2 != nil { if err2 != nil {
partner.CurOrderManager.OnOrderMsg(order, "送达设置失败", err2.Error()) partner.CurOrderManager.OnOrderMsg(order, "送达设置失败", err2.Error())
} }
} }
if !s.isBillCandidate(order, bill) { if !s.isBillCandidate(order, bill) {
// 一般只会消息乱序才会到这里，即新订单消息在运单接单消息后到达 // 一般只会消息乱序才会到这里，即新订单消息在运单接单消息后到达
@@ -781,6 +782,9 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
// if order.WaybillVendorID == model.VendorIDUnknown { // if order.WaybillVendorID == model.VendorIDUnknown {
// s.createWaybillOn3rdProviders(savedOrderInfo, 0, nil) // s.createWaybillOn3rdProviders(savedOrderInfo, 0, nil)
// } // }
// 将订单修改为完成状态
order.Status = model.OrderStatusFinished
partner.CurOrderManager.UpdateOrderFields(order, []string{"status"})
default: default:
s.resetTimer(savedOrderInfo, bill, isPending) s.resetTimer(savedOrderInfo, bill, isPending)
} }

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

@@ -3,16 +3,11 @@ package tiktok_store
import ( import (
"encoding/json" "encoding/json"
tiktokShop "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" tiktokShop "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"io/ioutil"
"net/http" "net/http"
"strings" "strings"
"time"
) )
// OnOrderMsg 抖音 // OnOrderMsg 抖音
@@ -20,24 +15,24 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes
if CurPurchaseHandler != nil { if CurPurchaseHandler != nil {
orderId, shopId, _ := api.TiktokStore.GetCallbackOrderId(msgId, msg) orderId, shopId, _ := api.TiktokStore.GetCallbackOrderId(msgId, msg)
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))
globals.SugarLogger.Debugf("==err=: %s", utils.Format4Output(err, false)) //globals.SugarLogger.Debugf("==err=: %s", utils.Format4Output(err, false))
if err != nil || storeDetail == nil || storeDetail.Store.ID == 0 { //if err != nil || storeDetail == nil || storeDetail.Store.ID == 0 {
// 当前订单所属门店不属于菜市时,将消息推送到果园 // // 当前订单所属门店不属于菜市时,将消息推送到果园
gyMsg := map[string]interface{}{"tag": msgId, "msg_id": utils.Int64ToStr(time.Now().Unix()) + msgId, "data": msg} // gyMsg := map[string]interface{}{"tag": msgId, "msg_id": utils.Int64ToStr(time.Now().Unix()) + msgId, "data": msg}
// 通知到果园 // // 通知到果园
gyResult, err := HttpToGuoYuan(gyMsg, "order") // gyResult, err := HttpToGuoYuan(gyMsg, "order")
if err != nil { // if err != nil {
return tiktokShop.Err2CallbackResponse(err, "") // return tiktokShop.Err2CallbackResponse(err, "")
} // }
result, _ := ioutil.ReadAll(gyResult.Body) // result, _ := ioutil.ReadAll(gyResult.Body)
var guoYuan *tiktokShop.CallbackResponse // var guoYuan *tiktokShop.CallbackResponse
if err := json.Unmarshal(result, guoYuan); err != nil { // if err := json.Unmarshal(result, guoYuan); err != nil {
return tiktokShop.Err2CallbackResponse(err, "") // return tiktokShop.Err2CallbackResponse(err, "")
} // }
return guoYuan // return guoYuan
} //}
} }
jxutils.CallMsgHandler(func() { jxutils.CallMsgHandler(func() {
response = CurPurchaseHandler.onOrderMsg(msgId, orderId, msg) response = CurPurchaseHandler.onOrderMsg(msgId, orderId, msg)