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

aa

Browse Source
This commit is contained in:
suyl
2021-08-18 13:46:04 +08:00
parent 22f0f3792d
commit 9846686dbe
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dao/sim_dao.go
View File

@@ -122,11 +122,11 @@ func GetChargeInfo(db *sqlx.DB, appID int, printNo string, iccID, beginDate, end
sqlOhter := `
FROM pay_order a
JOIN apps b ON b.user_id = a.user_id AND b.id = ? AND b.deleted_at = ?
LEFT JOIN printer c ON c.icc_id = a.thing_id AND c.deleted_at = ?
LEFT JOIN sim_flow_income d ON d.order_id = a.order_id
JOIN printer c ON c.icc_id = a.thing_id AND c.deleted_at = ?
JOIN sim_flow_income d ON d.order_id = a.order_id AND d.income_type = ?
WHERE 1 = 1
`
sqlParams := []interface{}{appID, utils.DefaultTimeValue, utils.DefaultTimeValue}
sqlParams := []interface{}{appID, utils.DefaultTimeValue, utils.DefaultTimeValue, model.FlowIncomeTypeUser}
if printNo != "" {
sqlOhter += " AND c.print_no = ?"
sqlParams = append(sqlParams, printNo)