- GetStoreAbnormalSkuCount添加参数fromStatus和toStatus

business/jxstore/cms/store_sku.go

@@ -418,7 +418,7 @@ func GetStoresSkus(ctx *jxcontext.Context, storeIDs []int, isFocus bool, keyword
 	return skuNamesInfo, err
 }
 
-func GetStoreAbnormalSkuCount(ctx *jxcontext.Context, storeID, syncStatus int, isBySku bool) (count int, err error) {
+func GetStoreAbnormalSkuCount(ctx *jxcontext.Context, storeID, syncStatus int, isBySku bool, params map[string]interface{}) (count int, err error) {
 	db := dao.GetDB()
 	sql := `
 	SELECT COUNT(*) ct`
@@ -434,10 +434,6 @@ func GetStoreAbnormalSkuCount(ctx *jxcontext.Context, storeID, syncStatus int, i
 		WHERE t1.deleted_at = ? AND t1.store_id = ? AND
 		(t1.jd_sync_status & ? <> 0 OR t1.ebai_sync_status & ? <> 0 OR t1.mtwm_sync_status & ? <> 0) AND
 		((t2.status = ? AND t3.status = ?) OR t1.status = ?)`
-	if !isBySku {
-		sql += `
-		) t1`
-	}
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
 		utils.DefaultTimeValue,
@@ -450,6 +446,20 @@ func GetStoreAbnormalSkuCount(ctx *jxcontext.Context, storeID, syncStatus int, i
 		model.SkuStatusNormal,
 		model.SkuStatusNormal,
 	}
+	if params["fromStatus"] != nil {
+		fromStatus := params["fromStatus"].(int)
+		toStatus := fromStatus
+		if params["toStatus"] != nil {
+			toStatus = params["toStatus"].(int)
+		}
+		sql += " AND t1.status >= ? AND t1.status <= ?"
+		sqlParams = append(sqlParams, fromStatus, toStatus)
+	}
+
+	if !isBySku {
+		sql += `
+		) t1`
+	}
 	err = dao.GetRow(db, &count, sql, sqlParams...)
 	return count, err
 }

controllers/cms_store_sku.go

@@ -98,12 +98,14 @@ func (c *StoreSkuController) GetStoresSkus() {
 // @Param	storeID			query		int		true	"门店ID"
 // @Param	syncStatus		query		int		true	"同步标志掩码"
 // @Param	isBySku			query		bool	false	"是否按SKU分拆"
+// @Param	fromStatus		query		int		false	"查询起始状态（0：不可售，1：可售）"
+// @Param	toStatus		query		int		false	"查询结束状态（0：不可售，1：可售）"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /GetStoreAbnormalSkuCount [get]
 func (c *StoreSkuController) GetStoreAbnormalSkuCount() {
 	c.callGetStoreAbnormalSkuCount(func(params *tStoreSkuGetStoreAbnormalSkuCountParams) (retVal interface{}, errCode string, err error) {
-		retVal, err = cms.GetStoreAbnormalSkuCount(params.Ctx, params.StoreID, params.SyncStatus, params.IsBySku)
+		retVal, err = cms.GetStoreAbnormalSkuCount(params.Ctx, params.StoreID, params.SyncStatus, params.IsBySku, params.MapData)
 		return retVal, "", err
 	})
 }