Merge remote-tracking branch 'origin/mark' into don

business/model/dao/act.go

@@ -358,6 +358,7 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, storeIDs
 	}
 	sql := `
 	SELECT
+	t1.type,
 	t2.*,
 	t3.actual_act_price, t3.sync_status, t3.vendor_price, t3.vendor_id
 	FROM act t1

business/model/dao/store.go

@@ -91,7 +91,21 @@ func GetStoreDetail(db *DaoDB, storeID, vendorID int) (storeDetail *StoreDetail,
 }
 
 func GetStoreDetailByVendorStoreID(db *DaoDB, vendorStoreID string, vendorID int) (storeDetail *StoreDetail, err error) {
-	return getStoreDetail(db, 0, vendorID, vendorStoreID)
+	if vendorID != model.VendorIDJX {
+		return getStoreDetail(db, 0, vendorID, vendorStoreID)
+	}
+	store := &model.Store{}
+	store.ID = int(utils.Str2Int64WithDefault(vendorStoreID, 0))
+	if err = GetEntity(db, store); err == nil {
+		// todo 还要补全其它参数
+		storeDetail = &StoreDetail{
+			Store:           *store,
+			VendorStoreID:   vendorStoreID,
+			VendorStatus:    store.Status,
+			PricePercentage: 100,
+		}
+	}
+	return storeDetail, err
 }
 
 func GetPossibleStoresByPlaceName(db *DaoDB, cityName, provinceName string) (storeList []*StoreDetail, err error) {