|
|
@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
oo.divide_company_money,
|
|
|
oo.divide_seller_money,
|
|
|
oo.brokerage,
|
|
|
+ oo.order_price,
|
|
|
oo.order_from,
|
|
|
r.role_name,
|
|
|
r.role_id
|
|
|
@@ -41,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
tdo.order_type = 1
|
|
|
AND tdo.divide_log_id = #{divideLogId}
|
|
|
<if test="startPrice != null and startPrice != ''">
|
|
|
- AND (tdo.order_price - tdo.brokerage) BETWEEN #{startPrice} and #{endPrice}
|
|
|
+ AND (oo.order_price - oo.brokerage) BETWEEN #{startPrice} and #{endPrice}
|
|
|
</if>
|
|
|
</select>
|
|
|
|
|
|
@@ -51,7 +52,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
st.tenant_name,
|
|
|
dl.pay_status,
|
|
|
dl.divide_type,
|
|
|
- oo.remark,
|
|
|
+ oo.remark,
|
|
|
+ oo.order_price,
|
|
|
+ oo.brokerage,
|
|
|
tor.divide_money,
|
|
|
tor.refund_time as order_time
|
|
|
FROM
|
|
|
@@ -64,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
tdo.order_type = 2
|
|
|
AND tdo.divide_log_id = #{divideLogId}
|
|
|
<if test="startPrice != null and startPrice != ''">
|
|
|
- AND (tdo.order_price - tdo.brokerage) BETWEEN #{startPrice} and #{endPrice}
|
|
|
+ AND (oo.order_price - oo.brokerage) BETWEEN #{startPrice} and #{endPrice}
|
|
|
</if>
|
|
|
</select>
|
|
|
|
he2802