diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 6205e22eb..8ea1ddbc2 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -1133,13 +1133,13 @@ func (s *DefScheduler) resetTimer(savedOrderInfo *WatchOrderInfo, bill *model.Wa if timeout == 0 { config.CallTimeoutAction(savedOrderInfo, bill) } else { - timerName := "" - if statusType == model.OrderTypeOrder { - timerName = model.OrderStatusName[status] - } else if statusType == model.OrderTypeWaybill { - timerName = model.WaybillStatusName[status] - } - globals.SugarLogger.Debugf("timerName %s", timerName) + //timerName := "" + //if statusType == model.OrderTypeOrder { + // timerName = model.OrderStatusName[status] + //} else if statusType == model.OrderTypeWaybill { + // timerName = model.WaybillStatusName[status] + //} + //globals.SugarLogger.Debugf("timerName %s", timerName) timerInfo := &tTimerInfo{ statusType: statusType, vendorID: vendorID, diff --git a/controllers/tiktok_store.go b/controllers/tiktok_store.go index 53ab4bcd4..97cb33371 100644 --- a/controllers/tiktok_store.go +++ b/controllers/tiktok_store.go @@ -18,8 +18,13 @@ type TiktokShopController struct { // TokenMsg 抖音用户授权 func (c *TiktokShopController) TokenMsg() { - globals.SugarLogger.Debugf("codeParams = %s", utils.Format4Output(c.Ctx.Request.URL.Query(), false)) - code := c.Ctx.Request.URL.Query().Get("code") + code := utils.Interface2StringList(c.Ctx.Request.URL.Query().Get("code"))[0] + if code == "" { + c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail} + c.ServeJSON() + return + } + globals.SugarLogger.Debugf("==========%s", code) result, err := api.TiktokStore.CreateToken(code) globals.SugarLogger.Debugf("=result=========%s", utils.Format4Output(result, false)) @@ -42,7 +47,7 @@ func (c *TiktokShopController) TokenMsg() { param := &model.VendorOrgCode{ VendorID: model.VendorIDDD, - VendorOrgCode: result.ShopId, + VendorOrgCode: utils.Int64ToStr(result.ShopId), Comment: "抖音授权", VendorType: "platform", IsJxCat: 1,