- GetActStoreSkuVendorInfo返回StoreName（在ActStoreSku2中新增StoreName字段)

business/jxstore/act/act.go

@@ -490,8 +490,8 @@ func (a *ActManager) IsVendorActExist(ctx *jxcontext.Context, vendorActID string
 	return isExist
 }
 
-func QueryActs(ctx *jxcontext.Context, actID int, offset, pageSize int, keyword string, vendorID int, statusList []int, actTypeList []int, storeID, skuID, cityCode int, beginAt, endAt, createdAtFrom, createdAtTo time.Time) (pagedInfo *dao.PagedActListInfo, err error) {
+func QueryActs(ctx *jxcontext.Context, actID int, offset, pageSize int, keyword string, vendorID int, statusList, actTypeList, createTypeList []int, storeID, skuID, cityCode int, beginAt, endAt, createdAtFrom, createdAtTo time.Time) (pagedInfo *dao.PagedActListInfo, err error) {
-	return dao.QueryActs(dao.GetDB(), actID, offset, pageSize, keyword, vendorID, statusList, actTypeList, storeID, skuID, cityCode, beginAt, endAt, createdAtFrom, createdAtTo)
+	return dao.QueryActs(dao.GetDB(), actID, offset, pageSize, keyword, vendorID, statusList, actTypeList, createTypeList, storeID, skuID, cityCode, beginAt, endAt, createdAtFrom, createdAtTo)
 }
 
 func GetActStoreSkuInfo(ctx *jxcontext.Context, actID int, vendorIDs []int) (actStoreSkuList []*model.ActStoreSku2, err error) {
@@ -653,3 +653,25 @@ func SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITask, actID int, vendor
 	}
 	return hint, err
 }
+
+func RefreshPageAct(ctx *jxcontext.Context, vendorIDs []int, createdFrom time.Time, isAsync bool) (hint string, err error) {
+	// db := dao.GetDB()
+	// task := tasksch.NewParallelTask("RefreshPageAct", nil, ctx,
+	// 	func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+	// 		vendorID := batchItemList[0].(int)
+	// 		if handler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformPageActHandler); handler != nil {
+	// 			actList, err2 := handler.GetPageActList(ctx, createdFrom)
+	// 			if err = err2; err != nil {
+	// 				return nil, err
+	// 			}
+	// 			actInfo, err2 := dao.QueryActs(db, 0, 0, -1, "", vendorID, []int{model.ActStatusCreated}, []int{model.ActCreateTypeSpider},
+	// 				nil, 0, 0, 0, utils.DefaultTimeValue, utils.DefaultTimeValue, createdFrom, utils.DefaultTimeValue)
+	// 			if err = err2; err != nil {
+	// 				return nil, err
+	// 			}
+	// 			// var
+	// 		}
+	// 		return retVal, err
+	// 	}, vendorIDs)
+	return hint, err
+}

business/model/act.go

@@ -181,5 +181,7 @@ type ActStoreSku2 struct {
 	ActualActPrice int64  `orm:"" json:"actualActPrice"` // 单品级活动用，创建活动时商品的活动价格
 
 	VendorStoreID string `orm:"column(vendor_store_id)" json:"vendorStoreID"`
+	StoreName     string `json:"storeName"`
+
 	VendorSkuID string `orm:"column(vendor_sku_id)" json:"vendorSkuID"`
 }

business/model/dao/act.go

@@ -88,7 +88,8 @@ func GetActStoreSkuVendorInfo(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
 			t5.ebai_id
 		ELSE
 			''
-	END vendor_sku_id
+	END vendor_sku_id,
+	t6.name store_name
 	FROM act_store_sku t1
 	%s JOIN act_store_sku_map t2 ON t2.bind_id = t1.id AND t2.deleted_at = ?`, leftOrEmpty)
 	sqlParams := []interface{}{utils.DefaultTimeValue}
@@ -99,12 +100,12 @@ func GetActStoreSkuVendorInfo(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
 
 	sql += fmt.Sprintf(`
 	%s JOIN store_map t3 ON t3.store_id = t1.store_id AND t3.vendor_id = t2.vendor_id AND t3.deleted_at = ?
-	JOIN sku t4 ON t4.id = t1.sku_id AND t4.deleted_at = ?
+	JOIN sku t4 ON t4.id = t1.sku_id
 	JOIN store_sku_bind t5 ON t5.sku_id = t1.sku_id AND t5.store_id = t1.store_id AND t5.deleted_at = ?
+	LEFT JOIN store t6 ON t6.id = t1.store_id
 	WHERE t1.act_id = ?
 	`, leftOrEmpty)
 	sqlParams = append(sqlParams,
-		utils.DefaultTimeValue,
 		utils.DefaultTimeValue,
 		utils.DefaultTimeValue,
 		actID,
@@ -137,7 +138,7 @@ func GetActStoreSkuVendorInfo(db *DaoDB, actID int, vendorIDs, storeIDs, skuIDs
 	return actStoreSkuMap, err
 }
 
-func QueryActs(db *DaoDB, actID int, offset, pageSize int, keyword string, vendorID int, statusList, createTypeList []int, actTypeList []int, storeID, skuID, cityCode int, beginAt, endAt, createdAtFrom, createdAtTo time.Time) (pagedInfo *PagedActListInfo, err error) {
+func QueryActs(db *DaoDB, actID int, offset, pageSize int, keyword string, vendorID int, statusList, actTypeList, createTypeList []int, storeID, skuID, cityCode int, beginAt, endAt, createdAtFrom, createdAtTo time.Time) (pagedInfo *PagedActListInfo, err error) {
 	if actID == 0 && utils.IsTimeZero(createdAtFrom) && utils.IsTimeZero(beginAt) {
 		return nil, fmt.Errorf("actID,createdAtFrom和beginAt中，至少要指定一个条件")
 	}