diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index eb3a1d6e1..93412ed22 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4442,7 +4442,7 @@ func RefreshTiktokShopToken(ctx *jxcontext.Context) (err error) { v.Token = string(token) v.UpdatedAt = time.Now() v.StoreBrandName = "定时任务更新" - dao.UpdateEntity(db, v, "Token", "UpdatedAt", "Comment") + dao.UpdateEntity(db, v, "Token", "UpdatedAt", "StoreBrandName") } } } diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 6e5d9d026..9603b66d4 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -285,7 +285,7 @@ func (c *PurchaseHandler) onOrderMsg(msgId, orderId string, msg interface{}) (re } // 已经支付的订单,当做新订单创建在平台内部 ----------------- - if msgId == tiktokShop.CallbackPayOrderMsgTagId { + if msgId == tiktokShop.CallbackPayOrderMsgTagId || msgId == tiktokShop.CallbackChangeMoneyMsgTagId { order, err := c.GetOrder(utils.Int64ToStr(appOrgCode), orderId, "") // 获取平台订单详情,制作本地订单 if err != nil { return tiktokShop.Err2CallbackResponse(err, "") @@ -552,11 +552,7 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI // PickupGoods 拣货完成 (抖音无拣货接口) func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) { // 通知平台拣货完成,抖店只需要本地拣货完成 - //if !isSelfDelivery { - // if globals.EnableMtwmStoreWrite { - // err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").PreparationMealComplete(utils.Str2Int64(order.VendorOrderID)) - // } - //} + // 抖音需要订单在门店的营业时间范围内最多超过营业时间内才自动拣货 c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup, order.VendorOrgCode) return nil }