diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 4e94a122d..31c38f2ed 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -5,6 +5,8 @@ import ( "fmt" "reflect" + trade_batchGetTradeLimitTemplateList_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/trade_batchGetTradeLimitTemplateList/response" + freightTemplate_create_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/freightTemplate_create/request" freightTemplate_update_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/freightTemplate_update/request" shop_batchCreateStore_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/shop_batchCreateStore/request" @@ -780,7 +782,7 @@ func BindStoreSaleLimit(appOrgCode string, storeID, saleLimitTemplateID int64) e return nil } -// 获取门店绑定限售模板 +// /shop/getStoreSaleLimit 获取门店绑定限售模板 func GetStoreSaleLimit(appOrgCode string, storeID int64) (int64, error) { if saleLimitTemplateID, err := getAPI(appOrgCode, 0, "").StoreQuerySaleLimitTemp(storeID); err != nil { return 0, err @@ -789,6 +791,15 @@ func GetStoreSaleLimit(appOrgCode string, storeID int64) (int64, error) { } } +// /trade/batchGetTradeLimitTemplateList 批量获取限售模板详情 +func BatchGetTradeLimitDetail(appOrgCode string, saleLimitIDs []int64) (*trade_batchGetTradeLimitTemplateList_response.TradeBatchGetTradeLimitTemplateListData, error) { + if details, err := getAPI(appOrgCode, 0, "").GetSaleLimitDetail(&saleLimitIDs); err != nil { + return nil, err + } else { + return details, nil + } +} + func (P *PurchaseHandler) UpdateStoreOpTime(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, opTimeList []int16) (err error) { var ( timeStr = "" @@ -886,11 +897,11 @@ func (P *PurchaseHandler) UpdateStoreLineStatus(ctx *jxcontext.Context, vendorOr return err } func (P *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID, vendorStoreName string) (store *dao.StoreDetail, err error) { - vendorStore, err := getAPI(vendorOrgCode, 0, "").GetStoreDetail(&shop_getStoreDetail_request.ShopGetStoreDetailParam{StoreId: vendorStoreID}) + a := getAPI(vendorOrgCode, 0, "") + vendorStore, err := a.GetStoreDetail(&shop_getStoreDetail_request.ShopGetStoreDetailParam{StoreId: vendorStoreID}) if err != nil { return nil, err } - retVal := &dao.StoreDetail{ Store: model.Store{ Address: vendorStore.StoreDetail.Store.Address, @@ -898,7 +909,7 @@ func (P *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo }, } //获取自动运力设置 - autoInfo, err := getAPI(vendorOrgCode, 0, "").GetStoreAutoCallRiderInfo(utils.Str2Int64(vendorStoreID)) + autoInfo, err := a.GetStoreAutoCallRiderInfo(utils.Str2Int64(vendorStoreID)) if err == nil { if autoInfo.ServiceStatus == tiktok_api.ServiceStatusOpen { retVal.YbAppID = tiktok_api.AutoCallRiderOpen @@ -907,29 +918,41 @@ func (P *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo } } //获取门店限售模板即起送价 - saleLimit, err := getAPI(vendorOrgCode, 0, "").StoreQuerySaleLimitTemp(utils.Str2Int64(vendorStoreID)) + saleLimit, err := a.StoreQuerySaleLimitTemp(utils.Str2Int64(vendorStoreID)) if err != nil { retVal.YbStorePrefix = "0" } else { - retVal.YbStorePrefix = utils.Int64ToStr(saleLimit * 100) + saleDetail, err := a.GetSaleLimitDetail(&[]int64{saleLimit}) + if err != nil { + retVal.YbStorePrefix = "0" + } else { + if len(saleDetail.TradeLimitTemplateList) > 0 && len(saleDetail.TradeLimitTemplateList[0].TradeLimitRuleList) > 0 { + if saleDetail.TradeLimitTemplateList[0].TradeLimitRuleList[0].TradeLimitModel == tiktok_api.TradeLimitModelMoney { + retVal.YbStorePrefix = utils.Int64ToStr(saleDetail.TradeLimitTemplateList[0].TradeLimitRuleList[0].TradeLimitPattern.Minimum * 100) + } + } else { + retVal.YbStorePrefix = "0" + } + } } //获取满减包邮金额 - freightIDs, err := getAPI(vendorOrgCode, 0, "").GetStoreFreight(utils.Str2Int64(vendorStoreID)) + freightIDs, err := a.GetStoreFreight(utils.Str2Int64(vendorStoreID)) if err != nil || len(freightIDs) == 0 || freightIDs[0] == 0 { retVal.DeliveryFeeDeductionSill = 0 - } - freightDetail, err := getAPI(vendorOrgCode, 0, "").GetStoreFreightDetail(freightIDs[0]) - if err == nil && len(freightDetail.Columns) > 0 { - retVal.DeliveryFeeDeductionSill = int(freightDetail.Columns[0].OverAmount * 100) } else { - retVal.DeliveryFeeDeductionSill = 0 + freightDetail, err := a.GetStoreFreightDetail(freightIDs[0]) + if err == nil && len(freightDetail.Columns) > 0 { + retVal.DeliveryFeeDeductionSill = int(freightDetail.Columns[0].OverAmount * 100) + } else { + retVal.DeliveryFeeDeductionSill = 0 + } } //获取打包费 - packageFee, err := getAPI(vendorOrgCode, 0, "").GetStorePackageFee(utils.Str2Int64(vendorStoreID)) + packageFee, err := a.GetStorePackageFee(utils.Str2Int64(vendorStoreID)) if err != nil { retVal.DeliveryFeeDeductionFee = 0 } else { - retVal.DeliveryFeeDeductionFee = int(packageFee) * 100 + retVal.DeliveryFeeDeductionFee = int(packageFee * 100) } retVal.OriginalName = vendorStore.StoreDetail.Store.Name _, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, globals.StoreNameTiktok) diff --git a/phone.dat b/phone.dat new file mode 100644 index 000000000..34bcab7fb Binary files /dev/null and b/phone.dat differ