|
@@ -333,7 +333,9 @@
|
|
|
<if test="endTime != null and endTime != '' ">
|
|
|
AND orderTime <![CDATA[<=]]> #{endTime}
|
|
|
</if>
|
|
|
+ AND orderSeen != 2 OR orderSeen IS NULL
|
|
|
ORDER BY orderTime DESC
|
|
|
+
|
|
|
</select>
|
|
|
<select id="getOrderListByKeyword" resultType="com.caimei365.order.model.vo.OrderVo">
|
|
|
SELECT DISTINCT
|
|
@@ -386,6 +388,7 @@
|
|
|
LEFT JOIN cm_order_product cop ON co.orderID = cop.orderID
|
|
|
WHERE co.delFlag = 0 AND co.userID = #{userId}
|
|
|
AND cop.name LIKE CONCAT('%',#{searchWord},'%')
|
|
|
+ AND orderSeen != 2 OR orderSeen IS NULL
|
|
|
GROUP BY co.orderID, co.orderTime
|
|
|
ORDER BY co.orderTime DESC
|
|
|
</select>
|