liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-10-08 18:07:48 +08:00
parent c6e2ebe4e7
commit 3b88b012b3
6 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxstore/cms/store_sku.go
View File

@@ -2060,6 +2060,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
skuBind.EbaiID = deletedSku.EbaiID skuBind.EbaiID = deletedSku.EbaiID
skuBind.JdsID = deletedSku.JdsID skuBind.JdsID = deletedSku.JdsID
skuBind.JdsWareID = deletedSku.JdsWareID skuBind.JdsWareID = deletedSku.JdsWareID
skuBind.DdID = deletedSku.DdID
if num, err = dao.UpdateEntity(db, skuBind); err != nil { if num, err = dao.UpdateEntity(db, skuBind); err != nil {
dao.Rollback(db, txDB) dao.Rollback(db, txDB)
return nil, err return nil, err

13
business/jxstore/cms/store_sku_check.go
View File

@@ -142,6 +142,7 @@ type DiffData struct {
VendorStoreName string `json:"门店名"` VendorStoreName string `json:"门店名"`
SkuID string `json:"SkuID"` SkuID string `json:"SkuID"`
MtwmID string `json:"京西美团外卖ID"` MtwmID string `json:"京西美团外卖ID"`
DdID string `json:"京西抖店ID"`
EbaiID string `json:"京西饿百ID"` EbaiID string `json:"京西饿百ID"`
SyncStatus string `json:"同步状态"` SyncStatus string `json:"同步状态"`
ToBeCreate string `json:"待创建"` ToBeCreate string `json:"待创建"`
@@ -382,6 +383,8 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
ebaiid := jxSkuInfo.Skus[0].EbaiID ebaiid := jxSkuInfo.Skus[0].EbaiID
/*美团编码*/ /*美团编码*/
mtwmid := jxSkuInfo.Skus[0].MtwmID mtwmid := jxSkuInfo.Skus[0].MtwmID
/*抖店编码*/
ddid := jxSkuInfo.Skus[0].DdID
//jxSkuPrice := strconv.Itoa(jxSkuInfo.Skus[0].JxPrice) //jxSkuPrice := strconv.Itoa(jxSkuInfo.Skus[0].JxPrice)
/*商品类名*/ /*商品类名*/
jxCategoryName := jxSkuInfo.Skus[0].CategoryName 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)) vendorPrice := fmt.Sprintf("%.2f", float64(vendorSkuInfo.SkuList[0].StoreSkuInfo.VendorPrice)/float64(100))
var IdMark bool var IdMark bool
if isJd == 0 { if isJd == 0 {
IdMark = skuIDStr != ebaiid && skuIDStr != mtwmid IdMark = skuIDStr != ebaiid && skuIDStr != mtwmid && skuIDStr != ddid
} else { } else {
IdMark = false IdMark = false
} }
@@ -454,12 +457,12 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
if status != model.SkuStatusDontSale { if status != model.SkuStatusDontSale {
reason += DatAanalyse7 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) diffData.AppendData(vendorID, outPutData)
} }
if !isSaleStatusDiff && !isNameDiff { if !isSaleStatusDiff && !isNameDiff {
if status != model.SkuStatusDontSale { 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) diffData.AppendData(vendorID, outPutData)
} }
} }
@@ -476,7 +479,7 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
if status != model.SkuStatusDontSale { if status != model.SkuStatusDontSale {
reason += DatAanalyse7 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) diffData.AppendData(vendorID, outPutData)
} }
} }
@@ -497,7 +500,7 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
if len(vendorSkuInfo.VendorCatIDList) != 0 { if len(vendorSkuInfo.VendorCatIDList) != 0 {
vendorCategoryName = vendorSkuInfo.VendorCatIDList[len(vendorSkuInfo.VendorCatIDList)-1] 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) diffData.AppendData(vendorID, outPutData)
} }
} else { } else {

3
business/model/dao/store.go
View File

@@ -521,6 +521,9 @@ func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendo
} else if vendorID == model.VendorIDJDShop { } else if vendorID == model.VendorIDJDShop {
storeCat.JdsID = utils.Str2Int64WithDefault(vendorCategoryID, 0) storeCat.JdsID = utils.Str2Int64WithDefault(vendorCategoryID, 0)
storeCat.JdsSyncStatus = status storeCat.JdsSyncStatus = status
} else if vendorID == model.VendorIDDD {
storeCat.DdID = vendorCategoryID
storeCat.DdSyncStatus = status
} else { } else {
panic("unsupported vendor") panic("unsupported vendor")
} }

