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

- fk

Browse Source
This commit is contained in:
gazebo
2019-08-14 16:51:06 +08:00
parent 47322fb302
commit 79925dd1de
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/cms/sku.go
View File

@@ -265,8 +265,9 @@ func DeleteCategoryMap(ctx *jxcontext.Context, db *dao.DaoDB, categoryID int) (n
} }
catMap := &model.StoreSkuCategoryMap{} catMap := &model.StoreSkuCategoryMap{}
return dao.DeleteEntityLogically(db, catMap, map[string]interface{}{ return dao.DeleteEntityLogically(db, catMap, map[string]interface{}{
model.FieldElmSyncStatus: model.SyncFlagDeletedMask,
model.FieldEbaiSyncStatus: model.SyncFlagDeletedMask, model.FieldEbaiSyncStatus: model.SyncFlagDeletedMask,
model.FieldMtwmSyncStatus: model.SyncFlagDeletedMask,
model.FieldWscSyncStatus: model.SyncFlagDeletedMask,
}, ctx.GetUserName(), map[string]interface{}{ }, ctx.GetUserName(), map[string]interface{}{
model.FieldCategoryID: categoryID, model.FieldCategoryID: categoryID,
model.FieldDeletedAt: utils.DefaultTimeValue, model.FieldDeletedAt: utils.DefaultTimeValue,
@@ -932,7 +933,7 @@ func DeleteStoreSku(ctx *jxcontext.Context, db *dao.DaoDB, nameID, skuID int) (n
storeSkuBind := &model.StoreSkuBind{} storeSkuBind := &model.StoreSkuBind{}
_, err = dao.DeleteEntityLogically(db, storeSkuBind, map[string]interface{}{ _, err = dao.DeleteEntityLogically(db, storeSkuBind, map[string]interface{}{
model.FieldJdSyncStatus: model.SyncFlagDeletedMask, model.FieldJdSyncStatus: model.SyncFlagDeletedMask,
model.FieldElmSyncStatus: model.SyncFlagDeletedMask, model.FieldWscSyncStatus: model.SyncFlagDeletedMask,
model.FieldEbaiSyncStatus: model.SyncFlagDeletedMask, model.FieldEbaiSyncStatus: model.SyncFlagDeletedMask,
}, ctx.GetUserName(), map[string]interface{}{ }, ctx.GetUserName(), map[string]interface{}{
model.FieldSkuID: v.ID, model.FieldSkuID: v.ID,

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

@@ -106,8 +106,8 @@ type StoreSkuBindSkuInfo struct {
SkuID int `json:"skuID"` SkuID int `json:"skuID"`
IsSale int `json:"isSale,omitempty"` // -1：不可售，0：忽略，1：可售 IsSale int `json:"isSale,omitempty"` // -1：不可售，0：忽略，1：可售
ElmID int64 `json:"elmID,omitempty"` // ElmID int64 `json:"elmID,omitempty"`
EbaiID int64 `json:"ebaiID,omitempty"` // EbaiID int64 `json:"ebaiID,omitempty"`
} }
// UpdateStoreSku用，API调用时 // UpdateStoreSku用，API调用时
@@ -1216,7 +1216,6 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
if num, err = dao.DeleteEntityLogically(db, skuBind, map[string]interface{}{ if num, err = dao.DeleteEntityLogically(db, skuBind, map[string]interface{}{
model.FieldStatus: model.StoreSkuBindStatusDeleted, model.FieldStatus: model.StoreSkuBindStatusDeleted,
model.FieldJdSyncStatus: model.SyncFlagDeletedMask, model.FieldJdSyncStatus: model.SyncFlagDeletedMask,
model.FieldElmSyncStatus: model.SyncFlagDeletedMask,
model.FieldEbaiSyncStatus: model.SyncFlagDeletedMask, model.FieldEbaiSyncStatus: model.SyncFlagDeletedMask,
model.FieldMtwmSyncStatus: model.SyncFlagDeletedMask, model.FieldMtwmSyncStatus: model.SyncFlagDeletedMask,
model.FieldWscSyncStatus: model.SyncFlagDeletedMask, model.FieldWscSyncStatus: model.SyncFlagDeletedMask,
@@ -1261,7 +1260,6 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
// } // }
if len(updateFieldMap) > 0 { if len(updateFieldMap) > 0 {
updateFieldMap[model.FieldJdSyncStatus] = 1 updateFieldMap[model.FieldJdSyncStatus] = 1
updateFieldMap[model.FieldElmSyncStatus] = 1
updateFieldMap[model.FieldEbaiSyncStatus] = 1 updateFieldMap[model.FieldEbaiSyncStatus] = 1
updateFieldMap[model.FieldMtwmSyncStatus] = 1 updateFieldMap[model.FieldMtwmSyncStatus] = 1
updateFieldMap[model.FieldWscSyncStatus] = 1 updateFieldMap[model.FieldWscSyncStatus] = 1

4
business/model/model.go
View File

@@ -14,7 +14,7 @@ const (
FieldStatus = "Status" FieldStatus = "Status"
FieldSyncStatus = "SyncStatus" FieldSyncStatus = "SyncStatus"
FieldJdSyncStatus = "JdSyncStatus" FieldJdSyncStatus = "JdSyncStatus"
FieldElmSyncStatus = "ElmSyncStatus" // FieldElmSyncStatus = "ElmSyncStatus"
FieldEbaiSyncStatus = "EbaiSyncStatus" FieldEbaiSyncStatus = "EbaiSyncStatus"
FieldMtwmSyncStatus = "MtwmSyncStatus" FieldMtwmSyncStatus = "MtwmSyncStatus"
FieldWscSyncStatus = "WscSyncStatus" FieldWscSyncStatus = "WscSyncStatus"
@@ -28,7 +28,7 @@ const (
FieldCategoryID = "CategoryID" FieldCategoryID = "CategoryID"
FieldJdID = "JdID" FieldJdID = "JdID"
FieldElmID = "ElmID" // FieldElmID = "ElmID"
FieldEbaiID = "EbaiID" FieldEbaiID = "EbaiID"
FieldMtwmID = "MtwmID" FieldMtwmID = "MtwmID"
FieldWscID = "WscID" FieldWscID = "WscID"