Accept Merge Request #76: (dev-小程序展示，商家取消 -> dev-rht-pay)

Merge Request: 修改订单展示接口，修改商家取消接口，修改定时处理超时订单接口

Created By: @刘子麟
Accepted By: @刘子麟
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/76?initial=true

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

@@ -1827,7 +1827,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();
@@ -2474,7 +2476,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/java/com/sqx/scheduler/order/OrderScheduler.java

@@ -224,6 +224,8 @@ public class OrderScheduler {
                         if ("NOTPAY".equals(trade_state)) {
                             tbOrder.setStatus(5);
                             orders.add(tbOrder);
+                        }else if ("SUCCESS".equals(trade_state)){
+                            orderService.updateOrderAfterPaySuccess(tbOrder);
                         }
                     }else {
                         QrcodeQueryRequestBean qqrb = new QrcodeQueryRequestBean();
@@ -234,6 +236,8 @@ public class OrderScheduler {
                         if ("0".equals(respCode)) {
                             tbOrder.setStatus(5);
                             orders.add(tbOrder);
+                        }else if ("1".equals(respCode)){
+                            orderService.updateOrderAfterPaySuccess(tbOrder);
                         }
 
                     }

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>