modify

Helius

2021-01-28 4f1a0c89b40a99e7e3b6ec72b42a1b9d6bac971a

 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml

@@ -18,6 +18,7 @@
        <result property="statu" column="STATU"/>
        <result property="zkTotal" column="ZK_TOTAL"/>
        <result property="shopId" column="SHOP_ID"/>
        <result property="companyId" column="company_id"/>
        <result property="vipName" column="VIP_NAME"/>
        <result property="vipNo" column="VIP_NO"/>
        <result property="staffName" column="STAFF_NAME"/>
@@ -504,6 +505,9 @@
            <if test="record.shopId != null">
                and a.shop_id=#{record.shopId}
            </if>
            <if test="record.companyId != null">
                and a.company_id=#{record.companyId}
            </if>
        </where>
        <if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
            order by a.order_time desc
@@ -529,6 +533,9 @@
            </if>
            <if test="record.shopId != null">
                and a.shop_id=#{record.shopId}
            </if>
            <if test="record.companyId != null">
                and a.company_id=#{record.companyId}
            </if>
        </where>
    </select>
@@ -611,4 +618,56 @@
        group by b.su_id
        order by amount desc, b.su_id
    </select>


    <select id="selectErpOrderList" resultType="com.matrix.system.shopXcx.api.vo.ErpOrderDetailVo">
            select
            a.id orderId,
            a.ORDER_NO orderNo,
            a.ORDER_TIME orderTime,
            a.STATU orderStatus,
            a.ZK_TOTAL needPay,
            a.TOTAL - a.ZK_TOTAL discount,
            (a.card_Pay + a.cash_Pay) realPay,
            a.arrears arrears,
            b.su_name staffName,
            d.shop_name as shopName
            from sys_order a
            left join sys_users b on a.STAFF_ID = b.su_id
            left join sys_vip_info c on c.id = a.VIP_ID
            left join sys_shop_info d on d.id=a.shop_id
            <where>
                <if test="queryKey != null and queryKey != ''">
                    and instr(a.order_no, #{queryKey})
                </if>
                <if test="status != null and status != ''">
                    and a.statu = #{status}
                </if>
                <if test="vipId != null">
                    and a.vip_id=#{vipId}
                </if>
            </where>
            order by a.order_time desc
            limit #{offset},#{limit}
    </select>
    <select id="findUserOrderById" resultType="com.matrix.system.shopXcx.api.vo.ErpOrderDetailVo">
         select
            a.id orderId,
            a.ORDER_NO orderNo,
            a.ORDER_TIME orderTime,
            a.STATU orderStatus,
            a.ZK_TOTAL needPay,
            a.TOTAL - a.ZK_TOTAL discount,
            (a.card_Pay + a.cash_Pay) realPay,
            a.arrears arrears,
            b.su_name staffName,
            d.shop_name as shopName
            from sys_order a
            left join sys_users b on a.STAFF_ID = b.su_id
            left join sys_vip_info c on c.id = a.VIP_ID
            left join sys_shop_info d on d.id=a.shop_id
            where a.id=#{orderId}
    </select>


</mapper>