尽量去除VendorIDWSC与VendorIDJX相关的无用代码

2019-11-05 17:21:21 +08:00
parent 00431b701d
commit 444e3dadd9
11 changed files with 36 additions and 221 deletions
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -124,67 +124,6 @@ func GetStoreDetailByVendorStoreID(db *DaoDB, vendorStoreID string, vendorID int
 	return storeDetail, err
 }

-func GetPossibleStoresByPlaceName(db *DaoDB, cityName, provinceName string) (storeList []*StoreDetail, err error) {
-	sqlList := []string{
-		`
-		SELECT t1.*, t5.vendor_store_id
-		FROM store t1
-		JOIN place t2 ON t2.code = t1.city_code AND t2.name = ?
-		LEFT JOIN store_map t5 ON t1.id = t5.store_id AND t5.vendor_id = ? AND t5.deleted_at = ?
-		WHERE t1.status = ? AND (SELECT COUNT(*) FROM store_map t10 WHERE t10.store_id = t1.id AND t10.deleted_at = ? AND t10.status <> ?) > 0
-		`,
-		`
-		SELECT t1.*, t5.vendor_store_id
-		FROM store t1
-		JOIN place t2 ON t2.code = t1.city_code
-		JOIN place t3 ON t3.code = t2.parent_code AND t3.name = ?
-		LEFT JOIN store_map t5 ON t1.id = t5.store_id AND t5.vendor_id = ? AND t5.deleted_at = ?
-		WHERE t1.status = ? AND (SELECT COUNT(*) FROM store_map t10 WHERE t10.store_id = t1.id AND t10.deleted_at = ? AND t10.status <> ?) > 0
-		`,
-		`
-		SELECT t1.*, t5.vendor_store_id
-		FROM store t1
-		LEFT JOIN store_map t5 ON t1.id = t5.store_id AND t5.vendor_id = ? AND t5.deleted_at = ?
-		WHERE t1.status = ? AND (SELECT COUNT(*) FROM store_map t10 WHERE t10.store_id = t1.id AND t10.deleted_at = ? AND t10.status <> ?) > 0
-		`,
-	}
-	sqlParamsList := [][]interface{}{
-		[]interface{}{
-			cityName,
-			model.VendorIDWSC,
-			utils.DefaultTimeValue,
-			model.StoreStatusOpened,
-			utils.DefaultTimeValue,
-			model.StoreStatusDisabled,
-		},
-		[]interface{}{
-			provinceName,
-			model.VendorIDWSC,
-			utils.DefaultTimeValue,
-			model.StoreStatusOpened,
-			utils.DefaultTimeValue,
-			model.StoreStatusDisabled,
-		},
-		[]interface{}{
-			model.VendorIDWSC,
-			utils.DefaultTimeValue,
-			model.StoreStatusOpened,
-			utils.DefaultTimeValue,
-			model.StoreStatusDisabled,
-		},
-	}
-	for k := range sqlList {
-		if err = GetRows(db, &storeList, sqlList[k], sqlParamsList[k]); err != nil {
-			return nil, err
-		}
-		if len(storeList) > 0 {
-			return storeList, nil
-		}
-	}
-	// 正常是不应该达到这里的
-	return storeList, err
-}
-
 // 这个返回的地点信息是城市
 func GetStoreDetail2(db *DaoDB, storeID int, vendorStoreID string, vendorID int) (storeDetail *StoreDetail2, err error) {
 	sql := `
@@ -374,7 +313,6 @@ func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendo
 		CategoryID:     categoryID,
 		MtwmSyncStatus: model.SyncFlagNewMask,
 		EbaiSyncStatus: model.SyncFlagNewMask,
-		WscSyncStatus:  model.SyncFlagNewMask,
 	}
 	storeCat.DeletedAt = utils.DefaultTimeValue
 	if err = GetEntity(db, storeCat, model.FieldStoreID, model.FieldCategoryID, model.FieldDeletedAt); err != nil && !IsNoRowsError(err) {
@@ -383,15 +321,9 @@ func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendo
 	if vendorID == model.VendorIDMTWM {
 		storeCat.MtwmID = vendorCategoryID
 		storeCat.MtwmSyncStatus = status
-	} else if vendorID == model.VendorIDEBAI || vendorID == model.VendorIDWSC {
-		intVendorCategoryID := utils.Str2Int64WithDefault(vendorCategoryID, 0)
-		if vendorID == model.VendorIDEBAI {
-			storeCat.EbaiID = intVendorCategoryID
-			storeCat.EbaiSyncStatus = status
-		} else {
-			storeCat.WscID = intVendorCategoryID
-			storeCat.WscSyncStatus = status
-		}
+	} else if vendorID == model.VendorIDEBAI {
+		storeCat.EbaiID = utils.Str2Int64WithDefault(vendorCategoryID, 0)
+		storeCat.EbaiSyncStatus = status
 	} else {
 		panic("unsupported vendor")
 	}
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -213,14 +213,10 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	if !isSingleStorePF {
 		tableName = "t2"
 	}
-	vendorSkuNameField := "0"
-	if vendorID == model.VendorIDWSC {
-		vendorSkuNameField = "t1.wsc_id2"
-	}
 	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
 	sql := `
 	SELECT t1.id bind_id, t1.sku_id, t1.price, t1.unit_price, t1.status store_sku_status, %s.%s_id vendor_sku_id,
-	t1.%s_sync_status store_sku_sync_status, %s vendor_name_id, t1.store_id, t1.deleted_at bind_deleted_at,
+	t1.%s_sync_status store_sku_sync_status, t1.store_id, t1.deleted_at bind_deleted_at,
 	t2.*,
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc,
 	IF(t11.%s <> '', t11.%s, t3.img) img,
@@ -228,7 +224,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	t13.%s desc_img,
 	t4.%s_category_id vendor_vendor_cat_id`
 	fmtParams := []interface{}{
-		tableName, fieldPrefix, fieldPrefix, vendorSkuNameField,
+		tableName, fieldPrefix, fieldPrefix,
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		GetDataResFieldName(vendorID),
--- a/business/model/order.go
+++ b/business/model/order.go
@@ -263,12 +263,7 @@ type OrderComment struct {
 // 判断是否是购买平台自有物流
 // 对于京东，饿百来说，就是其自有的物流，对于微商城来说，是达达
 func IsWaybillPlatformOwn(bill *Waybill) bool {
-	return bill.OrderVendorID == bill.WaybillVendorID || IsSpecialOrderPlatformWaybill(bill)
-}
-
-// 是否是特殊物流
-func IsSpecialOrderPlatformWaybill(bill *Waybill) bool {
-	return (bill.OrderVendorID == VendorIDWSC && bill.WaybillVendorID == VendorIDDada)
+	return bill.OrderVendorID == bill.WaybillVendorID
 }

 // 订单是否已经有了有效运单
--- a/business/model/store_sku.go
+++ b/business/model/store_sku.go
@@ -46,12 +46,12 @@ 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)"` // 美团外卖没有ID，保存名字
-	WscID  int64  `orm:"column(wsc_id);index"`
+	// WscID  int64  `orm:"column(wsc_id);index"`

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

 func (*StoreSkuCategoryMap) TableUnique() [][]string {
@@ -95,20 +95,20 @@ type StoreSkuBind struct {

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

 	// 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)"`
+	// WscSyncStatus  int8 `orm:"default(2)"`

 	JdPrice   int `json:"jdPrice"`
 	EbaiPrice int `json:"ebaiPrice"`
 	MtwmPrice int `json:"mtwmPrice"`
-	WscPrice  int `json:"wscPrice"`
+	// WscPrice  int `json:"wscPrice"`

 	AutoSaleAt time.Time `orm:"type(datetime);null" json:"autoSaleAt"`
 }