|
@@ -280,7 +280,7 @@
|
|
|
FROM
|
|
FROM
|
|
|
top_old_order_goods too
|
|
top_old_order_goods too
|
|
|
WHERE
|
|
WHERE
|
|
|
- vto.order_sn = too.order_sn
|
|
|
|
|
|
|
+ ot.order_sn = too.order_sn
|
|
|
AND too.rel_sign_id IS NOT NULL
|
|
AND too.rel_sign_id IS NOT NULL
|
|
|
ORDER BY too.order_goods_id DESC
|
|
ORDER BY too.order_goods_id DESC
|
|
|
LIMIT 1 ) = #{studentCheckStatus} )
|
|
LIMIT 1 ) = #{studentCheckStatus} )
|
|
@@ -372,12 +372,17 @@
|
|
|
#{item}
|
|
#{item}
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
- <if test="orderOrg != null and orderOrg != '' and orderOrg == 'C端云学堂线上'">
|
|
|
|
|
- AND o.input_order_sn IS NULL
|
|
|
|
|
- </if>
|
|
|
|
|
- <if test="orderOrg != null and orderOrg != '' and orderOrg == 'C端云学堂线下'">
|
|
|
|
|
- AND o.input_order_sn IS NOT NULL
|
|
|
|
|
- </if>
|
|
|
|
|
|
|
+ <choose>
|
|
|
|
|
+ <when test="orderOrg != null and orderOrg != '' and orderOrg == 'C端云学堂线上'">
|
|
|
|
|
+ AND o.input_order_sn IS NULL
|
|
|
|
|
+ </when>
|
|
|
|
|
+ <when test="orderOrg != null and orderOrg != '' and orderOrg == 'C端云学堂线下'">
|
|
|
|
|
+ AND o.input_order_sn IS NOT NULL
|
|
|
|
|
+ </when>
|
|
|
|
|
+ <when test="orderOrg != null and orderOrg != ''">
|
|
|
|
|
+ AND o.order_org = #{orderOrg}
|
|
|
|
|
+ </when>
|
|
|
|
|
+ </choose>
|
|
|
<if test="checkStartTime != null and checkStartTime != ''">
|
|
<if test="checkStartTime != null and checkStartTime != ''">
|
|
|
AND o.pay_time <![CDATA[ >= ]]> #{checkStartTime}
|
|
AND o.pay_time <![CDATA[ >= ]]> #{checkStartTime}
|
|
|
</if>
|
|
</if>
|
