diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 77742845f..c2001727b 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1706,9 +1706,14 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor if (valid["deliveryFeeDeductionSill"] != nil || valid["deliveryFeeDeductionFee"] != nil || valid["ybStorePrefix"] != nil) && vendorID == model.VendorIDDD { DDFlag = true } //特殊处理抖店运费模板、打包费 + globals.SugarLogger.Debugf("DeliveryFeeDeductionFee=====%d,YbStorePrefix====%s", storeMap.DeliveryFeeDeductionFee, storeMap.YbStorePrefix) + if (storeMap.DeliveryFeeDeductionFee > 0 || utils.Str2Int(storeMap.YbStorePrefix) > 0) && vendorID == model.VendorIDDD { + DDFlag = true + } + globals.SugarLogger.Debugf("ddflag=========%v", DDFlag) if DDFlag { globals.SugarLogger.Debug("进入DDFlag 特殊处理运费模板、起送价、打包费") - if err := tiktok_store.SpecialTreat(storeMap.VendorOrgCode, utils.Str2Int64(storeMap.VendorStoreID), int64(storeMap.StoreID), int64(storeMap.DeliveryFeeDeductionFee), utils.Str2Int64(storeMap.YbStorePrefix), userName); err != nil { + if err := tiktok_store.SpecialTreat(storeMap.VendorOrgCode, utils.Str2Int64(storeMap.VendorStoreID), int64(storeMap.StoreID), int64(storeMap.DeliveryFeeDeductionFee), utils.Str2Int64(storeMap.YbStorePrefix)); err != nil { errList.AddErr(fmt.Errorf("抖店运费模板、起送价、打包费相关处理错误:%v", err)) } } diff --git a/business/partner/delivery/tiktok_store/waybill.go b/business/partner/delivery/tiktok_store/waybill.go index 733d27632..ec09f2e03 100644 --- a/business/partner/delivery/tiktok_store/waybill.go +++ b/business/partner/delivery/tiktok_store/waybill.go @@ -74,13 +74,11 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt } func (c *DeliveryHandler) IsErrStoreNotExist(err error) bool { - //TODO implement me - panic("implement me") + return false } func (c *DeliveryHandler) IsErrStoreExist(err error) bool { - //TODO implement me - panic("implement me") + return false } // 呼叫运力并发货 @@ -124,7 +122,8 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf if err != nil { return nil, errors.New("获取抖音平台账号信息失败,请重试") } - if dispatcherFee, err := getAPI(relInfo.VendorOrgCode).GetDispatcherInfo(int64(order.StoreID), utils.Str2Int64(order.VendorOrderID), tiktok_api.DispatcherFeeTypeCall); err == nil { + globals.SugarLogger.Debugf("relInfo.VendorStoreID======%s,order.VendorOrderID======%s", relInfo.VendorStoreID, order.VendorOrderID) + if dispatcherFee, err := getAPI(relInfo.VendorOrgCode).GetDispatcherInfo(utils.Str2Int64(relInfo.VendorStoreID), utils.Str2Int64(order.VendorOrderID), tiktok_api.DispatcherFeeTypeCall); err == nil { deliveryFeeInfo = &partner.WaybillFeeInfo{} deliveryFeeInfo.DeliveryFee = dispatcherFee } diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 55544cb9b..32ad95489 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -779,9 +779,12 @@ func CreateAndBindMinPriceTemplate(vendorOrgCode string, vendorStoreID, minimum StoreId: vendorStoreID, TradeLimitRuleRequestList: []trade_createTradeLimitTemplate_request.TradeLimitRuleRequestListItem{ { - TradeLimitModel: tiktok_api.TradeLimitModelMoney, + TradeLimitModel: tiktok_api.TradeLimitModelMoney, + TradeLimitResource: tiktok_api.TradeLimitResourceDouDian, TradeLimitPattern: &trade_createTradeLimitTemplate_request.TradeLimitPattern{ - Minimum: minimum, + Minimum: minimum, + Maximum: minimum, + CumulativeMax: 100, }, TradeLimitSubjectList: []int32{ tiktok_api.TradeLimitSubjectEndUser, @@ -811,9 +814,21 @@ func UpdateTradeLimitTemplate(vendorOrgCode string, tradeLimitID, minPrice int64 TradeLimitTemplateId: tradeLimitID, TradeLimitRuleRequestList: []trade_UpdateTradeLimitTemplate_request.TradeLimitRuleRequestListItem{ { - TradeLimitModel: tiktok_api.TradeLimitModelMoney, + TradeLimitModel: tiktok_api.TradeLimitModelMoney, + TradeLimitResource: tiktok_api.TradeLimitResourceDouDian, TradeLimitPattern: &trade_UpdateTradeLimitTemplate_request.TradeLimitPattern{ - Minimum: minPrice, + Minimum: minPrice, + Maximum: minPrice, + CumulativeMax: 100, + }, + TradeLimitSubjectLisit: []int32{ + tiktok_api.TradeLimitSubjectEndUser, + tiktok_api.TradeLimitSubjectUserGroup, + tiktok_api.TradeLimitSubjectDevice, + tiktok_api.TradeLimitSubjectBuyMobile, + tiktok_api.TradeLimitSubjectReceivingMobile, + tiktok_api.TradeLimitSubjectIDCard, + tiktok_api.TradeLimitSubjectPayAccount, }, }, }, diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index 67abf66c9..97f8ab99a 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -253,7 +253,7 @@ func GetFence(appOrgCode string, outFenceID []string) ([]warehouse_getFences_res } //特殊处理 -func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeductionFee, minPrice int64, userName string) error { +func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeductionFee, minPrice int64) error { var ( db *dao.DaoDB errList = errlist.New() @@ -292,16 +292,19 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc } //3.设置门店起送价 默认为0 if bindSaleLimitID, err := GetStoreSaleLimit(vendorOrgCode, vendorStoreID); err != nil { + globals.SugarLogger.Debugf("进入获取门店起送价限售模板") errList.AddErr(fmt.Errorf("获取门店限售模板失败:%v", err)) } else { if bindSaleLimitID == 0 || utils.IsNil(bindSaleLimitID) { //创建 if createSaleLimitID, err := CreateAndBindMinPriceTemplate(vendorOrgCode, vendorStoreID, minPrice); err != nil { + globals.SugarLogger.Debugf("进入创建门店起送价限售模板,minPrice=======%d", minPrice) errList.AddErr(fmt.Errorf("设置门店起送价限售模板失败:%v", err)) } else { FreightTemplate.TradeLimitID = createSaleLimitID } } else { //更新为起送价模板 if updateSaleLimitID, err := UpdateTradeLimitTemplate(vendorOrgCode, bindSaleLimitID, minPrice); err != nil { + globals.SugarLogger.Debugf("进入更新门店起送价限售模板,minPrice=======%d", minPrice) errList.AddErr(fmt.Errorf("更新门店起送价限售模板失败:%v", err)) } else { FreightTemplate.TradeLimitID = updateSaleLimitID @@ -312,12 +315,10 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc if err := dao.CreateEntity(db, FreightTemplate); err != nil { _, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID", "TradeLimitID") if err1 != nil { - errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err1)) + globals.SugarLogger.Debugf("更新起送价限售模板,更新进数据库错误信息:%v", err1) } else { - errList.AddErr(fmt.Errorf("同步进数据库错误信息:%v", err)) + globals.SugarLogger.Debugf("更新起送价限售模板,创建进数据库错误信息:%v", err) } - } else { - dao.WrapAddIDCULDEntity(FreightTemplate, userName) } endErr := errList.GetErrListAsOne() globals.SugarLogger.Debugf("SpecialTreat wrong information endErr: %s", endErr)