From 0f71eb5254268c7188f1345b29d4ffa67ece3bec Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 11:31:54 +0800 Subject: [PATCH 1/9] =?UTF-8?q?dy=20api=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/delivery/tiktok_store/waybill.go | 6 ++---- business/partner/purchase/tiktok_store/store.go | 3 ++- business/partner/purchase/tiktok_store/warehouse.go | 6 ++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/business/partner/delivery/tiktok_store/waybill.go b/business/partner/delivery/tiktok_store/waybill.go index 733d27632..3ba5e49a9 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 } // 呼叫运力并发货 diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 55544cb9b..5fb422bd1 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -811,7 +811,8 @@ 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, }, diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index 67abf66c9..bd9982274 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -312,12 +312,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) From 904c59b976075618172aa32826185972d2420c17 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 11:45:40 +0800 Subject: [PATCH 2/9] =?UTF-8?q?dy=20api=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/tiktok_store/store.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 5fb422bd1..d622fd210 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -814,7 +814,9 @@ func UpdateTradeLimitTemplate(vendorOrgCode string, tradeLimitID, minPrice int64 TradeLimitModel: tiktok_api.TradeLimitModelMoney, TradeLimitResource: tiktok_api.TradeLimitResourceDouDian, TradeLimitPattern: &trade_UpdateTradeLimitTemplate_request.TradeLimitPattern{ - Minimum: minPrice, + Minimum: minPrice, + Maximum: minPrice, + CumulativeMax: 100, }, }, }, From 3ea25519216084e761a39b565c6b9e90f2f6d02c Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 11:59:21 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=99=90=E5=94=AEapi?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/tiktok_store/store.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index d622fd210..daa09a7e0 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, From 61e2b13d21c633752435062e24b89f1333a4d57a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 13:50:30 +0800 Subject: [PATCH 4/9] 1 --- business/jxstore/cms/store.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 77742845f..c4bd6df08 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1706,6 +1706,7 @@ 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("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 { From 0e3cac55c5d682d3accab9f6ad54af9ec57b48f4 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 13:53:18 +0800 Subject: [PATCH 5/9] 1 --- business/jxstore/cms/store.go | 2 +- business/partner/purchase/tiktok_store/warehouse.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index c4bd6df08..73f0c28b4 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1709,7 +1709,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor 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/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index bd9982274..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 From 8203ee0c1889eb278fdbade0a8490f7bf996e325 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 14:15:16 +0800 Subject: [PATCH 6/9] 1 --- business/jxstore/cms/store.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 73f0c28b4..c2001727b 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1706,6 +1706,10 @@ 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 特殊处理运费模板、起送价、打包费") From d9a07cede283f9854522efd8702bf0eddaf7e9fe Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 14:24:22 +0800 Subject: [PATCH 7/9] 1 --- business/partner/purchase/tiktok_store/store.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index daa09a7e0..32ad95489 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -821,6 +821,15 @@ func UpdateTradeLimitTemplate(vendorOrgCode string, tradeLimitID, minPrice int64 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, + }, }, }, }); err != nil { From e48d065ad130890202f5cbde7ea803e480ea0abc Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 15:17:55 +0800 Subject: [PATCH 8/9] 1 --- business/partner/delivery/tiktok_store/waybill.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/partner/delivery/tiktok_store/waybill.go b/business/partner/delivery/tiktok_store/waybill.go index 3ba5e49a9..4ad8a5e36 100644 --- a/business/partner/delivery/tiktok_store/waybill.go +++ b/business/partner/delivery/tiktok_store/waybill.go @@ -118,10 +118,12 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, } func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) { + globals.SugarLogger.Debugf("order.JxStoreID==========%d, order.StoreID=======%d", order.JxStoreID, order.StoreID) relInfo, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDDD, "") if err != nil { return nil, errors.New("获取抖音平台账号信息失败，请重试") } + globals.SugarLogger.Debugf("order.StoreID======%d,order.VendorOrderID======%s", order.StoreID, order.VendorOrderID) if dispatcherFee, err := getAPI(relInfo.VendorOrgCode).GetDispatcherInfo(int64(order.StoreID), utils.Str2Int64(order.VendorOrderID), tiktok_api.DispatcherFeeTypeCall); err == nil { deliveryFeeInfo = &partner.WaybillFeeInfo{} deliveryFeeInfo.DeliveryFee = dispatcherFee From 3255dec66cf8f47bcc8751c28482acfa103132cf Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 26 Dec 2022 15:27:54 +0800 Subject: [PATCH 9/9] 1 --- business/partner/delivery/tiktok_store/waybill.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/business/partner/delivery/tiktok_store/waybill.go b/business/partner/delivery/tiktok_store/waybill.go index 4ad8a5e36..ec09f2e03 100644 --- a/business/partner/delivery/tiktok_store/waybill.go +++ b/business/partner/delivery/tiktok_store/waybill.go @@ -118,13 +118,12 @@ func (c *DeliveryHandler) CancelWaybill(bill *model.Waybill, cancelReasonID int, } func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInfo *partner.WaybillFeeInfo, err error) { - globals.SugarLogger.Debugf("order.JxStoreID==========%d, order.StoreID=======%d", order.JxStoreID, order.StoreID) relInfo, err := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDDD, "") if err != nil { return nil, errors.New("获取抖音平台账号信息失败，请重试") } - globals.SugarLogger.Debugf("order.StoreID======%d,order.VendorOrderID======%s", order.StoreID, order.VendorOrderID) - 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 }