From 7e2957b41da4d43962a3d51646d5eaca2c71f947 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 15 Nov 2022 10:15:18 +0800 Subject: [PATCH 1/5] sku and delete freight --- business/jxstore/cms/store.go | 4 ++++ routers/commentsRouter_controllers.go | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 4a36b1cd3..2010f9b3f 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1623,6 +1623,10 @@ func DeleteStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor err = AddEventDetail(db, ctx, model.OperateDelete, vendorID, model.ThingTypeStore, storeID, "", `{"VendorID":`+utils.Int2Str(vendorID)+`}`) } } + //删除抖店映射 + if _, err1 := dao.ExecuteSQL(db, "DELETE FROM freight_template f WHERE f.store_id = ?", storeID); err != nil { + err = fmt.Errorf("%v,%v", err, err1) + } return num, err } diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 5c3c589bf..6429b5be0 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -2196,6 +2196,15 @@ func init() { Filters: nil, Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"], + web.ControllerComments{ + Method: "UpdateSkuImg", + Router: `/UpdateSkuImg`, + AllowHTTPMethods: []string{"put"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"], web.ControllerComments{ Method: "UpdateSkuNamesExPrefix", From 37b17da76780773f44dd64a87007ff8a6ea2e360 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 15 Nov 2022 10:49:39 +0800 Subject: [PATCH 2/5] delete freight --- business/jxstore/cms/sku.go | 2 +- business/jxstore/cms/store.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 25ea25fe0..87c28472d 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -1194,7 +1194,7 @@ func UpdateSkuImg(ctx *jxcontext.Context, skuID int, payload map[string]interfac if skuID == 0 { return "skuID必传", nil } else if payload["img"] == "" { - return "img必传", nil + return "所有 img 字段必传", nil } if _, err := dao.ExecuteSQL(db, ` UPDATE sku_name s diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index bf1e1a013..dad4f684a 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1624,7 +1624,7 @@ func DeleteStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor } } //删除抖店映射 - if _, err1 := dao.ExecuteSQL(db, "DELETE FROM freight_template f WHERE f.store_id = ?", storeID); err != nil { + if _, err1 := dao.ExecuteSQL(db, "DELETE FROM freight_template WHERE freight_template.store_id = ? ", storeID); err != nil { err = fmt.Errorf("%v,%v", err, err1) } return num, err From 13144c7824b4fa2ab34ef121adcab945fe459978 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 15 Nov 2022 11:05:15 +0800 Subject: [PATCH 3/5] delete --- business/model/store.go | 1 - business/partner/purchase/tiktok_store/store.go | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/business/model/store.go b/business/model/store.go index 9c3d1189b..d13f0e1f5 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -1018,7 +1018,6 @@ func (*BrandCategoryMap) TableUnique() [][]string { // 抖店 运费模板、仓库以及电子围栏绑定 type FreightTemplate struct { - ModelIDCULD StoreID int `orm:"column(store_id)" json:"storeID"` //京西本地门店ID即抖店门店编码 VendorStoreID string `orm:"column(vendor_store_id)" json:"vendorStoreID"` //抖店平台门店ID TemplateID int64 `orm:"column(template_id)" json:"templateID"` //运费模板ID 1对1 diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 75d6e7df0..0a76935c3 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -253,11 +253,10 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID, deliveryFee //4. 设置门店打包费 默认为0 if err := SetStorePackageFee(vendorOrgCode, vendorStoreID, deliveryFeeDeductionFee); err != nil { - errList.AddErr(fmt.Errorf("设置门店打包费失败：%v", err)) + errList.AddErr(fmt.Errorf("设置门店打包费失败:%v", err)) } //5.同步进数据库 - FreightTemplate.DeletedAt = utils.DefaultTimeValue FreightTemplate = &model.FreightTemplate{ StoreID: int(storeID), VendorStoreID: utils.Int64ToStr(vendorStoreID), From 3eecbe1374c6e61a2d7de0d30c1698a94117e5e2 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 15 Nov 2022 11:22:34 +0800 Subject: [PATCH 4/5] id --- business/model/store.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/model/store.go b/business/model/store.go index d13f0e1f5..83e26ea0e 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -1018,6 +1018,7 @@ func (*BrandCategoryMap) TableUnique() [][]string { // 抖店 运费模板、仓库以及电子围栏绑定 type FreightTemplate struct { + ID int `orm:"column(id)" json:"id"` StoreID int `orm:"column(store_id)" json:"storeID"` //京西本地门店ID即抖店门店编码 VendorStoreID string `orm:"column(vendor_store_id)" json:"vendorStoreID"` //抖店平台门店ID TemplateID int64 `orm:"column(template_id)" json:"templateID"` //运费模板ID 1对1 From 7cca209659d6623a2d65909c4faf0056a8df3ca4 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Tue, 15 Nov 2022 13:37:19 +0800 Subject: [PATCH 5/5] id --- business/partner/purchase/tiktok_store/store.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index 0a76935c3..656c1ad05 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -368,7 +368,6 @@ func CreateAndBindAllV2(vendorOrgCode string, storeID, vendorStoreID, deliveryFe tasksch.ManageTask(task).Run() //6.同步进数据库 globals.SugarLogger.Debugf("preTest TradeLimitID==%d,TemplateID==%d, WarehouseID==%d,FenceID==%s", FreightTemplate.TradeLimitID, FreightTemplate.TemplateID, FreightTemplate.WarehouseID, FreightTemplate.FenceID) - dao.WrapAddIDCULDEntity(FreightTemplate, userName) if err := dao.CreateEntity(db, FreightTemplate); err != nil { _, err1 := dao.UpdateEntity(db, FreightTemplate, "TemplateID", "WarehouseID", "FenceID", "TradeLimitID") if err1 == nil { @@ -491,7 +490,6 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin StoreID: storeID, VendorStoreID: storeInfo.VendorStoreID, } - dao.WrapAddIDCULDEntity(FreightTemplate, userName) if err = dao.CreateEntity(db, FreightTemplate); err != nil { if _, err1 := dao.UpdateEntity(db, FreightTemplate, "FenceID"); err1 != nil { globals.SugarLogger.Debugf("db update storeID,vendorStoreID defeat on :%v", err1)