|
|
@@ -235,7 +235,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</if>
|
|
|
<if test="goodsSearchKey != null and goodsSearchKey != ''" >
|
|
|
and ( SELECT
|
|
|
- count(og.*)
|
|
|
+ count(*)
|
|
|
FROM
|
|
|
`order` o
|
|
|
LEFT JOIN order_goods og on o.order_sn = og.order_sn
|
|
|
@@ -243,7 +243,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
where 1=1
|
|
|
and og.`status` = 1
|
|
|
and og.refund_status in (0,1,3)
|
|
|
- and og.pay_status in (2,3,4))
|
|
|
+ and og.pay_status in (2,3,4)
|
|
|
and (g.goods_name like concat('%', #{goodsSearchKey}, '%') or g.code like concat('%', #{goodsSearchKey}, '%'))
|
|
|
and o.user_id = u.user_id)>0
|
|
|
</if>
|
|
|
@@ -301,7 +301,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</if>
|
|
|
<if test="gradeName != null and gradeName != ''">
|
|
|
and ( SELECT
|
|
|
- count(og.*)
|
|
|
+ count(*)
|
|
|
FROM
|
|
|
`order` o
|
|
|
LEFT JOIN order_goods og on o.order_sn = og.order_sn
|
|
|
@@ -309,7 +309,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
where 1=1
|
|
|
and og.`status` = 1
|
|
|
and og.refund_status in (0,1,3)
|
|
|
- and og.pay_status in (2,3,4))
|
|
|
+ and og.pay_status in (2,3,4)
|
|
|
and (cg.class_name like concat('%', #{gradeName}, '%'))
|
|
|
and o.user_id = u.user_id)>0
|
|
|
</if>
|