From 3b88b012b33f05f05df2449667fa73c4ce5b8664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 8 Oct 2022 18:07:48 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/store_sku.go | 1 + business/jxstore/cms/store_sku_check.go | 13 ++++++++----- business/model/dao/store.go | 3 +++ business/model/dao/store_sku.go | 2 ++ business/model/model.go | 1 + business/model/store_sku.go | 2 ++ 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 857b009b2..b75deb6db 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -2060,6 +2060,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs skuBind.EbaiID = deletedSku.EbaiID skuBind.JdsID = deletedSku.JdsID skuBind.JdsWareID = deletedSku.JdsWareID + skuBind.DdID = deletedSku.DdID if num, err = dao.UpdateEntity(db, skuBind); err != nil { dao.Rollback(db, txDB) return nil, err diff --git a/business/jxstore/cms/store_sku_check.go b/business/jxstore/cms/store_sku_check.go index ff4bc0d3a..2fa311982 100644 --- a/business/jxstore/cms/store_sku_check.go +++ b/business/jxstore/cms/store_sku_check.go @@ -142,6 +142,7 @@ type DiffData struct { VendorStoreName string `json:"门店名"` SkuID string `json:"SkuID"` MtwmID string `json:"京西美团外卖ID"` + DdID string `json:"京西抖店ID"` EbaiID string `json:"京西饿百ID"` SyncStatus string `json:"同步状态"` ToBeCreate string `json:"待创建"` @@ -382,6 +383,8 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin ebaiid := jxSkuInfo.Skus[0].EbaiID /*美团编码*/ mtwmid := jxSkuInfo.Skus[0].MtwmID + /*抖店编码*/ + ddid := jxSkuInfo.Skus[0].DdID //jxSkuPrice := strconv.Itoa(jxSkuInfo.Skus[0].JxPrice) /*商品类名*/ jxCategoryName := jxSkuInfo.Skus[0].CategoryName @@ -418,7 +421,7 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin vendorPrice := fmt.Sprintf("%.2f", float64(vendorSkuInfo.SkuList[0].StoreSkuInfo.VendorPrice)/float64(100)) var IdMark bool if isJd == 0 { - IdMark = skuIDStr != ebaiid && skuIDStr != mtwmid + IdMark = skuIDStr != ebaiid && skuIDStr != mtwmid && skuIDStr != ddid } else { IdMark = false } @@ -454,12 +457,12 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin if status != model.SkuStatusDontSale { reason += DatAanalyse7 } - outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, mtwmid, ebaiid, syncStatus, toBeCreate, toBeDel, jxSkuDetailName, vendorSkuDetailName, jxSkuSaleStatusName, vendorSkuSaleStatusName, jxSkuPrice, vendorPrice, jxCategoryName, vendorCategoryName, reason} + outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, mtwmid, ddid, ebaiid, syncStatus, toBeCreate, toBeDel, jxSkuDetailName, vendorSkuDetailName, jxSkuSaleStatusName, vendorSkuSaleStatusName, jxSkuPrice, vendorPrice, jxCategoryName, vendorCategoryName, reason} diffData.AppendData(vendorID, outPutData) } if !isSaleStatusDiff && !isNameDiff { if status != model.SkuStatusDontSale { - outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, mtwmid, ebaiid, syncStatus, toBeCreate, toBeDel, jxSkuDetailName, vendorSkuDetailName, jxSkuSaleStatusName, vendorSkuSaleStatusName, jxSkuPrice, vendorPrice, jxCategoryName, vendorCategoryName, DatAanalyse7} + outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, mtwmid, ddid, ebaiid, syncStatus, toBeCreate, toBeDel, jxSkuDetailName, vendorSkuDetailName, jxSkuSaleStatusName, vendorSkuSaleStatusName, jxSkuPrice, vendorPrice, jxCategoryName, vendorCategoryName, DatAanalyse7} diffData.AppendData(vendorID, outPutData) } } @@ -476,7 +479,7 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin if status != model.SkuStatusDontSale { reason += DatAanalyse7 } - outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, mtwmid, ebaiid, syncStatus, toBeCreate, toBeDel, jxSkuDetailName, "", jxSkuSaleStatusName, "", jxSkuPrice, "", jxCategoryName, "", reason} + outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, mtwmid, ddid, ebaiid, syncStatus, toBeCreate, toBeDel, jxSkuDetailName, "", jxSkuSaleStatusName, "", jxSkuPrice, "", jxCategoryName, "", reason} diffData.AppendData(vendorID, outPutData) } } @@ -497,7 +500,7 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin if len(vendorSkuInfo.VendorCatIDList) != 0 { vendorCategoryName = vendorSkuInfo.VendorCatIDList[len(vendorSkuInfo.VendorCatIDList)-1] } - outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, "", "", "", "", "", "", vendorSkuDetailName, "", vendorSkuSaleStatusName, "", vendorPrice, "", vendorCategoryName, DatAanalyse1} + outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, "", "", "", "", "", "", vendorSkuDetailName, "", vendorSkuSaleStatusName, "", vendorPrice, "", vendorCategoryName, DatAanalyse1, ""} diffData.AppendData(vendorID, outPutData) } } else { diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 8f13399e6..29b6cb461 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -521,6 +521,9 @@ func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendo } else if vendorID == model.VendorIDJDShop { storeCat.JdsID = utils.Str2Int64WithDefault(vendorCategoryID, 0) storeCat.JdsSyncStatus = status + } else if vendorID == model.VendorIDDD { + storeCat.DdID = vendorCategoryID + storeCat.DdSyncStatus = status } else { panic("unsupported vendor") } diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index e9ecf8fc6..20cbe4fb2 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -286,11 +286,13 @@ type StoreSkuExt struct { EbaiID string `orm:"column(ebai_id);index" json:"ebaiID"` MtwmID string `orm:"column(mtwm_id)" json:"mtwmID"` // 这个也不是必须的，只是为了DAO取数据语句一致 YbID string `orm:"column(yb_id);index" json:"ybID"` + DdID string `orm:"column(dd_id);index" json:"ddID"` JdsID string `orm:"column(jds_id);index" json:"jdsID"` JdSyncStatus int8 `orm:"default(2)" json:"jdSyncStatus"` EbaiSyncStatus int8 `orm:"default(2)" json:"ebaiSyncStatus"` MtwmSyncStatus int8 `orm:"default(2)" json:"mtwmSyncStatus"` + DdSyncStatus int8 `orm:"default(2)" json:"ddSyncStatus"` YbSyncStatus int8 `orm:"default(2)" json:"ybSyncStatus"` JdsSyncStatus int8 `orm:"default(2)" json:"jdsSyncStatus"` //京东商城 diff --git a/business/model/model.go b/business/model/model.go index 10995dc59..233a9947b 100644 --- a/business/model/model.go +++ b/business/model/model.go @@ -33,6 +33,7 @@ const ( // FieldElmID = "ElmID" FieldEbaiID = "EbaiID" FieldMtwmID = "MtwmID" + FieldDdID = "DdID" // FieldWscID = "WscID" // FieldWscID2 = "WscID2" diff --git a/business/model/store_sku.go b/business/model/store_sku.go index 8d68cec39..676a2a216 100644 --- a/business/model/store_sku.go +++ b/business/model/store_sku.go @@ -58,11 +58,13 @@ type StoreSkuCategoryMap struct { // ElmID int64 `orm:"column(elm_id);index"` EbaiID int64 `orm:"column(ebai_id);index"` MtwmID string `orm:"column(mtwm_id);index;size(16)"` + DdID string `orm:"column(dd_id);index;size(16)"` // WscID int64 `orm:"column(wsc_id);index"` // ElmSyncStatus int8 `orm:"default(2)"` EbaiSyncStatus int8 `orm:"default(2)"` MtwmSyncStatus int8 `orm:"default(2)"` + DdSyncStatus int8 `orm:"default(2)"` // WscSyncStatus int8 `orm:"default(2)"` YbID int64 `orm:"column(yb_id);index"` YbSyncStatus int8 `orm:"default(2)"`