diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index be8629072..33e0f9b46 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 = "" @@ -911,18 +922,30 @@ func (P *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo if err != nil { retVal.YbStorePrefix = "0" } else { - retVal.YbStorePrefix = utils.Int64ToStr(saleLimit * 100) + saleDetail, err := getAPI(vendorOrgCode, 0, "").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)) 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 := 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 + } } //获取打包费 packageFee, err := getAPI(vendorOrgCode, 0, "").GetStorePackageFee(utils.Str2Int64(vendorStoreID)) diff --git a/phone.dat b/phone.dat new file mode 100644 index 000000000..34bcab7fb Binary files /dev/null and b/phone.dat differ