Merge branch 'master' of e.coding.net:rosydev/baseapi

platformapi/tiktok_shop/tiktok_api/store_callback.go

@@ -1,9 +0,0 @@
-package tiktok_api
-
-type StoreCallbackResponse struct {
-	Data string `json:"data"`
-}
-
-// 创建店铺回调信息
-type CallbackCreateStore struct {
-}

platformapi/tiktok_shop/tiktok_api/transport.go

@@ -10,7 +10,12 @@ import (
 	superm_getPlatformPickUpEstimatedCharge_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_getPlatformPickUpEstimatedCharge/request"
 	superm_getShipmentInfo_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_getShipmentInfo/request"
 	superm_getShipmentInfo_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_getShipmentInfo/response"
+	superm_getStoreAutoCallRiderInfo_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_getStoreAutoCallRiderInfo/request"
+	superm_getStoreAutoCallRiderInfo_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_getStoreAutoCallRiderInfo/response"
 	superm_orderDispatcher_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_orderDispatcher/request"
+	superm_setStoreAutoCallRider_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_setStoreAutoCallRider/request"
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/globals"
 )
 
 // /superm/getDispatcherInfo 运力呼叫询价/运力取消询价(正向)
@@ -49,6 +54,40 @@ func (a *API) ShopOrderDispatcher(storeID int64, shopOrderID string, dispatcherT
 	return nil
 }
 
+// /superm/setStoreAutoCallRider 订单自动呼叫运力 设置操作
+func (a *API) SetStoreAutoCallRider(params *superm_setStoreAutoCallRider_request.SupermSetStoreAutoCallRiderParam) error {
+	request := superm_setStoreAutoCallRider_request.New()
+	request.Param = params
+	response, err := request.Execute(a.accessTokenObj)
+	globals.SugarLogger.Debugf("订单自动呼叫运力 设置操作=========:%s", request.GetUrlPath())
+	globals.SugarLogger.Debugf("订单自动呼叫运力 设置操作:=%s", utils.Format4Output(response, false))
+	if err != nil {
+		return err
+	}
+	if response.Code != RequestSuccessCode {
+		return errors.New(response.SubMsg)
+	}
+	return nil
+}
+
+// /superm/getStoreAutoCallRiderInfo 查询自动呼叫运力配置
+func (a *API) GetStoreAutoCallRiderInfo(storeID int64) (*superm_getStoreAutoCallRiderInfo_response.AutoCallInfo, error) {
+	request := superm_getStoreAutoCallRiderInfo_request.New()
+	request.Param = &superm_getStoreAutoCallRiderInfo_request.SupermGetStoreAutoCallRiderInfoParam{
+		StoreID: storeID,
+	}
+	response, err := request.Execute(a.accessTokenObj)
+	globals.SugarLogger.Debugf("查询自动呼叫运力配置=========:%s", request.GetUrlPath())
+	globals.SugarLogger.Debugf("查询自动呼叫运力配置:=%s", utils.Format4Output(response, false))
+	if err != nil {
+		return nil, err
+	}
+	if response.Code != RequestSuccessCode {
+		return nil, errors.New(response.SubMsg)
+	}
+	return response.Data, nil
+}
+
 // /superm/createVirtualMobile 隐私小号获取
 func (a *API) CreateVirtualMobile(shopOrderID int64) (*superm_createVirtualMobile_response.SupermCreateVirtualMobileData, error) {
 	request := superm_createVirtualMobile_request.New()

platformapi/tiktok_shop/tiktok_api/transport_callback.go

@@ -0,0 +1 @@
+package tiktok_api

platformapi/tiktok_shop/tiktok_api/transport_model.go

@@ -8,15 +8,18 @@ const (
 
 	InquiryTypeDelivery = 1 //配送 默认
 	InquiryTypeCancel   = 2 //取消
-
-	ServiceTypeCallNow   = 0 //立即呼叫
-	ServiceTypeDelayCall = 1 //延迟呼叫
-
-	ServiceStatusClose = 1 //自动呼叫运力设置关闭
-	ServiceStatusOpen  = 2 //自动呼叫运力设置开启
+	//抖音运力相关常量
+	ServiceTypeCallNow   = 0       //立即呼叫(用户支付成功节点)
+	ServiceTypeDelayCall = 1       //延迟呼叫[1-15]min
+	AutoCallRiderOpen    = "open"  //开启自动呼叫运力
+	AutoCallRiderClose   = "close" //关闭自动呼叫运力
+	AutoCallDelayTime15  = 15      //默认延后15分钟
+	ServiceStatusClose   = 1       //自动呼叫运力设置关闭
+	ServiceStatusOpen    = 2       //自动呼叫运力设置开启
 
 	ShipmentTypeInvoice     = 1 //发货单
 	ShipmentTypeVisitInDoor = 2 //上门取
+
 )
 
 const (

platformapi/tiktok_shop/tiktok_api/transport_test.go

@@ -2,21 +2,60 @@ package tiktok_api
 
 import (
 	"fmt"
-	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/baseapi/utils"
+	"reflect"
 	"testing"
 )
 
 //运力呼叫询价（正向）
 func TestGetDispatcherInfo(t *testing.T) {
-	dispatcherFee, err := a.GetDispatcherInfo(62490423, "5016270839501385439", 1)
+	dispatcherFee, err := a.GetDispatcherInfo(62490423, "5016940182798690015", 1)
 	fmt.Println(dispatcherFee)
 	fmt.Println(err)
 }
 func TestCancelWaybill(t *testing.T) {
-	err := a.ShopOrderDispatcher(62490423, "5016287638112024287", 2)
+	err := a.ShopOrderDispatcher(62490423, "5017358149445080799", 2)
 	fmt.Println(err)
 }
 
-func Test2222(t *testing.T) {
-	fmt.Println(2&(model.SyncFlagDeletedMask|model.SyncFlagNewMask|model.SyncFlagModifiedMask) != 0)
+type tete struct {
+	ids  []int64
+	name string
+}
+
+func Test(t *testing.T) {
+	//var a []int64
+	var b interface{}
+	//stType := reflect.TypeOf(a)
+	//stValue := reflect.ValueOf(a)
+	x := reflect.TypeOf(b)
+	fmt.Println(reflect.TypeOf(a) == reflect.TypeOf([]int64{}))
+	switch x {
+	case reflect.TypeOf([]int64{}):
+
+		fmt.Println(1)
+	case reflect.TypeOf([]string{}):
+		fmt.Println(2)
+
+	}
+	//fmt.Println(stType.NumField())
+	//fmt.Println(stType.Field(0))
+	//temp := stType.Field(0)
+	//fmt.Println(temp.Type)
+
+	//Strings2Objs(`[1262627,1723872383]`, &a)
+	//fmt.Printf("%v", reflect.TypeOf(a).NumField())
+}
+func Strings2Objs(strAndObjAddPairs ...interface{}) (err error) {
+	str := ""
+	for k, v := range strAndObjAddPairs {
+		if k%2 == 0 {
+			str, _ = v.(string)
+		} else if str != "" {
+			if err = utils.UnmarshalUseNumber([]byte(str), v); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
 }