|
|
@@ -134,9 +134,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</select>
|
|
|
|
|
|
<select id="querySalesPageList" resultType="com.ruoyi.businessDayBill.domain.vo.BusinessSalesDetailVo">
|
|
|
- select * from (select order_id,order_no,business_id,business_name, business_income,payment_time,order_type from tb_shop_order
|
|
|
+ select * from (select order_id,order_no,business_id,business_name, business_income,actual_payment as order_amount,payment_time,order_type from tb_shop_order
|
|
|
union all
|
|
|
- select order_id,order_no,business_id,business_name, business_income,pay_time as payment_time,order_type from tb_online_order) as o
|
|
|
+ select order_id,order_no,business_id,business_name, business_income,order_amount,pay_time as payment_time,order_type from tb_online_order) as o
|
|
|
<where>
|
|
|
<if test="bo.businessId!=null">
|
|
|
and business_id = #{bo.businessId}
|