update

src/main/resources/mapper/order/ScheduleServeMapper.xml

@@ -6,13 +6,13 @@
     <select id="selectConflictType" resultType="com.gogirl.domain.order.serve.ScheduleServe">
         SELECT t1.*
         from scheduled_serve t1
-                 LEFT JOIN scheduled_manage t2 on t1.sch_id = t2.id
-                 LEFT JOIN base_serve t3 on t1.serve_id = t3.id
+        LEFT JOIN scheduled_manage t2 on t1.sch_id = t2.id
+        LEFT JOIN base_serve t3 on t1.serve_id = t3.id
         where t2.scheduled_user = #{scheduledUser}
-          and t3.sch_type_id = #{schTypeId}
-          and TO_DAYS(t1.start_time) = TO_DAYS(#{days})
-          and t1.main_serve_id is null
-          and t2.`status` = 1
+        and t3.sch_type_id = #{schTypeId}
+        and TO_DAYS(t1.start_time) = TO_DAYS(#{days})
+        and t1.main_serve_id is null
+        and t2.`status` = 1
     </select>
 
 </mapper>

src/main/resources/mapper/product/BaseProduceMapper.xml

@@ -150,7 +150,7 @@
                 order by t1.sales_num desc
             </when>
             <otherwise>
-                order by t1.sales_num desc
+                order by t1.index_sort desc
             </otherwise>
         </choose>
     </select>