From 9863f02757d6ffdac71d62e8ed464a3ac029701e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 31 Mar 2021 16:01:30 +0800 Subject: [PATCH] aa --- business/model/dao/store.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/business/model/dao/store.go b/business/model/dao/store.go index d68817ce6..120be8913 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -1070,8 +1070,10 @@ func GetStoreAcctIncomeTotal(db *DaoDB, storeID int, incomeTypes []int, vendorOr sql += " AND created_at <= ?" sqlParams = append(sqlParams, toTime) } - err = GetRow(db, &income, sql, sqlParams) - return income.IncomePrice, err + if err = GetRow(db, &income, sql, sqlParams); err == nil && income != nil { + return income.IncomePrice, err + } + return 0, err } func GetStoreAcctExpend(db *DaoDB, storeID int, expendTypes []int, vendorOrderID string, fromTime, toTime time.Time) (storeAcctExpends []*model.StoreAcctExpend, err error) { @@ -1133,8 +1135,10 @@ func GetStoreAcctExpendTotal(db *DaoDB, storeID int, expendTypes []int, vendorOr sql += " AND created_at <= ?" sqlParams = append(sqlParams, toTime) } - err = GetRow(db, &expend, sql, sqlParams) - return expend.ExpendPrice, err + if err = GetRow(db, &expend, sql, sqlParams); err == nil && expend != nil { + return expend.ExpendPrice, err + } + return 0, err } type GetStoreAcctExpendLastCreateWayBillFeeResult struct {