- 门店商品相关表中去除饿了么的字段

2019-08-14 14:49:12 +08:00
parent c63c43a92b
commit 8440c6dca5
2 changed files with 7 additions and 17 deletions
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -1345,7 +1345,6 @@ func updateStoreSkusSaleWithoutSync(ctx *jxcontext.Context, storeID int, skuBind
 				model.FieldJdSyncStatus:   skuBind.JdSyncStatus | model.SyncFlagSaleMask,
 				model.FieldEbaiSyncStatus: skuBind.EbaiSyncStatus | model.SyncFlagSaleMask,
 				model.FieldMtwmSyncStatus: skuBind.MtwmSyncStatus | model.SyncFlagSaleMask,
-				model.FieldElmSyncStatus:  skuBind.ElmSyncStatus | model.SyncFlagSaleMask,
 				model.FieldWscSyncStatus:  skuBind.WscSyncStatus | model.SyncFlagSaleMask,
 			}
 			if utils.IsTimeZero(autoSaleTime) || skuBind.Status == model.SkuStatusNormal {
@@ -1455,7 +1454,6 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
 			t1.price = t1.price * ? / 100,
 			t1.unit_price = t1.unit_price * ? / 100,
 			t1.jd_sync_status = t1.jd_sync_status | ?,
-			t1.elm_sync_status = t1.elm_sync_status | ?,
 			t1.wsc_sync_status = t1.wsc_sync_status | ?,
 			t1.mtwm_sync_status = t1.mtwm_sync_status | ?,
 			t1.ebai_sync_status = t1.ebai_sync_status | ?
@@ -1473,7 +1471,6 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
 			model.SyncFlagPriceMask,
 			model.SyncFlagPriceMask,
 			model.SyncFlagPriceMask,
-			model.SyncFlagPriceMask,
 			toStoreID,
 			utils.DefaultTimeValue,
 		}
@@ -1502,7 +1499,6 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
 		t1.last_operator = ?,
 		t1.status = ?,
 		t1.jd_sync_status = IF((t1.jd_sync_status & ?) <> 0, 0, ?),
-		t1.elm_sync_status = IF((t1.elm_sync_status & ?) <> 0, 0, ?),
 		t1.wsc_sync_status = IF((t1.wsc_sync_status & ?) <> 0, 0, ?),
 		t1.mtwm_sync_status = IF((t1.mtwm_sync_status & ?) <> 0, 0, ?),
 		t1.ebai_sync_status = IF((t1.ebai_sync_status & ?) <> 0, 0, ?)
@@ -1526,8 +1522,6 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
 			model.SyncFlagDeletedMask,
 			model.SyncFlagNewMask,
 			model.SyncFlagDeletedMask,
-			model.SyncFlagNewMask,
-			model.SyncFlagDeletedMask,
 			toStoreID,
 			utils.DefaultTimeValue,
 		}
@@ -1555,7 +1549,6 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
 		t1.unit_price = IF(t0.unit_price * ? / 100 > 0, t0.unit_price * ? / 100, 1),
 		t1.status = t0.status,
 		t1.jd_sync_status = t1.jd_sync_status | ?,
-		t1.elm_sync_status = t1.elm_sync_status | ?,
 		t1.wsc_sync_status = t1.wsc_sync_status | ?,
 		t1.mtwm_sync_status = t1.mtwm_sync_status | ?,
 		t1.ebai_sync_status = t1.ebai_sync_status | ?
@@ -1577,7 +1570,6 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
 		model.SyncFlagStoreSkuOnlyMask,
 		model.SyncFlagStoreSkuOnlyMask,
 		model.SyncFlagStoreSkuOnlyMask,
-		model.SyncFlagStoreSkuOnlyMask,
 		toStoreID,
 		utils.DefaultTimeValue,
 	}
