MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -398,6 +398,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             String name = topCourseBusinessService.getBusinessFullName(bo.getBusinessId());
             bo.setBusinessFullName(name);
         }
+
         List<TopOldOrderVo> orderVoList = baseMapper.queryList(bo);
         if (CollectionUtils.isNotEmpty(orderVoList)) {
             //订单业务类型

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -2068,7 +2068,7 @@
             AND m.id = #{majorId}
         </if>
         <if test="goodsName != null and goodsName !='' ">
-            AND g.goods_name like concat('%', #{goodsName}, '%'))
+            AND g.goods_name like concat('%', #{goodsName}, '%')
         </if>
         <if test="subscribeStatus != null and subscribeStatus == 1">
             AND us.subscribe_status = 1 AND (TIME_TO_SEC(us.apply_site_end_time) + us.apply_site_exam_time) &gt; UNIX_TIMESTAMP()
@@ -2094,5 +2094,6 @@
         <if test="applySiteEndTime != null and applySiteEndTime != '' ">
             and us.apply_site_end_time = #{applySiteEndTime}
         </if>
+        order by us.create_time DESC
     </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -156,10 +156,10 @@
             FROM top_old_order_refund tor
             WHERE vto.order_sn = tor.order_sn AND tor.`status` = 1
             <if test="refundStartTime != null and refundStartTime != ''">
-                AND tor.pay_check_tiem &gt;= 0
+                AND tor.pay_check_time &gt;= #{refundStartTime}
             </if>
             <if test="refundEndTime != null and refundEndTime != ''">
-                AND tor.pay_check_tiem &lt;= 0
+                AND tor.pay_check_time &lt;= #{refundEndTime}
             </if>
              ) > 0
         </if>
@@ -268,6 +268,18 @@
             FROM top_old_order_goods too
             WHERE ot.order_sn = too.order_sn AND too.rel_sign_id IS NOT NULL AND too.check_status = #{studentCheckStatus}) > 0
         </if>
+        <if test="refundStartTime != null or refundEndTime != null">
+            AND (SELECT COUNT(*)
+            FROM top_old_order_refund tor
+            WHERE ot.order_sn = tor.order_sn AND tor.`status` = 1
+            <if test="refundStartTime != null and refundStartTime != ''">
+                AND tor.pay_check_time &gt;= #{refundStartTime}
+            </if>
+            <if test="refundEndTime != null and refundEndTime != ''">
+                AND tor.pay_check_time &lt;= #{refundEndTime}
+            </if>
+            ) > 0
+        </if>
         <if test="tenantId != null and tenantId != ''">
             AND ot.tenant_id = #{tenantId}
         </if>
@@ -325,6 +337,18 @@
         <if test="refundStatus != null">
             AND o.order_refund_status = #{refundStatus}
         </if>
+        <if test="refundStartTime != null or refundEndTime != null">
+            AND (SELECT COUNT(*)
+            FROM top_old_order_refund tor
+            WHERE o.order_sn = tor.order_sn AND tor.`status` = 1
+            <if test="refundStartTime != null and refundStartTime != ''">
+                AND tor.pay_check_time &gt;= #{refundStartTime}
+            </if>
+            <if test="refundEndTime != null and refundEndTime != ''">
+                AND tor.pay_check_time &lt;= #{refundEndTime}
+            </if>
+            ) > 0
+        </if>
         <if test="refundStatusList != null and refundStatusList.size()!=0 ">
             AND o.order_refund_status in
             <foreach collection="refundStatusList" item="item" index="index" open="(" close=")" separator=",">