2
business/model/dao/store_sku.go
View File

@@ -286,11 +286,13 @@ type StoreSkuExt struct {
EbaiID string `orm:"column(ebai_id);index" json:"ebaiID"` EbaiID string `orm:"column(ebai_id);index" json:"ebaiID"`
MtwmID string `orm:"column(mtwm_id)" json:"mtwmID"` // 这个也不是必须的，只是为了DAO取数据语句一致 MtwmID string `orm:"column(mtwm_id)" json:"mtwmID"` // 这个也不是必须的，只是为了DAO取数据语句一致
YbID string `orm:"column(yb_id);index" json:"ybID"` 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"` JdsID string `orm:"column(jds_id);index" json:"jdsID"`
JdSyncStatus int8 `orm:"default(2)" json:"jdSyncStatus"` JdSyncStatus int8 `orm:"default(2)" json:"jdSyncStatus"`
EbaiSyncStatus int8 `orm:"default(2)" json:"ebaiSyncStatus"` EbaiSyncStatus int8 `orm:"default(2)" json:"ebaiSyncStatus"`
MtwmSyncStatus int8 `orm:"default(2)" json:"mtwmSyncStatus"` MtwmSyncStatus int8 `orm:"default(2)" json:"mtwmSyncStatus"`
DdSyncStatus int8 `orm:"default(2)" json:"ddSyncStatus"`
YbSyncStatus int8 `orm:"default(2)" json:"ybSyncStatus"` YbSyncStatus int8 `orm:"default(2)" json:"ybSyncStatus"`
JdsSyncStatus int8 `orm:"default(2)" json:"jdsSyncStatus"` //京东商城 JdsSyncStatus int8 `orm:"default(2)" json:"jdsSyncStatus"` //京东商城

1
business/model/model.go
View File

@@ -33,6 +33,7 @@ const (
// FieldElmID = "ElmID" // FieldElmID = "ElmID"
FieldEbaiID = "EbaiID" FieldEbaiID = "EbaiID"
FieldMtwmID = "MtwmID" FieldMtwmID = "MtwmID"
FieldDdID = "DdID"
// FieldWscID = "WscID" // FieldWscID = "WscID"
// FieldWscID2 = "WscID2" // FieldWscID2 = "WscID2"

2
business/model/store_sku.go
View File

@@ -58,11 +58,13 @@ type StoreSkuCategoryMap struct {
// ElmID int64 `orm:"column(elm_id);index"` // ElmID int64 `orm:"column(elm_id);index"`
EbaiID int64 `orm:"column(ebai_id);index"` EbaiID int64 `orm:"column(ebai_id);index"`
MtwmID string `orm:"column(mtwm_id);index;size(16)"` 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"` // WscID int64 `orm:"column(wsc_id);index"`
// ElmSyncStatus int8 `orm:"default(2)"` // ElmSyncStatus int8 `orm:"default(2)"`
EbaiSyncStatus int8 `orm:"default(2)"` EbaiSyncStatus int8 `orm:"default(2)"`
MtwmSyncStatus int8 `orm:"default(2)"` MtwmSyncStatus int8 `orm:"default(2)"`
DdSyncStatus int8 `orm:"default(2)"`
// WscSyncStatus int8 `orm:"default(2)"` // WscSyncStatus int8 `orm:"default(2)"`
YbID int64 `orm:"column(yb_id);index"` YbID int64 `orm:"column(yb_id);index"`
YbSyncStatus int8 `orm:"default(2)"` YbSyncStatus int8 `orm:"default(2)"`