|
@@ -812,6 +812,7 @@ type MemberPayInfo struct {
|
|
|
func (r *MemberPayInfo) calc() {}
|
|
func (r *MemberPayInfo) calc() {}
|
|
|
|
|
|
|
|
func (r *MemberPayInfo) buildSql() string {
|
|
func (r *MemberPayInfo) buildSql() string {
|
|
|
|
|
+ // 使用枚举的param1字段用于排序
|
|
|
var sqlId utils.SQLVal = `
|
|
var sqlId utils.SQLVal = `
|
|
|
select t.userid,
|
|
select t.userid,
|
|
|
t.paymodel,
|
|
t.paymodel,
|
|
@@ -819,8 +820,9 @@ func (r *MemberPayInfo) buildSql() string {
|
|
|
t.payqrcode
|
|
t.payqrcode
|
|
|
from userpayinfo t
|
|
from userpayinfo t
|
|
|
inner join useraccount ua on t.userid = ua.memberuserid
|
|
inner join useraccount ua on t.userid = ua.memberuserid
|
|
|
|
|
+ left join enumdicitem en on en.enumdiccode='paymodel' and en.enumitemname = t.paymodel
|
|
|
where ua.userid = %v
|
|
where ua.userid = %v
|
|
|
- order by t.paymodel desc
|
|
|
|
|
|
|
+ order by en.param1, t.paymodel desc
|
|
|
`
|
|
`
|
|
|
sqlId.FormatParam(r.USERID)
|
|
sqlId.FormatParam(r.USERID)
|
|
|
return sqlId.String()
|
|
return sqlId.String()
|
