bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

6651 账户消费明细中缺少消费档口字段

This commit is contained in:
gaowdong 2025-07-03 09:14:08 +08:00
parent 0e2c2d8df8
commit 8764dae833
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccConsumeDetailVO.java
View File

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

6
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
View File

@ -312,9 +312,12 @@ 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
@ -323,6 +326,7 @@ 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)