|
@@ -263,11 +263,7 @@
|
|
|
WHERE
|
|
|
1 = 1 AND o.`status` IN (0,1)
|
|
|
AND ( `o`.`order_type` != 4 )
|
|
|
- AND (
|
|
|
- isnull( `o`.`input_order_sn` )
|
|
|
- OR (
|
|
|
- NOT (
|
|
|
- `o`.`input_order_sn` IN ( SELECT `top_old_order`.`input_order_sn` FROM `top_old_order` ))))
|
|
|
+ AND ( `o`.`org_sign` != 1 )
|
|
|
<if test="businessFullName != null and businessFullName != ''">
|
|
|
AND (
|
|
|
SELECT
|
|
@@ -568,14 +564,14 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="tenantMoneyTotal" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo"
|
|
|
- resultType="BigDecimal">
|
|
|
+ resultType="java.math.BigDecimal">
|
|
|
SELECT IFNULL(SUM(too.divide_company_money), 0)
|
|
|
FROM v_top_order too
|
|
|
WHERE too.divide_model = 1
|
|
|
AND too.divide_status = 5
|
|
|
</select>
|
|
|
<select id="tenantSellerTotal" parameterType="com.zhongzheng.modules.top.goods.bo.TopOldOrderQueryBo"
|
|
|
- resultType="BigDecimal">
|
|
|
+ resultType="java.math.BigDecimal">
|
|
|
SELECT IFNULL(SUM(too.divide_seller_money), 0)
|
|
|
FROM v_top_order too
|
|
|
WHERE too.divide_model = 2
|