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

This commit is contained in:
邹宗楠
2022-05-13 16:05:19 +08:00
parent 977d11ed9c
commit a91f46207f
49 changed files with 3355 additions and 254 deletions

View File

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