订单查询bug

share-system/src/main/resources/mapper/system/SOrderMapper.xml

@@ -81,12 +81,12 @@
 
     <select id="selectSOrderList" parameterType="SOrder" resultMap="SOrderResult">
         <include refid="selectSOrderVo"/>
-        where 1=1
+        where pay_status = 1
         <if test="orderNo != null and orderNo != ''">and order_no = #{orderNo}</if>
         <if test="outTradeNo != null and outTradeNo != ''">and out_trade_no = #{outTradeNo}</if>
         <if test="orderType != null and orderType != ''">and order_type = #{orderType}</if>
         <if test="payType != null and payType != ''">and pay_type = #{payType}</if>
-        <if test="payStatus != null and payStatus != ''">and pay_status = #{payStatus}</if>
+<!--        <if test="payStatus != null and payStatus != ''">and pay_status = #{payStatus}</if>-->
         <if test="storeId != null and storeId != ''">and store_id = #{storeId}</if>
         <if test="roomId != null and roomId != ''">and room_id = #{roomId}</if>
         <if test="consumerId != null and consumerId != ''">and consumer_id = #{consumerId}</if>
@@ -103,10 +103,10 @@
         <if test="preStartDate != null and preStartDate != ''">and pre_start_date = #{preStartDate}</if>
         <if test="preEndDate != null and preEndDate != ''">and pre_end_date = #{preEndDate}</if>
         <if test="startDate != null">
-            and DATE_FORMAT(start_date, '%Y-%m-%d') = DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+            and DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
         </if>
         <if test="endDate != null">
-            and DATE_FORMAT(end_Date, '%Y-%m-%d') = DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+            and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
         </if>
         <if test="status != null and status != '' or status==0">and status = #{status}</if>
         <if test="refundStatus != null and refundStatus != ''">and refund_status = #{refundStatus}</if>