添加淘鲜达

2023-06-28 10:04:08 +08:00
parent 64e4339aeb
commit c0a97b4fad
51 changed files with 2109 additions and 2007 deletions
--- a/business/model/api_config.go
+++ b/business/model/api_config.go
@@ -95,22 +95,22 @@ type VendorInfo struct {

 var (
 	VendorNames = map[int]string{
-		VendorIDJD:     "Jd",
-		VendorIDMTWM:   "Mtwm",
-		VendorIDDD:     "Dd", // 抖店
-		VendorIDELM:    "Elm",
-		VendorIDEBAI:   "Ebai",
-		VendorIDWSC:    "Wsc",
-		VendorIDYB:     "Yb",
-		VendorIDJX:     "Jx",
-		VendorIDJDShop: "Jds",
+		VendorIDJD:           "Jd",
+		VendorIDMTWM:         "Mtwm",
+		VendorIDDD:           "Dd", // 抖店
+		VendorIDELM:          "Elm",
+		VendorIDEBAI:         "Ebai",
+		VendorIDWSC:          "Wsc",
+		VendorIDYB:           "Yb",
+		VendorIDJX:           "Jx",
+		VendorIDJDShop:       "Jds",
+		VendorIDTaoVegetable: "Tao",

 		VendorIDDada:     "Dada",
 		VendorIDMTPS:     "Mtps",
 		VendorIDFengNiao: "Fn",
 		VendorIDSFPS:     "Sfps",
-		//VendorIDDYPS:     "DYPS",
-		VendorIDUUPT: "UUPT",
+		VendorIDUUPT:     "UUPT",

 		VendorIDFeiE:      "Feie",
 		VendorIDXiaoWM:    "XiaoWM",
@@ -132,14 +132,15 @@ var (
 	}

 	VendorChineseNames = map[int]string{
-		VendorIDJD:     "京东到家",
-		VendorIDMTWM:   "美团外卖",
-		VendorIDELM:    "饿了么",
-		VendorIDEBAI:   "饿百新零售",
-		VendorIDYB:     "银豹",
-		VendorIDJDShop: "京东商城",
-		VendorIDWSC:    "微盟微商城",
-		VendorIDJX:     "京西商城",
+		VendorIDJD:           "京东到家",
+		VendorIDMTWM:         "美团外卖",
+		VendorIDELM:          "饿了么",
+		VendorIDEBAI:         "饿百新零售",
+		VendorIDYB:           "银豹",
+		VendorIDJDShop:       "京东商城",
+		VendorIDWSC:          "微盟微商城",
+		VendorIDJX:           "京西商城",
+		VendorIDTaoVegetable: "淘先达",

 		VendorIDDada:     "达达众包",
 		VendorIDMTPS:     "美团配送",
--- a/business/model/const.go
+++ b/business/model/const.go
@@ -26,12 +26,13 @@ var (
 	}

 	ShopChineseNames = map[int]string{
-		VendorIDJD:   globals.StoreName,
-		VendorIDMTWM: globals.StoreNameMtwm,
-		VendorIDELM:  globals.StoreNameEbai,
-		VendorIDEBAI: globals.StoreNameEbai,
-		VendorIDJX:   fmt.Sprintf("%s商城", globals.StoreName),
-		VendorIDWSC:  "微盟微商城",
+		VendorIDJD:           globals.StoreName,
+		VendorIDMTWM:         globals.StoreNameMtwm,
+		VendorIDTaoVegetable: globals.StoreNameTao,
+		VendorIDELM:          globals.StoreNameEbai,
+		VendorIDEBAI:         globals.StoreNameEbai,
+		VendorIDJX:           fmt.Sprintf("%s商城", globals.StoreName),
+		VendorIDWSC:          "微盟微商城",
 	}

 	OrderStatusName = map[int]string{
@@ -149,11 +150,12 @@ var (
 	}

 	MultiStoresVendorMap = map[int]int{
-		VendorIDJD:   1,
-		VendorIDMTWM: 0,
-		VendorIDELM:  0,
-		VendorIDEBAI: 0,
-		VendorIDDD:   0,
+		VendorIDJD:           1,
+		VendorIDMTWM:         0,
+		VendorIDELM:          0,
+		VendorIDEBAI:         0,
+		VendorIDDD:           0,
+		VendorIDTaoVegetable: 0,
 	}

 	ZXCityCodeMap = map[int]string{
@@ -288,6 +290,8 @@ const (
 	OrderStatusEndEnd   = 120

 	AfsOrderStatusWait4Approve      = 155 // 待审核售后单
+	AfsOrderStatusCancelAfs         = 156 // 用户取消售后
+	AfsOrderStatusOnSaleAfs         = 157 // 用户售中取消
 	AfsOrderStatusNew               = 160 // 已审核或不需要审核售后单
 	AfsOrderStatusWait4ReceiveGoods = 165 // 退款退货的，需要商家确认收到货
 	AfsOrderStatusReceivedGoods     = 167 // 已确认收到货
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -510,6 +510,7 @@ func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendo
 		StoreID:        storeID,
 		CategoryID:     categoryID,
 		MtwmSyncStatus: model.SyncFlagNewMask,
+		TaoSyncStatus:  model.SyncFlagNewMask,
 		EbaiSyncStatus: model.SyncFlagNewMask,
 		DdSyncStatus:   model.SyncFlagNewMask,
 		YbSyncStatus:   model.SyncFlagNewMask,
@@ -533,6 +534,9 @@ func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendo
 	} else if vendorID == model.VendorIDDD {
 		storeCat.DdID = vendorCategoryID
 		storeCat.DdSyncStatus = status
+	} else if vendorID == model.VendorIDTaoVegetable {
+		storeCat.TaoID = vendorCategoryID
+		storeCat.TaoSyncStatus = status
 	} else {
 		panic("unsupported vendor")
 	}
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -298,6 +298,7 @@ type StoreSkuExt struct {
 	JdSyncStatus   int8 `orm:"default(2)" json:"jdSyncStatus"`
 	EbaiSyncStatus int8 `orm:"default(2)" json:"ebaiSyncStatus"`
 	MtwmSyncStatus int8 `orm:"default(2)" json:"mtwmSyncStatus"`
+	TaoSyncStatus  int8 `orm:"default(2)" json:"taoSyncStatus"`
 	DdSyncStatus   int8 `orm:"default(2)" json:"ddSyncStatus"`
 	YbSyncStatus   int8 `orm:"default(2)" json:"ybSyncStatus"`
 	JdsSyncStatus  int8 `orm:"default(2)" json:"jdsSyncStatus"` //京东商城
@@ -372,6 +373,7 @@ type StoreSkuAndName struct {
 	StoreSkuSyncInfo
 	JdSyncStatus   int8 `orm:"default(2)"`
 	MtwmSyncStatus int8 `orm:"default(2)"`
+	TaoSyncStatus  int8 `orm:"default(2)"`
 	EbaiSyncStatus int8 `orm:"default(2)"`
 }

@@ -670,9 +672,6 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 		} else {
 			fmtParams = append(fmtParams, "''")
 		}
-		// if globals.IsStoreSkuAct {
-		// 	sql += " OR act.sync_status <> 0"
-		// }
 		sql += ")"
 	} else {
 		sql += " AND t1.deleted_at = ?"
@@ -682,11 +681,6 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 		sql += " AND t1.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
 		sqlParams = append(sqlParams, skuIDs)
 	}
-	// 多门店平台没有成功创建的商品，不直接过滤，让上层同步时报错
-	// if !isSingleStorePF {
-	// 	sql += " AND t2.%s_id <> 0"
-	// 	fmtParams = append(fmtParams, fieldPrefix)
-	// }
 	sql = fmt.Sprintf(sql, fmtParams...)
 	sql += " ORDER BY t1.price"
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
@@ -1433,6 +1427,9 @@ func SetStoreSkuBindVendorPrice(storeSkuBind *model.StoreSkuBind, vendorID int,
 	case model.VendorIDDD:
 		storeSkuBind.DdPrice = vendorPrice
 		storeSkuBind.DdLockTime = pLockTime
+	case model.VendorIDTaoVegetable:
+		storeSkuBind.TaoPrice = vendorPrice
+		storeSkuBind.TaoLockTime = pLockTime
 	}
 }

@@ -1448,6 +1445,8 @@ func GetStoreSkuBindVendorPrice(storeSkuBind *model.StoreSkuBind, vendorID int)
 		vendorPrice = storeSkuBind.JxPrice
 	case model.VendorIDDD:
 		vendorPrice = storeSkuBind.DdPrice
+	case model.VendorIDTaoVegetable:
+		vendorPrice = storeSkuBind.TaoPrice
 	}
 	return vendorPrice
 }
@@ -1460,6 +1459,9 @@ func SetStoreSkuBindSyncStatus(storeSkuBind *model.StoreSkuBind, vendorID int, s
 		storeSkuBind.MtwmSyncStatus = syncStatus
 	case model.VendorIDEBAI:
 		storeSkuBind.EbaiSyncStatus = syncStatus
+	case model.VendorIDTaoVegetable:
+		storeSkuBind.TaoSyncStatus = syncStatus
+
 	}
 }

@@ -1471,6 +1473,8 @@ func GetStoreSkuBindSyncStatus(storeSkuBind *model.StoreSkuBind, vendorID int) (
 		syncStatus = storeSkuBind.MtwmSyncStatus
 	case model.VendorIDEBAI:
 		syncStatus = storeSkuBind.EbaiSyncStatus
+	case model.VendorIDTaoVegetable:
+		syncStatus = storeSkuBind.TaoSyncStatus
 	}
 	return syncStatus
 }
