|
|
@@ -23,11 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
dl.divide_type,
|
|
|
oo.accomplish_time as order_time,
|
|
|
oo.remark,
|
|
|
- oo.divide_company_money,
|
|
|
- oo.divide_seller_money,
|
|
|
- oo.brokerage,
|
|
|
- oo.pretax_brokerage,
|
|
|
- oo.order_price,
|
|
|
+ IFNULL(oo.divide_company_money,0) divide_company_money,
|
|
|
+ IFNULL(oo.divide_seller_money,0) divide_seller_money,
|
|
|
+ IFNULL(oo.brokerage,0) brokerage,
|
|
|
+ IFNULL(oo.pretax_brokerage,0) pretax_brokerage,
|
|
|
+ IFNULL(oo.order_price,0) order_price,
|
|
|
oo.order_from,
|
|
|
oo.create_time as order_create_time,
|
|
|
r.role_name,
|
|
|
@@ -116,10 +116,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
dl.pay_status,
|
|
|
dl.divide_type,
|
|
|
oo.remark,
|
|
|
- oo.order_price,
|
|
|
- oo.brokerage,
|
|
|
- oo.pretax_brokerage,
|
|
|
- tor.divide_money,
|
|
|
+ IFNULL(oo.order_price,0) order_price,
|
|
|
+ IFNULL(oo.brokerage,0) brokerage,
|
|
|
+ IFNULL(oo.pretax_brokerage,0) pretax_brokerage,
|
|
|
+ IFNULL(tor.divide_money,0) divide_money,
|
|
|
tor.refund_time as order_time,
|
|
|
oo.create_time as order_create_time,
|
|
|
oo.create_sys_user_id,
|
he2802