935090232@qq.com
2021-01-31 0764ab507f1b21fb8eadd7bc294ebf28aa592c24
Merge remote-tracking branch 'origin/api' into api
1 files modified
6 ■■■■ changed files
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml 6 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -470,14 +470,14 @@
    <select id="selectVipOrderInfoTotal" resultType="com.matrix.system.hive.bean.SysOrder">
        select
            sum(ZK_TOTAL) zkTotal,
            sum(amount) zkTotal,
            count(1) times,
            MAX(pay_time) payTime,
            GROUP_CONCAT(DISTINCT t2.shop_short_name) shopName
        from sys_order t1
        left join sys_order_item b on t1.id=b.ORDER_ID and goods_id!=5583
        left join sys_order_flow b on t1.id=b.ORDER_ID and pay_method!='储值卡'
        left join sys_shop_info t2 on t1.SHOP_ID=t2.ID
        where VIP_ID=#{vipId} and STATU='已付款';
        where t1.VIP_ID=#{vipId} and STATU='已付款';
    </select>
    <select id="selectApiOrderListInPage" resultType="com.matrix.system.app.vo.OrderDetailVo">