jk-GitHub-coder %!s(int64=3) %!d(string=hai) anos
pai
achega
4863ea5d69

+ 2 - 2
YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -161,10 +161,10 @@
                 AND status= #{status}
             </if>
             <if test="beginTime !=null and beginTime !=''">
-                AND pay_date &gt;= #{beginTime}
+                AND refund_success_date &gt;= #{beginTime}
             </if>
             <if test="endTime !=null">
-                AND pay_date &lt; #{endTime}
+                AND refund_success_date &lt; #{endTime}
             </if>
         </where>
     </select>

+ 16 - 6
YijiaRestful/src/main/resources/mapper/StationClassStructureMapper.xml

@@ -328,12 +328,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="status != null and status != ''">
                 AND status = #{status}
-            </if>
-            <if test="classStartDate != null">
-                AND  pay_date &gt;= #{classStartDate}
-            </if>
-            <if test="classStructureDate != null">
-                AND pay_date &lt; #{classStructureDate}
+                <if test="status == '1'.toString()">
+                    <if test="classStartDate != null">
+                        AND  pay_date &gt;= #{classStartDate}
+                    </if>
+                    <if test="classStructureDate != null">
+                        AND pay_date &lt; #{classStructureDate}
+                    </if>
+                </if>
+                <if test="status == '3'.toString()">
+                    <if test="classStartDate != null">
+                        AND  refund_success_date &gt;= #{classStartDate}
+                    </if>
+                    <if test="classStructureDate != null">
+                        AND refund_success_date &lt; #{classStructureDate}
+                    </if>
+                </if>
             </if>
         </where>
     </select>