From 3df9487a736327a5edcf2f9a68fdef2fd0ae81d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 25 Nov 2022 16:27:51 +0800 Subject: [PATCH] 1 --- .../jxcallback/scheduler/defsch/defsch.go | 4 ++ .../partner/purchase/tiktok_store/callback.go | 41 ++++++++----------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 933067c63..b9f8848b3 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -764,6 +764,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo if err2 != nil { partner.CurOrderManager.OnOrderMsg(order, "送达设置失败", err2.Error()) } + } if !s.isBillCandidate(order, bill) { // 一般只会消息乱序才会到这里，即新订单消息在运单接单消息后到达 @@ -781,6 +782,9 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo // if order.WaybillVendorID == model.VendorIDUnknown { // s.createWaybillOn3rdProviders(savedOrderInfo, 0, nil) // } + // 将订单修改为完成状态 + order.Status = model.OrderStatusFinished + partner.CurOrderManager.UpdateOrderFields(order, []string{"status"}) default: s.resetTimer(savedOrderInfo, bill, isPending) } diff --git a/business/partner/purchase/tiktok_store/callback.go b/business/partner/purchase/tiktok_store/callback.go index b2c91a280..ed4444eb3 100644 --- a/business/partner/purchase/tiktok_store/callback.go +++ b/business/partner/purchase/tiktok_store/callback.go @@ -3,16 +3,11 @@ package tiktok_store import ( "encoding/json" 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/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" - "io/ioutil" "net/http" "strings" - "time" ) // OnOrderMsg 抖音 @@ -20,24 +15,24 @@ func OnOrderMsg(msgId string, msg interface{}) (response *tiktokShop.CallbackRes if CurPurchaseHandler != nil { orderId, shopId, _ := api.TiktokStore.GetCallbackOrderId(msgId, msg) if shopId != 0 { - storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(shopId), model.VendorIDDD, "") - globals.SugarLogger.Debugf("==storeDetail=: %s", utils.Format4Output(storeDetail, false)) - globals.SugarLogger.Debugf("==err=: %s", utils.Format4Output(err, false)) - 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} - // 通知到果园 - gyResult, err := HttpToGuoYuan(gyMsg, "order") - if err != nil { - return tiktokShop.Err2CallbackResponse(err, "") - } - result, _ := ioutil.ReadAll(gyResult.Body) - var guoYuan *tiktokShop.CallbackResponse - if err := json.Unmarshal(result, guoYuan); err != nil { - return tiktokShop.Err2CallbackResponse(err, "") - } - return guoYuan - } + //storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), utils.Int64ToStr(shopId), model.VendorIDDD, "") + //globals.SugarLogger.Debugf("==storeDetail=: %s", utils.Format4Output(storeDetail, false)) + //globals.SugarLogger.Debugf("==err=: %s", utils.Format4Output(err, false)) + //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} + // // 通知到果园 + // gyResult, err := HttpToGuoYuan(gyMsg, "order") + // if err != nil { + // return tiktokShop.Err2CallbackResponse(err, "") + // } + // result, _ := ioutil.ReadAll(gyResult.Body) + // var guoYuan *tiktokShop.CallbackResponse + // if err := json.Unmarshal(result, guoYuan); err != nil { + // return tiktokShop.Err2CallbackResponse(err, "") + // } + // return guoYuan + //} } jxutils.CallMsgHandler(func() { response = CurPurchaseHandler.onOrderMsg(msgId, orderId, msg)