qifengquan 2 gadi atpakaļ
vecāks
revīzija
dfda1b6189

+ 4 - 0
app/admin/view/merchant/config.html

@@ -24,6 +24,10 @@
             <el-input placeholder="" size="mini" style="width: 150px;margin-left: 10px;" v-model="form.refund_time"></el-input>
             小时
         </el-form-item>
+            <el-form-item label="未付款自动取消订单时间">
+            <el-input placeholder="" size="mini" style="width: 150px;margin-left: 10px;" v-model="form.cancellation_time"></el-input>
+            分钟
+        </el-form-item>
     </el-form>
     <div class="layui-form-item text-center">
         <el-button class="layui-btn" type="primary" @click="save" :loading="saving">保存数据</el-button>

+ 2 - 1
app/data/controller/api/Timedtask.php

@@ -45,7 +45,8 @@ class Timedtask extends Controller
      * 订单过期
      */
     public function checkshoporder(){
-        $time = date('Y-m-d H:i:s',time()-(15*60));
+        $config = SystemConfig('merchant_config');
+        $time = date('Y-m-d H:i:s',time()-($config['cancellation_time']*60));
         ShopOrder::mk()->where('status',2)->where('create_at','<',$time)->chunk(20,function ($list){
             $list = $list->toArray();
             foreach ($list as &$v){