diff --git a/business/model/store.go b/business/model/store.go index 9a97a64c1..3c3fe4157 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -325,7 +325,7 @@ type Store struct { AutoReplyType int8 `json:"autoReplyType"` // 订单评价自动回复类型 LinkStoreID int `orm:"column(link_store_id);default(0);index" json:"linkStoreID"` // 关联门店ID StoreLevel string `orm:"default(C);size(32)" json:"storeLevel"` // 门店等级(筛选用,京西的) - Comment string `orm:"size(255)" json:"comment"` //门店备注 + Comment string `orm:"size(255)" json:"comment"` // 门店备注 PrinterDisabled int8 `orm:"default(0)" json:"printerDisabled"` // 是否禁用网络打印机 PrinterFontSize int8 `orm:"default(0)" json:"printerFontSize"` // 打印字体0:(正常大小1份),1:(大字体一份),2(正常字体两份),3(打字体两份) diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index c5a7a4eac..95ec59914 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -67,13 +67,12 @@ func CreateSaleTemp(storeId int64, api *tiktokShop.API) (int64, error) { func GetDeliveryTemp(api *tiktokShop.API, vendorStoreID string, storeDetail *dao.StoreDetail) (int64, error) { // 没有模板是查询线上模板 freightId, _ := api.GetStoreBindTemp(utils.Str2Int64(vendorStoreID)) - globals.SugarLogger.Debugf("freightId =err %d", freightId) if freightId == 0 { // 创建门店运费模板 productProvince := utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[0:2]) tempDetail := &freightTemplate_create_request.FreightTemplateCreateParam{ Template: &freightTemplate_create_request.Template{ - TemplateName: storeDetail.Name + "_" + utils.Int64ToStr(rand.Int63n(int64(storeDetail.ID))) + "_系统模板", + TemplateName: storeDetail.Name + "_" + utils.Int64ToStr(rand.Int63n(int64(storeDetail.ID))) + "_", ProductProvince: productProvince, ProductCity: int64(storeDetail.CityCode), CalculateType: 2, @@ -81,29 +80,37 @@ func GetDeliveryTemp(api *tiktokShop.API, vendorStoreID string, storeDetail *dao RuleType: 1, // 模板类型-0:阶梯计价 1:固定运费 2:卖家包邮 3:货到付款 FixedAmount: 500, //固定运费 单位:分 }, - Columns: []freightTemplate_create_request.ColumnsItem{ - { - RuleAddress: fmt.Sprintf(`{"%d":{"%s":{"%s":nil}}}`, productProvince, utils.Int2Str(storeDetail.CityCode), utils.Int2Str(storeDetail.DistrictCode)), - IsOverFree: true, - OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), - ProvinceInfos: []freightTemplate_create_request.ProvinceInfosItem{ - { - Id: productProvince, - Children: []freightTemplate_create_request.ChildrenItem_4{ - { - Id: int64(storeDetail.CityCode), - Children: []freightTemplate_create_request.ChildrenItem_5{ - { - Id: int64(storeDetail.DistrictCode), - Children: nil, - }, + } + Columns := []freightTemplate_create_request.ColumnsItem{ + { + RuleAddress: fmt.Sprintf(`{"%d":{"%s":{"%s":nil}}}`, productProvince, utils.Int2Str(storeDetail.CityCode), utils.Int2Str(storeDetail.DistrictCode)), + IsOverFree: true, + OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), + ProvinceInfos: []freightTemplate_create_request.ProvinceInfosItem{ + { + Id: productProvince, + Children: []freightTemplate_create_request.ChildrenItem_4{ + { + Id: int64(storeDetail.CityCode), + Children: []freightTemplate_create_request.ChildrenItem_5{ + { + Id: int64(storeDetail.DistrictCode), + Children: nil, }, }, - }}, - }, + }, + }}, }, }, } + // 固定运费模板 + if storeDetail.DeliveryFeeDeductionSill == 0 { + tempDetail.Template.TemplateName += "固定运费模板" + } else { + // 满减运费模板 + tempDetail.Template.TemplateName += "满减运费模板" + tempDetail.Columns = Columns // 满减 + } globals.SugarLogger.Debugf("tempDetail ========= %s", utils.Format4Output(tempDetail, false)) temp, err := api.FreightTemplateCreate(tempDetail) globals.SugarLogger.Debugf("FreightTemplateCreate =err %s", utils.Format4Output(temp, false))