|
@@ -104,6 +104,12 @@
|
|
|
JOIN t_order_goods og ON o.id = og.order_id
|
|
|
WHERE o.is_delete = 0
|
|
|
and og.merchant_id = #{param.userId}
|
|
|
+ <if test="param.orderState != null">
|
|
|
+ and o.order_state = #{param.orderState}
|
|
|
+ </if>
|
|
|
+ <if test="param.isAftersales != null">
|
|
|
+ and o.is_aftersales = #{param.isAftersales}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
|
|
|
<select id="getMerchantOrderNum" resultType="java.lang.String">
|