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

business/model/dao/act.go

@@ -419,6 +419,61 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, actType
 	return actStoreSkuList, err
 }
 
+func GetEffectiveActStoreSkuInfo2(db *DaoDB, actID int, vendorIDs []int, actTypes []int, storeIDs, skuIDs []int, beginAt, endAt time.Time) (actStoreSkuList []*model.ActStoreSku2, err error) {
+	if utils.IsTimeZero(beginAt) {
+		return nil, fmt.Errorf("GeActStoreSkuInfo必须指定活动开始时间")
+	}
+	if utils.IsTimeZero(endAt) {
+		endAt = beginAt
+	}
+	sql := `
+	SELECT
+	t1.type,
+	t2.*,
+	t3.actual_act_price, t3.sync_status, t3.vendor_price, t3.vendor_id
+	FROM act t1
+	JOIN act_store_sku t2 ON t2.act_id = t1.id AND t2.deleted_at = ?
+	JOIN act_store_sku_map t3 ON t3.bind_id = t2.id AND t3.act_id = t1.id AND (t3.sync_status & ? = 0 OR t1.type = ?)
+	JOIN act_map t4 ON t4.act_id = t1.id AND t4.vendor_id = t3.vendor_id AND t4.deleted_at = ? AND (t4.sync_status & ? = 0 OR t1.type = ?)
+	WHERE t1.deleted_at = ? AND t1.status = ? AND NOT (t1.begin_at > ? OR t1.end_at < ?) AND t1.create_type = ?`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+
+		model.SyncFlagNewMask,
+		model.ActSkuFake,
+
+		utils.DefaultTimeValue, model.SyncFlagNewMask, model.ActSkuFake,
+		utils.DefaultTimeValue, model.ActStatusCreated, endAt, beginAt, model.ActCreateTypeAPI,
+	}
+	if len(vendorIDs) > 0 {
+		sql += " AND (t1.vendor_mask & ?) <> 0 AND t3.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
+		sqlParams = append(sqlParams, model.GetVendorMask(vendorIDs...), vendorIDs)
+	}
+	if actID > 0 {
+		sql += " AND t1.id = ?"
+		sqlParams = append(sqlParams, actID)
+	}
+	if len(actTypes) > 0 {
+		sql += " AND t1.type IN (" + GenQuestionMarks(len(actTypes)) + ")"
+		sqlParams = append(sqlParams, actTypes)
+	}
+	if len(storeIDs) > 0 {
+		sql += " AND t2.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
+		sqlParams = append(sqlParams, storeIDs)
+	}
+	if len(skuIDs) > 0 {
+		sql += " AND t2.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
+		sqlParams = append(sqlParams, skuIDs)
+	}
+	if globals.IsStoreSkuAct {
+		sql += " AND t1.is_special = 0"
+	}
+	// globals.SugarLogger.Debug(sql)
+	// globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false))
+	err = GetRows(db, &actStoreSkuList, sql, sqlParams...)
+	return actStoreSkuList, err
+}
+
 func UpdateActStatusByTime(db *DaoDB, refTime time.Time) (num int64, err error) {
 	sql := `
 	UPDATE act t1