Merge remote-tracking branch 'origin/master'

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

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

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

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