@@ -1592,7 +1584,8 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode

 	// 添加toStore中不存在，但fromStore存在的
 	sql = `
-	INSERT INTO store_sku_bind(created_at, updated_at, last_operator, deleted_at, store_id, sku_id, sub_store_id, price, unit_price, status, jd_sync_status, elm_sync_status, wsc_sync_status, ebai_sync_status, mtwm_sync_status)
+	INSERT INTO store_sku_bind(created_at, updated_at, last_operator, deleted_at, store_id, sku_id, sub_store_id, price, unit_price, status,
+	jd_sync_status, wsc_sync_status, ebai_sync_status, mtwm_sync_status)
 	SELECT ?, ?, ?, ?, ?,
 	t1.sku_id, 0, IF(t1.price * ? / 100 > 0, t1.price * ? / 100, 1), IF(t1.unit_price * ? / 100 > 0, t1.unit_price * ? / 100, 1), t1.status, ?, ?, ?, ?, ?
 	FROM store_sku_bind t1
@@ -1612,7 +1605,6 @@ func CopyStoreSkus(ctx *jxcontext.Context, fromStoreID, toStoreID int, copyMode
 		model.SyncFlagNewMask,
 		model.SyncFlagNewMask,
 		model.SyncFlagNewMask,
-		model.SyncFlagNewMask,
 		utils.DefaultTimeValue,
 		utils.DefaultTimeValue,
 		utils.DefaultTimeValue,
@@ -1978,7 +1970,6 @@ func changeStoreOpStatus(ctx *jxcontext.Context, reqIDs []int, status int8, reje

 func setStoreSkuBindStatus(skuBind *model.StoreSkuBind, status int8) {
 	skuBind.JdSyncStatus |= status
-	skuBind.ElmSyncStatus |= status
 	skuBind.EbaiSyncStatus |= status
 	skuBind.MtwmSyncStatus |= status
 	skuBind.WscSyncStatus |= status
--- a/business/model/store_sku.go
+++ b/business/model/store_sku.go
@@ -43,12 +43,12 @@ type StoreSkuCategoryMap struct {
 	StoreID    int `orm:"column(store_id)"`
 	CategoryID int `orm:"column(category_id)"`

-	ElmID  int64  `orm:"column(elm_id);index"`
+	// ElmID  int64  `orm:"column(elm_id);index"`
 	EbaiID int64  `orm:"column(ebai_id);index"`
 	MtwmID string `orm:"column(mtwm_id);index;size(16)"` // 美团外卖没有ID，保存名字
 	WscID  int64  `orm:"column(wsc_id);index"`

-	ElmSyncStatus  int8 `orm:"default(2)"`
+	// ElmSyncStatus  int8 `orm:"default(2)"`
 	EbaiSyncStatus int8 `orm:"default(2)"`
 	MtwmSyncStatus int8 `orm:"default(2)"`
 	WscSyncStatus  int8 `orm:"default(2)"`
@@ -93,15 +93,14 @@ type StoreSkuBind struct {
 	UnitPrice  int // 这个是一斤的门店商品价，放在这里的原因是避免额外增加一张store sku_name表，逻辑上要保证同一SKU NAME中的所有SKU这个字段的数据一致
 	Status     int

-	ElmID  int64 `orm:"column(elm_id);index"`
+	// ElmID  int64 `orm:"column(elm_id);index"`
 	EbaiID int64 `orm:"column(ebai_id);index"`
 	MtwmID int64 `orm:"column(mtwm_id)"`       // 这个也不是必须的，只是为了DAO取数据语句一致
 	WscID  int64 `orm:"column(wsc_id);index"`  // 表示微盟skuId
 	WscID2 int64 `orm:"column(wsc_id2);index"` // 表示微盟goodsId

-	JdSyncStatus int8 `orm:"default(2)"`
-
-	ElmSyncStatus  int8 `orm:"default(2)"`
+	// ElmSyncStatus  int8 `orm:"default(2)"`
+	JdSyncStatus   int8 `orm:"default(2)"`
 	EbaiSyncStatus int8 `orm:"default(2)"`
 	MtwmSyncStatus int8 `orm:"default(2)"`
 	WscSyncStatus  int8 `orm:"default(2)"`