This commit is contained in:
苏尹岚
2021-03-31 16:01:30 +08:00
parent 3cb180a48d
commit 9863f02757

View File

@@ -1070,9 +1070,11 @@ func GetStoreAcctIncomeTotal(db *DaoDB, storeID int, incomeTypes []int, vendorOr
sql += " AND created_at <= ?" sql += " AND created_at <= ?"
sqlParams = append(sqlParams, toTime) sqlParams = append(sqlParams, toTime)
} }
err = GetRow(db, &income, sql, sqlParams) if err = GetRow(db, &income, sql, sqlParams); err == nil && income != nil {
return income.IncomePrice, err 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) { func GetStoreAcctExpend(db *DaoDB, storeID int, expendTypes []int, vendorOrderID string, fromTime, toTime time.Time) (storeAcctExpends []*model.StoreAcctExpend, err error) {
sql := ` sql := `
@@ -1133,9 +1135,11 @@ func GetStoreAcctExpendTotal(db *DaoDB, storeID int, expendTypes []int, vendorOr
sql += " AND created_at <= ?" sql += " AND created_at <= ?"
sqlParams = append(sqlParams, toTime) sqlParams = append(sqlParams, toTime)
} }
err = GetRow(db, &expend, sql, sqlParams) if err = GetRow(db, &expend, sql, sqlParams); err == nil && expend != nil {
return expend.ExpendPrice, err return expend.ExpendPrice, err
} }
return 0, err
}
type GetStoreAcctExpendLastCreateWayBillFeeResult struct { type GetStoreAcctExpendLastCreateWayBillFeeResult struct {
ID int `orm:"column(id)" json:"id"` ID int `orm:"column(id)" json:"id"`