shop

crontab/control/minutes.php

@@ -45,7 +45,7 @@ class minutesControl extends BaseCronControl
             $items = $mod_fetch_order->timeout_orders(900);
             foreach ($items as $item) {
                 $fetch_id = $item['fetch_id'];
-                $item->unavaliable($fetch_id);
+                $mod_fetch_order->unavaliable($fetch_id);
             }
             $trans->commit();
 

data/model/fetch_order.model.php

@@ -55,7 +55,7 @@ class fetch_orderModel extends Model
     public function processed($fetch_id,$official_sn = '')
     {
         return $this->where(['fetch_id' => $fetch_id,'fetch_status' => self::FETCH_ORDER_PROCESSING])
-                    ->update(['fetch_status' => self::FETCH_ORDER_PROCESSING,'finsh_time' => time(),'official_sn' => $official_sn]);
+                    ->update(['fetch_status' => self::FETCH_ORDER_PROCESSED,'finsh_time' => time(),'official_sn' => $official_sn]);
     }
 
     //超时未处理订单，不可以再接单.
@@ -66,6 +66,15 @@ class fetch_orderModel extends Model
             ->master(true)->select();
     }
 
+    public function getFetchOrder($condition = [], $fields = '*', $master = false, $lock = false)
+    {
+        $order_info = $this->table('refill_order')->field($fields)->where($condition)->order('')->master($master)->lock($lock)->find();
+        if (empty($order_info)) {
+            return [];
+        }
+        return $order_info;
+    }
+
     public function unavaliable($fetch_id)
     {
         return $this->where(['fetch_id' => $fetch_id,'fetch_status' => self::FETCH_ORDER_AVALIABLE])
@@ -76,7 +85,7 @@ class fetch_orderModel extends Model
     //用户已经抢到，尚未处理完成的单子列表
     public function fetch_order_list($store_id, $member_id)
     {
-        return $this->field('*')->where(['store_id' => $store_id,'member_id' => $member_id])->select();
+        return $this->field('*')->where(['store_id' => $store_id,'member_id' => $member_id,'fetch_status' => self::FETCH_ORDER_PROCESSING])->select();
     }
 
     //

shop/control/store_refill_order.php

@@ -30,10 +30,11 @@ class store_refill_ordercontrol extends BaseSellerControl
 
         $member_id = $_SESSION['member_id'];
         $condition['store_id'] = $_SESSION['store_id'];
-        $condition['status'] = 1;
+        $condition['fetch_status'] = 1;
         $total_fetch_order = $mod->where($condition)->count();
 
         $condition['member_id'] = $member_id;
+        $condition['fetch_status'] = 2;
         $order_list = $mod->getFetchOrderList($condition,20);
 
         Tpl::output('order_list', $order_list);
@@ -62,6 +63,23 @@ class store_refill_ordercontrol extends BaseSellerControl
         }
     }
 
