chongtu

business/model/const.go

@@ -53,6 +53,7 @@ var (
 
 		OrderStatusWait4Pay:            "待付款",
 		OrderStatusNew:                 "新订单",
+		OrderStatusWaitAccepted:        "待接单",
 		OrderStatusAccepted:            "待拣货",
 		OrderStatusFinishedPickup:      "待配送",
 		OrderStatusApplyFailedGetGoods: "取货失败待审核",
@@ -247,6 +248,7 @@ const (
 
 	OrderStatusUnknown        = 0
 	OrderStatusWait4Pay       = 2  // 原值-60 下单待支付
+	OrderStatusWaitAccepted   = 3  // 待接单，目前饿百用
 	OrderStatusNew            = 5  // 新订单，实际是已经支付
 	OrderStatusAccepted       = 10 // 已经接单，也即待出库，待拣货
 	OrderStatusFinishedPickup = 15 // 拣货完成

business/model/dao/store_sku.go

@@ -42,10 +42,11 @@ type SkuStoreCatInfo struct {
 	ParentVendorCatID   string `orm:"column(parent_vendor_cat_id)"`
 	ParentCatSyncStatus int8
 
-	StoreCatID   int `orm:"column(store_category_id)"`
-	StoreCatName string
-	StoreCatSeq  int
-	IsSysCat     int
+	StoreCatID         int `orm:"column(store_category_id)"`
+	StoreCatName       string
+	StoreCatSeq        int
+	StoreParentCatName string
+	IsSysCat           int
 }
 
 type StoreSkuSyncInfo struct {
@@ -368,7 +369,8 @@ func GetStoreCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level in
 	sql := `
 	SELECT t4.*, ts.store_category_name store_cat_name, ts.store_category_seq store_cat_seq, ts.id store_category_id,
 	t5.id map_id, t5.%s_id vendor_cat_id, t5.%s_sync_status cat_sync_status,
-	tsp.store_category_name parent_cat_name,
+	t4p.name parent_cat_name,
+	tsp.store_category_name store_parent_cat_name,
 	t5p.id parent_map_id, t5p.%s_id parent_vendor_cat_id, t5p.%s_sync_status parent_cat_sync_status,
 	t1.is_sys_cat
 	FROM store_sku_category_map t5