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

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
+//	}
+//}

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)
 			}
 		}