usage: return

http/handler/feed/feed_formula.go

@@ -292,14 +292,10 @@ func Usage(c *gin.Context) {
 		return
 	}
 
-	if err := middleware.BackendOperation(c).OpsService.FeedFormulaUsage(c, &req); err != nil {
+	if res, err := middleware.BackendOperation(c).OpsService.FeedFormulaUsage(c, &req); err != nil {
 		apierr.ClassifiedAbort(c, err)
 		return
+	} else {
+		ginutil.JSONResp(c, res)
 	}
-
-	ginutil.JSONResp(c, &operationPb.CommonOK{
-		Code: http.StatusOK,
-		Msg:  "ok",
-		Data: &operationPb.Success{Success: true},
-	})
 }

module/backend/feed_service.go

@@ -393,13 +393,13 @@ func (s *StoreEntry) DistributeFeedFormula(ctx context.Context, req *operationPb
 }
 
 // FeedFormulaUsage 配方使用概况
-func (s *StoreEntry) FeedFormulaUsage(ctx context.Context, req *operationPb.FeedFormulaUsageRequest) error {
+func (s *StoreEntry) FeedFormulaUsage(ctx context.Context, req *operationPb.FeedFormulaUsageRequest) (*operationPb.FeedFormulaUsageResponse, error) {
 	feedFormulaDistributeLogList := make([]*model.FeedFormulaDistributeLog, 0)
 	if err := s.DB.Model(new(model.FeedFormulaDistributeLog)).
 		Where("feed_formula_id = ?", req.FeedFormulaId).
 		Where("is_show = ?", operationPb.IsShow_OK).Group("pasture_id").
 		Find(&feedFormulaDistributeLogList).Error; err != nil {
-		return xerr.WithStack(err)
+		return nil, xerr.WithStack(err)
 	}
 
 	res := &operationPb.FeedFormulaUsageResponse{
@@ -449,7 +449,7 @@ func (s *StoreEntry) FeedFormulaUsage(ctx context.Context, req *operationPb.Feed
 	}
 
 	wg.Wait()
-	return nil
+	return res, nil
 }
 
 func (s *StoreEntry) PastureFeedFormulaIsModify(ctx context.Context, feedFormulaId int32, isModify operationPb.IsShow_Kind) {

module/backend/interface.go

@@ -97,7 +97,7 @@ type PastureService interface {
 	ExcelTemplateFeedFormula(ctx context.Context) (*bytes.Buffer, error)
 	EncodeNumber(ctx context.Context) string
 	DistributeFeedFormula(ctx context.Context, req *operationPb.DistributeFeedFormulaRequest) error
-	FeedFormulaUsage(ctx context.Context, req *operationPb.FeedFormulaUsageRequest) error
+	FeedFormulaUsage(ctx context.Context, req *operationPb.FeedFormulaUsageRequest) (*operationPb.FeedFormulaUsageResponse, error)
 }
 
 type SystemService interface {