1

business/jxstore/cms/authz_test.go

@@ -28,3 +28,7 @@ func TestCasbin(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestRefreshTiktokShopToken(t *testing.T) {
+	RefreshTiktokShopToken(nil)
+}

business/jxstore/cms/store.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	warehouse_getFences_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/warehouse_getFences/response"
+	doudian_sdk "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/core"
 	"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
 	"git.rosy.net.cn/jx-callback/business/jxstore/common"
 	"git.rosy.net.cn/jx-callback/business/jxstore/event"
@@ -4398,18 +4399,28 @@ func RefreshTiktokShopToken(ctx *jxcontext.Context) (err error) {
 	var (
 		db = dao.GetDB()
 	)
-	if time.Now().YearDay()%5 != 0 {
-		return
-	}
-	//token是三天,两天刷新一次token
+
 	codes, _ := dao.GetVendorOrgCode(db, model.VendorIDDD, "", "platform")
+	api := api.TiktokStore
 	for _, v := range codes {
 		if v.Token != "" {
-			api.TiktokStore.SetRefreshToken(v.Token)
-			if result, err := api.TiktokStore.RefreshToken(); err == nil {
+			var access *doudian_sdk.AccessToken
+			if err := json.Unmarshal([]byte(v.Token), &access); err != nil {
+				globals.SugarLogger.Debugf("定时任务更新抖店店铺token错误:%s,%s", utils.Format4Output(v, false), err.Error())
+				continue
+			}
+			if access.ExpiresIn-time.Now().Unix() > 24*60*60 {
+				continue
+			}
+			api.SetToken(access.AccessToken)
+			api.SetRefreshToken(access.RefreshToken)
+			api.SetExpiresIn(access.ExpiresIn)
+			api.SetAcctokenObj(access)
+			if result, err := api.RefreshToken(); err == nil {
 				token, _ := json.Marshal(result)
 				v.Token = string(token)
-				dao.UpdateEntity(db, v, "token")
+				v.UpdatedAt = time.Now()
+				dao.UpdateEntity(db, v, "Token", "UpdatedAt")
 			}
 		}
 	}

business/partner/purchase/tiktok_store/order.go

@@ -630,6 +630,14 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam
 	if err != nil {
 		return err
 	}
+
+	// 呼叫骑手
+	err = c.GetOrderRider(order.VendorOrgCode, order.VendorStoreID, map[string]interface{}{
+		"third_carrier_order_id": order.VendorOrderID,
+		"opcode":                 tiktokShop.TiktokLogisticsStatusCALLRIDER,
+		"logistics_context":      "商家呼叫骑手",
+	})
+
 	return err
 }