+    public function fetch_countOp()
+    {
+        $card_type = $_GET['card_type'];
+        $mod = Model('fetch_order');
+        $condition['store_id'] = $_SESSION['store_id'];
+        $condition['fetch_status'] = 1;
+        if(!empty($card_type)) {
+            $condition['card_type'] = $card_type;
+        }
+        $count = $mod->where($condition)->count();
+        if(empty($count)) {
+            $count = 0;
+        }
+        echo(json_encode(['code' => 200, 'count' => $count]));
+        exit;
+    }
+
     public function fetch_reputOp()
     {
         $fetch_id = intval($_GET['fetch_id']);
@@ -77,39 +95,25 @@ class store_refill_ordercontrol extends BaseSellerControl
     public function batch_disposeOp()
     {
         $state_type = $_GET['state_type'];
-        $ch_trade_no = $_GET['ch_trade_no'];
-        $order_id = intval($_GET['order_id']);
-
-        $refill_order = Model('refill_order');
-        $refill_info = $refill_order->getOrderInfo(['order_id' => $order_id]);
-
-        if (!empty($refill_info)) {
-            $params = ['state_type' => $state_type,
-                'order_id' => $order_id,
-                'channel_name' => $refill_info['channel_name'],
-                'official_sn' => $ch_trade_no];
-            $resp = http_request(BASE_SITE_URL . '/mobile/refill_inner.php', $params, 'POST');
-            if ($resp === 'success') {
-                showDialog("成功", 'reload', 'js');
-                exit();
-            }
+        $official_sn = $_GET['official_sn'] ?? '';
+        $fetch_id = intval($_GET['fetch_id']);
+
+        $mod = Model('fetch_order');
+        $fetch_order = $mod->getFetchOrder(['fetch_id' => $fetch_id],'*',true,true);
+
+        if (!empty($fetch_order)) {
+            $params = ['state' => $state_type,
+                'order_sn' => $fetch_order['order_sn'],
+                'official_sn' => $official_sn];
+            refill\util::push_notify($fetch_order['channel_name'],$params);
+            $mod->processed($fetch_id,$official_sn);
+            showDialog("成功", 'reload', 'js');
+            exit();
         }
 
         showDialog("失败", '', 'error');
     }
 
-
-    private function _order_send($order_info)
-    {
-        $model_vr_order = Model('vr_order');
-        $logic_vr_order = Logic('vr_order');
-        $if_allow = $model_vr_order->getOrderOperateState('store_send', $order_info);
-        if (!$if_allow) {
-            return callback(false, '无权操作');
-        }
-        return $logic_vr_order->changeOrderStateSend($order_info['order_id']);
-    }
-
     /**
      * 用户中心右边，小导航
      *

shop/templates/default/seller/store_refill_order.index.php

@@ -14,10 +14,25 @@
     }
     .block {
         display: inline-block;
+        background-color: rgba(246,97,97,1)!important;
+        border:1px solid rgba(246,97,97,1)!important;
     }
-    .querySelect {
-        margin-right: 90px;
-    }
+
+    select {
+    height: 25px;
+    border-radius: 5px;
+}
+.flex {
+    display:flex;
+}
+.flexright {
+    margin: 3px 112px 0px 9px;
+    font-size: 16px;
+}
+.flexleft {
+    margin: 3px 6px 0px 0;
+    font-size: 16px; 
+}
 </style>
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
 
@@ -34,32 +49,34 @@
 </div>
 <div class="tabmenu">
     <div>
-    <select name="" id="" class="tabmenuright">
-        <option value="">请选择</option>
-        <option value="1">中国联通</option>
-        <option value="2">中国移动</option>
-        <option value="2">中国电信</option>
-
+    <select name="" id="tabmenuright" class="tabmenuright">
+        <option value="0">请选择</option>
+        <option value="<?php echo mtopcard\PetroChinaCard;?>">中石油</option>
+        <option value="<?php echo mtopcard\SinopecCard;?>">中石化</option>
+        <option value="<?php echo mtopcard\ChinaMobileCard;?>">中国移动</option>
+        <option value="<?php echo mtopcard\ChinaUnicomCard;?>">中国联通</option>
+        <option value="<?php echo mtopcard\ChinaTelecomCard;?>">中国电信</option>
         </select>
-    <span>前方共有<span class="rob"></span>笔订单可抢</span>
+    <span>前方共有<span class="rob"><?php echo $output['total_fetch_order'];?></span>笔订单可抢</span>
     </div>
-  <div>
- 
+  <div class="flex">
+        <p class="flexleft">抢</p>
         <select name="" id="" class="querySelect">
-        <option value="">请选择</option>
-        <option value="1">抢1单</option>
-        <option value="2">抢2单</option>
-        <option value="3">抢3单</option>
-        <option value="4">抢4单</option>
-        <option value="5">抢5单</option>
-        <option value="6">抢6单</option>
-        <option value="7">抢7单</option>
-        <option value="8">抢8单</option>
-        <option value="9">抢9单</option>
-        <option value="10">抢10单</option>
+        <option value="0">请选择</option>
+        <option value="1">1</option>
+        <option value="2">2</option>
+        <option value="3">3</option>
+        <option value="4">4</option>
+        <option value="5">5</option>
+        <option value="6">6</option>
+        <option value="7">7</option>
+        <option value="8">8</option>
+        <option value="9">9</option>
+        <option value="10">10</option>
         </select>
+        <p class="flexright">单</p>
  
-    <a href="#" class="block ncsc-btn ncsc-btn-blue" onclick="hRob(event)">抢1单</a>
+    <a href="#" class="block ncsc-btn ncsc-btn-blue" onclick="hRob(event)">确认抢单</a>
   </div>
 
 </div>
@@ -96,10 +113,38 @@
         src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/i18n/zh-CN.js"></script>
 <link rel="stylesheet" type="text/css"
       href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"/>
-
+      <!-- <script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/layui/layui.js"></script>
+<link rel="stylesheet" type="text/css" href="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/css/layui.css"/> -->
 <script>
     $(function () {
-        $('.rob').text("80")
+        // $('#tabmenuright').change(function() {
+            // let value_rob = $('#tabmenuright').val()
+            // console.log(111, value_rob);
+            // $.get('index.php?act=store_refill_order&op=fetch_count',{
+            //     card_type:value_rob
+            // },function(data) {
+            //     data = JSON.parse(data)
+            //     console.log(data);
+                
+            //     })
+        // })
+                $('#tabmenuright').click(function() {
+                    let value_rob = $(this).val()
+            console.log(111, value_rob);
+            $.get('index.php?act=store_refill_order&op=fetch_count',{
+                card_type:value_rob
+            },function(data) {
+                data = JSON.parse(data)
+                console.log(data);
+                
+                if (data.code == 200) {
+                    const value_1 = data.count
+                    $('.rob').text(value_1)
+                    console.log(value_1);
+                } 
+                })
+        })
+
     })
     // 拷贝