liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-31 16:01:30 +08:00
parent 3cb180a48d
commit 9863f02757
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
business/model/dao/store.go
View File

@@ -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 {