添加抖音授权登录，国美测试接口，修改运单重复骑手，添加推送骑手信息

2022-05-13 16:05:19 +08:00
parent 977d11ed9c
commit a91f46207f
49 changed files with 3355 additions and 254 deletions
--- a/business/model/api_config.go
+++ b/business/model/api_config.go
@@ -19,7 +19,8 @@ const (
 	VendorIDJDShop        = 5  //京东商城
 	VendorIDWSC           = 11 // 微盟微商城
 	VendorIDPurchaseEnd   = 11
-	VendorIDJX            = 9 // 这是一个假的京西VendorID
+	VendorIDJX            = 9  // 这是一个假的京西VendorID
+	VendorGoMei           = 12 // 国美

 	VendorIDWXPay = 51 // 微信支付

@@ -87,6 +88,7 @@ var (

 		VendorIDQiNiuCloud: "Qiniu",
 		VendorIDJDWL:       "Jdwl",
+		VendorGoMei:        "GoMei",
 	}

 	VendorTypeName = map[int]string{
@@ -127,6 +129,7 @@ var (
 		VendorIDAutonavi:   "高德导航",
 		VendorIDQiNiuCloud: "七牛云",
 		VendorIDShowAPI:    "万维易源",
+		VendorGoMei:        "国美",
 	}

 	VendorInfoMap = map[int]*VendorInfo{
--- a/business/model/const.go
+++ b/business/model/const.go
@@ -425,9 +425,11 @@ const (
 )

 const (
-	YES      = 1 //通用
-	NO       = 0
-	DISABLED = -1
+	YES         = 1 //通用
+	NO          = 0
+	DISABLED    = -1
+	B2BTag      = "B2B"
+	B2BNumberId = 10
 )

 func IsPurchaseVendorExist(vendorID int) bool {
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -1486,3 +1486,29 @@ func InsertBrandCategories(db *DaoDB, userName string, brandID int) (err error)
 	_, err = ExecuteSQL(db, sql, sqlParams)
 	return err
 }
+//
+//// 根据国美门店id获取门店名称
+//func GetStoreByVendorId(db *DaoDB, vendorOrderID string, vendorCode int) (storeMaps []*model.StoreCourierMap, err error) {
+//	if vendorOrderID == "" || vendorCode == 0 {
+//		return nil, err
+//	}
+//	sql := `
+//	SELECT t1.*
+//	FROM store_courier_map t1
+//	LEFT JOIN store t2 ON t1.store_id = t2.id AND t1.deleted_at = ?
+//	WHERE t1.deleted_at = ?  AND t2.
+//	`
+//	sqlParams := []interface{}{
+//		utils.DefaultTimeValue,
+//	}
+//	if len(vendorOrderID) > 0 {
+//		sql += " AND t1.vendor_store_id  = ? "
+//		sqlParams = append(sqlParams, vendorOrderID)
+//	}
+//
+//	sql += " AND t1.audit_status IN (" + GenQuestionMarks(len(auditStatuss)) + ")"
+//	sqlParams = append(sqlParams, auditStatuss)
+//	if err = GetRows(db, &courierStoreList, sql, sqlParams...); err == nil {
+//		return courierStoreList, nil
+//	}
+//}
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -73,8 +73,8 @@ type StoreSkuSyncInfo struct {
 	Stock     int

 	// 平台相关的store sku信息
-	StoreSkuStatus int
-	SkuSyncStatus  int8
+	StoreSkuStatus int       // 库存状态
+	SkuSyncStatus  int8      // 锁定状态
 	VendorSkuID    string    `orm:"column(vendor_sku_id)"`
 	JdsWareID      int64     `orm:"column(jds_ware_id)" json:"jdsWareID"`
 	BindDeletedAt  time.Time `orm:"type(datetime)" json:"bindDeletedAt"`
@@ -128,7 +128,7 @@ type StoreSkuSyncInfo struct {
 	VendorCatID       string `orm:"column(vendor_cat_id)"`
 	SkuVendorMapCatID string `orm:"column(sku_vendor_map_cat_id)"`

-	VendorPrice int64
+	VendorPrice int64 // 平台价格
 	LockTime    *time.Time

 	MergedStatus    int
@@ -476,7 +476,7 @@ func GetStoreCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level in
 	result := make([]*SkuStoreCatInfo, 0, 0)
 	for _, v := range cats {
 		if v.BrandId == 1 { // 京西菜市才做此判断
-			if !strings.HasPrefix(v.ParentCatName, "B2B") {
+			if !strings.Contains(v.ParentCatName, model.B2BTag) {
 				result = append(result, v)
 			}
 		}
--- a/business/model/order.go
+++ b/business/model/order.go
@@ -548,7 +548,7 @@ func IsOrderHaveWaybill(order *GoodsOrder) bool {

 // 订单是否有自己平台的有效运单
 func IsOrderHaveOwnWaybill(order *GoodsOrder) bool {
-	return order.VendorID == order.WaybillVendorID && order.VendorWaybillID != ""
+		return order.VendorID == order.WaybillVendorID && order.VendorWaybillID != ""
 }

 // 订单的初始配送方式是否是门店自配送
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -127,11 +127,12 @@ type SkuCategory struct {
 	Type     int8   `json:"type"` // 类别类型，即是普通类别还是特殊用于做活动的类别
 	Seq      int    `json:"seq"`

-	JdCategoryID   int64 `orm:"column(jd_category_id)" json:"jdCategoryID"`     // 这个是指对应的京东商品类别
-	EbaiCategoryID int64 `orm:"column(ebai_category_id)" json:"ebaiCategoryID"` // 这个是指对应的饿百商品类别
-	MtwmCategoryID int64 `orm:"column(mtwm_category_id)" json:"mtwmCategoryID"` // 这个是指对应的美团外卖商品类别
-	YbCategoryID   int64 `orm:"column(yb_category_id)" json:"ybCategoryID"`     // 这个是指对应的银豹商品类别
-	JdsCategoryID  int64 `orm:"column(jds_category_id)" json:"jdsCategoryID"`   // 这个是指对应的京东商城类别
+	JdCategoryID    int64 `orm:"column(jd_category_id)" json:"jdCategoryID"`        // 这个是指对应的京东商品类别
+	EbaiCategoryID  int64 `orm:"column(ebai_category_id)" json:"ebaiCategoryID"`    // 这个是指对应的饿百商品类别
+	MtwmCategoryID  int64 `orm:"column(mtwm_category_id)" json:"mtwmCategoryID"`    // 这个是指对应的美团外卖商品类别
+	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"` // 这个是指对应的美团外卖商品类别
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -35,7 +35,8 @@ const (
 	BrandOpenSMS   = 8  //短信
 	BrandOpenVoice = 16 //语音

-	BrandBalanceLimit = 1000
+	BrandBalanceLimit   = 1000
+	GoMeiMaxCountNumber = 50 // 国美最大数据返回条数
 )

 const (
@@ -86,11 +87,13 @@ const (
 )

 const (
-	ExdStoreName            = "饿鲜达"
-	MatterStoreID           = 666666
-	JdShopMainVendorStoreID = "9999999"
+	ExdStoreName               = "饿鲜达"
+	MatterStoreID              = 666666
+	JdShopMainVendorStoreID    = "9999999"          // 三方平台总商户id
+	GoMeiShopMainVendorStoreID = "GMJ-MS-XOMRF-1J1" // 三方平台总商户id
 	// JdShopMainVendorStoreID2 = "9999999"
-	JdShopMainStoreID = 100000
+	JdShopMainStoreID    = 100000 // 本地商户门店地
+	GoMeiShopMainStoreID = 200000 // 本店商户门店id
 	// JdShopMainStoreID2       = 100000

 	VendorStoreTel = "18011597879"
--- a/business/model/store_sku.go
+++ b/business/model/store_sku.go
@@ -99,11 +99,12 @@ 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)"`
+	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

@@ -113,6 +114,7 @@ type StoreSkuBind struct {
 	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"`
@@ -121,6 +123,7 @@ type StoreSkuBind struct {
 	JxPrice   int `json:"jxPrice"`
 	YbPrice   int `json:"ybPrice"`
 	JdsPrice  int `json:"jdsPrice"`
+	GmPrice   int `json:"gmPrice"`

 	JdLockTime   *time.Time `orm:"null" json:"jdLockTime"`
 	JdsLockTime  *time.Time `orm:"null" json:"jdsLockTime"`
@@ -128,6 +131,7 @@ type StoreSkuBind struct {
 	EbaiLockTime *time.Time `orm:"null" json:"ebaiLockTime"`
 	JxLockTime   *time.Time `orm:"null" json:"jxLockTime"`
 	YbLockTime   *time.Time `orm:"null" json:"ybLockTime"`
+	GmLockTime   *time.Time `orm:"null" json:"gmLockTime"`

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