1

app/admin/view/shop_purchase/index.html

@@ -116,7 +116,7 @@
                 <td class="nowrap">
                     <div>
                         <a class="layui-btn layui-btn-primary layui-btn-sm" data-modal="{:url('detail')}?id={$vo.id}" data-area='["1200px","90%"]'>查看详情</a>
-                        {if $vo.status == 1 || $vo.status == 2}
+                        {if $vo.status == 1}
                         <a class="layui-btn layui-btn-primary layui-btn-sm" data-open="{:url('edit')}?id={$vo.id}" data-area='["1200px","90%"]'>编辑</a>
 
                         <a class="layui-btn layui-btn-primary layui-btn-sm" data-confirm="确定要取消订单吗?" data-action="{:url('cancellation')}?id={$vo.id}" data-area='["1200px","90%"]'>取消订单</a>

app/data/controller/api/Timedtask.php

@@ -96,9 +96,9 @@ class Timedtask extends Controller
         $outtime = date('Y-m-d H:i:s',time()-($order_timeout_end_time*60*60*24));
         $where = [
             'deleted'=>0,
-            'status'=>1,
         ];
-        $list = ShopOrderSend::mk()->whereExists('select * from shop_order where shop_order.order_no=shop_order_send.order_no and shop_order.status=5')->where($where)->where('create_at','<',$outtime)->select();
+        $list = ShopOrderSend::mk()->whereExists('select * from shop_order where shop_order.order_no=shop_order_send.order_no and shop_order.status=5')->where($where)->whereIn('status','1,2')->where('create_at','<',$outtime)->select();
+
         foreach ($list as $k=>$v){
             Db::startTrans();
             try {

app/data/controller/api/auth/Purchase.php

@@ -119,7 +119,6 @@ class Purchase extends Auth
             default:
                 $this->error('类型必须');
         }
-
         if($request['sort']==1){
             $query
                 ->field("*,st_distance(point(`longitude`,`latitude`),point({$request['longitude']},{$request['latitude']})) as distance")