@@ -1481,6 +1485,8 @@ func SetStoreCatMapSyncStatus(storeCatMap *model.StoreSkuCategoryMap, vendorID i
 		storeCatMap.MtwmSyncStatus = syncStatus
 	case model.VendorIDEBAI:
 		storeCatMap.EbaiSyncStatus = syncStatus
+	case model.VendorIDTaoVegetable:
+		storeCatMap.TaoSyncStatus = syncStatus
 	}
 }

--- a/business/model/model.go
+++ b/business/model/model.go
@@ -17,6 +17,7 @@ const (
 	// FieldElmSyncStatus  = "ElmSyncStatus"
 	FieldEbaiSyncStatus = "EbaiSyncStatus"
 	FieldMtwmSyncStatus = "MtwmSyncStatus"
+	FieldTaoSyncStatus  = "TaoSyncStatus"
 	FieldDdSyncStatus   = "DdSyncStatus"
 	// FieldWscSyncStatus  = "WscSyncStatus"
 	FieldYbSyncStatus  = "YbSyncStatus"
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -132,12 +132,11 @@ type SkuCategory struct {
 	EbaiCategoryID  int64 `orm:"column(ebai_category_id)" json:"ebaiCategoryID"`    // 这个是指对应的饿百商品类别
 	MtwmCategoryID  int64 `orm:"column(mtwm_category_id)" json:"mtwmCategoryID"`    // 这个是指对应的美团外卖商品类别
 	DdCategoryID    int64 `orm:"column(dd_category_id)" json:"ddCategoryID"`        // 这个是指对应的抖音外卖商品类别
+	TaoCategoryID   int64 `orm:"column(tao_category_id)" json:"taoCategoryID"`      // 这个是指对应的抖音外卖商品类别
 	YbCategoryID    int64 `orm:"column(yb_category_id)" json:"ybCategoryID"`        // 这个是指对应的银豹商品类别
 	JdsCategoryID   int64 `orm:"column(jds_category_id)" json:"jdsCategoryID"`      // 这个是指对应的京东商城类别
 	GoMeiCategoryID int64 `orm:"column(go_mei_category_id)" json:"goMeiCategoryID"` // 这个是指对应的国美商城类别

-	// ElmCategoryID int64 `orm:"column(elm_category_id)" json:"elmCategoryID"` // 这个是指对应的饿了么商品类别
-	// WscCategoryID int64 `orm:"column(wsc_category_id)" json:"wscCategoryID"` // 这个是指对应的美团外卖商品类别
 	Status int8   `orm:"default(1)" json:"status"` //分类状态，0表示禁用，1表示启用
 	Img    string `orm:"size(512)" json:"img"`     //分类图片

@@ -146,8 +145,6 @@ type SkuCategory struct {
 	IsExdSpec int    `json:"isExdSpec"` //是否是饿鲜达特有新建的分类
 	IsExdSync int    `json:"isExdSync"` //饿鲜达分类是否同步到平台

-	// JdID         int64  `orm:"column(jd_id);index" json:"jdID"` // 这个是指商家自己的商品类别在京东平台上的ID
-	// JdSyncStatus int8   `orm:"default(2)" json:"jdSyncStatus"`
 	IsSync int `json:"isSync"` //是否同步到平台
 }

@@ -210,27 +207,21 @@ func (*SkuName) TableIndex() [][]string {

 type Sku struct {
 	ModelIDCULD
-
-	CategoryID  int     `orm:"column(category_id)" json:"categoryID"` // 特殊类别，一般用于秒杀，特价之类的特殊类别
-	NameID      int     `orm:"column(name_id)" json:"nameID"`         // todo 这个索引应该要求唯一
-	SkuIndex    int     `json:"-"`
-	Comment     string  `orm:"size(255)" json:"comment"`
-	SpecQuality float32 `json:"specQuality"`
-	SpecUnit    string  `orm:"size(8)" json:"specUnit"` // 质量或容量
-	Weight      int     `json:"weight"`                 // 重量/质量，单位为克，当相应的SkuName的SpecUnit为g或kg时，必须等于SpecQuality
-	Status      int     `json:"status"`
-	Seq         int     `json:"seq"`
-
-	ExdSkuID           string `orm:"column(exd_sku_id)" json:"exdSkuID"` //饿鲜达商品ID
-	ExdCategoryThirdID int    `orm:"column(exd_category_third_id)" json:"exdCategoryThirdID"`
-	EclpID             string `orm:"column(eclp_id)" json:"eclpID"` //eclp物料商品ID
-	MinOrderCount      int    `json:"minOrderCount"`                //最少起购份数，美团用
-	LadderBoxNum       int    `json:"ladderBoxNum"`                 //包装费x件  ，美团用
-	LadderBoxPrice     int    `json:"ladderBoxPrice"`               //包装费y元  ，美团用
-	// JdID         int64   `orm:"column(jd_id);null;index" json:"jdID"`
-	// JdSyncStatus int8    `orm:"default(2)" json:"jdSyncStatus"`
-
-	// LinkID int `orm:"column(link_id);null;index" json:"linkID"`
+	CategoryID         int     `orm:"column(category_id)" json:"categoryID"` // 特殊类别，一般用于秒杀，特价之类的特殊类别
+	NameID             int     `orm:"column(name_id)" json:"nameID"`         // todo 这个索引应该要求唯一
+	SkuIndex           int     `json:"-"`
+	Comment            string  `orm:"size(255)" json:"comment"`
+	SpecQuality        float32 `json:"specQuality"`
+	SpecUnit           string  `orm:"size(8)" json:"specUnit"` // 质量或容量
+	Weight             int     `json:"weight"`                 // 重量/质量，单位为克，当相应的SkuName的SpecUnit为g或kg时，必须等于SpecQuality
+	Status             int     `json:"status"`
+	Seq                int     `json:"seq"`
+	ExdSkuID           string  `orm:"column(exd_sku_id)" json:"exdSkuID"` //饿鲜达商品ID
+	ExdCategoryThirdID int     `orm:"column(exd_category_third_id)" json:"exdCategoryThirdID"`
+	EclpID             string  `orm:"column(eclp_id)" json:"eclpID"` //eclp物料商品ID
+	MinOrderCount      int     `json:"minOrderCount"`                //最少起购份数，美团用
+	LadderBoxNum       int     `json:"ladderBoxNum"`                 //包装费x件  ，美团用
+	LadderBoxPrice     int     `json:"ladderBoxPrice"`               //包装费y元  ，美团用
 }

 type SkuAndName struct {
@@ -291,6 +282,7 @@ type SkuNameExt struct {
 	JdsCategoryID  string `json:"jdsCategoryID"`
 	EbaiCategoryID string `json:"ebaiCategoryID"`
 	MtwmCategoryID string `json:"mtwmCategoryID"`
+	TaoCategoryID  string `json:"TaoCategoryID"`
 	DdCategoryID   string `json:"ddCategoryID"`
 }

--- a/business/model/store_sku.go
+++ b/business/model/store_sku.go
@@ -55,21 +55,19 @@ type StoreSkuCategoryMap struct {
 	StoreID    int `orm:"column(store_id)"`
 	CategoryID int `orm:"column(category_id)"`

-	// ElmID  int64  `orm:"column(elm_id);index"`
 	EbaiID int64  `orm:"column(ebai_id);index"`
 	MtwmID string `orm:"column(mtwm_id);index;size(16)"`
+	TaoID  string `orm:"column(tao_id);index;size(16)"`
 	DdID   string `orm:"column(dd_id);index;size(16)"`
-	// WscID  int64  `orm:"column(wsc_id);index"`
+	YbID   int64  `orm:"column(yb_id);index"`
+	JdsID  int64  `orm:"column(jds_id);index"`

-	// ElmSyncStatus  int8 `orm:"default(2)"`
 	EbaiSyncStatus int8 `orm:"default(2)"`
 	MtwmSyncStatus int8 `orm:"default(2)"`
+	TaoSyncStatus  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)"`
-	JdsID         int64 `orm:"column(jds_id);index"`
-	JdsSyncStatus int8  `orm:"default(2)"`
+	YbSyncStatus   int8 `orm:"default(2)"`
+	JdsSyncStatus  int8 `orm:"default(2)"`
 }

 func (*StoreSkuCategoryMap) TableUnique() [][]string {
@@ -113,31 +111,28 @@ type StoreSkuBind struct {
 	Status     int

 	// ElmID  int64 `orm:"column(elm_id);index"`
-	MtwmID    int64 `orm:"column(mtwm_id);index"`
-	EbaiID    int64 `orm:"column(ebai_id);index"`
-	YbID      int64 `orm:"column(yb_id);index"`
-	JdsID     int64 `orm:"column(jds_id);index"`
-	JdsWareID int64 `orm:"column(jds_ware_id)"`
-	// GmID      string `orm:"column(gm_id)"`
-	// WscID  int64 `orm:"column(wsc_id);index"`  // 表示微盟skuId
-	// WscID2 int64 `orm:"column(wsc_id2);index"` // 表示微盟goodsId
+	MtwmID          int64  `orm:"column(mtwm_id);index"`
+	TaoID           int64  `orm:"column(tao_id);index"`
+	EbaiID          int64  `orm:"column(ebai_id);index"`
+	YbID            int64  `orm:"column(yb_id);index"`
+	JdsID           int64  `orm:"column(jds_id);index"`
+	JdsWareID       int64  `orm:"column(jds_ware_id)"`
 	DdID            int64  `orm:"column(dd_id);index"`        // 子品主商品id
 	VendorSonSkuID  string `orm:"column(vendor_son_sku_id)"`  // 子商品skuid
 	VendorSkuAttrId string `orm:"column(vendor_sku_attr_id)"` // 抖音需要,主品skuid
 	VendorMainId    string `orm:"column(vendor_Main_id)"`     // 抖音需要,商品主id

-	// ElmSyncStatus  int8 `orm:"default(2)"`
 	JdSyncStatus   int8 `orm:"default(2)"`
 	MtwmSyncStatus int8 `orm:"default(2)"`
+	TaoSyncStatus  int8 `orm:"default(2)"`
 	DdSyncStatus   int8 `orm:"default(2)"`
 	EbaiSyncStatus int8 `orm:"default(2)"`
 	YbSyncStatus   int8 `orm:"default(2)"`
 	JdsSyncStatus  int8 `orm:"default(2)"` //京东商城
-	//GmSyncStatus   int8 `orm:"default(2)"` //京东商城
-	// WscSyncStatus  int8 `orm:"default(2)"`

 	JdPrice   int `json:"jdPrice"`
 	MtwmPrice int `json:"mtwmPrice"`
+	TaoPrice  int `json:"taoPrice"`
 	EbaiPrice int `json:"ebaiPrice"`
 	JxPrice   int `json:"jxPrice"`
 	DdPrice   int `json:"ddPrice"`
@@ -148,6 +143,7 @@ type StoreSkuBind struct {
 	JdLockTime   *time.Time `orm:"null" json:"jdLockTime"`
 	JdsLockTime  *time.Time `orm:"null" json:"jdsLockTime"`
 	MtwmLockTime *time.Time `orm:"null" json:"mtwmLockTime"`
+	TaoLockTime  *time.Time `orm:"null" json:"taoLockTime"`
 	EbaiLockTime *time.Time `orm:"null" json:"ebaiLockTime"`
 	JxLockTime   *time.Time `orm:"null" json:"jxLockTime"`
 	YbLockTime   *time.Time `orm:"null" json:"ybLockTime"`