订单展示，商家取消

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1826,7 +1826,9 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
                     return Result.error("退款失败！");
                 }
             }
-            tbOrder.setStatus(5);
+//            tbOrder.setStatus(5);
+            //            退款状态需要改成8
+            tbOrder.setStatus(8);
             appOrderDao.updateById(tbOrder);
             //添加退款记录
             UserMoneyDetails userMoneyDetails = new UserMoneyDetails();
@@ -2473,7 +2475,9 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
                     return Result.error("退款失败！");
                 }
             }
-            tbOrder.setStatus(5);
+//            tbOrder.setStatus(5);
+            //            退款状态需要改成8
+            tbOrder.setStatus(8);
             appOrderDao.updateById(tbOrder);
             //取消跑腿订单
             TbIndent tbIndent = new TbIndent();

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

@@ -404,10 +404,10 @@
             and tor.status = #{status}
         </if>
         <if test="status!=null and status==5">
-            and tor.status =8
+            and tor.status =5
         </if>
         <if test="status==null">
-            and tor.status in (0, 7, 6, 3, 4, 8)
+            and tor.status in (0, 7, 6, 3, 4, 5, 8)
         </if>
         order by tor.pay_time desc, tor.create_time desc
     </select>