Compare commits

..

No commits in common. "f74b79ed8bc2fa5648020201c986056e4f87feef" and "b979ccbc9746d220c1ddfb01b01eab4d2fbdaddf" have entirely different histories.

2 changed files with 1 additions and 10 deletions

View File

@ -64,9 +64,4 @@ public class AccConsumeDetailVO implements Serializable {
* 来源类型 * 来源类型
*/ */
private Integer sourceType; private Integer sourceType;
/**
* 订单编号
*/
private String stallName;
} }

View File

@ -312,12 +312,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
atwd.wallet_type, atwd.wallet_type,
atwd.amount, atwd.amount,
atwd.wallet_bal, atwd.wallet_bal,
oi.source_type, oi.source_type
bs.stall_name
from from
order_info oi order_info oi
left join basic_stall bs on
oi.stall_id = bs.stall_id
inner join account_trade at2 on inner join account_trade at2 on
oi.order_id = at2.order_no oi.order_id = at2.order_no
inner join account_trade_wallet_detail atwd on inner join account_trade_wallet_detail atwd on
@ -326,7 +323,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
oi.user_id = su.user_id oi.user_id = su.user_id
inner join sys_dept sd on inner join sys_dept sd on
su.dept_id = sd.dept_id su.dept_id = sd.dept_id
where where
atwd.trade_type in (110, 120, 130) atwd.trade_type in (110, 120, 130)
and oi.order_state in (1, 2, 3) and oi.order_state in (1, 2, 3)