Merge branch 'forder' of 39.97.239.116:gyfl/xyzshop into forder

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

@@ -52,10 +52,10 @@ class fetch_orderModel extends Model
     }
 
     //处理完成的单子
-    public function processed($fetch_id,$official_sn = '')
+    public function processed($fetch_id,$notify_state,$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(),'notify_state' => $notify_state,'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->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

@@ -10,8 +10,9 @@
 defined('InShopNC') or exit('Access Invalid!');
 require_once(BASE_HELPER_PATH . '/vrorder_helper.php');
 require_once(BASE_CORE_PATH . '/framework/function/http.php');
+require_once(BASE_HELPER_PATH . '/refill/util.php');
 
-
+use refill\util;
 class store_refill_ordercontrol extends BaseSellerControl
 {
     public function __construct()
@@ -30,10 +31,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);
@@ -45,84 +47,86 @@ class store_refill_ordercontrol extends BaseSellerControl
 
     public function fetch_orderOp()
     {
-        if (chksubmit()) {
-            $num = intval($_GET['num']);
-            $mod = Model('fetch_order');
-            $condition['status'] = 1;
-            $fetch_order = $mod->where($condition)->order('add_time desc')->limit($num)->select();
-            if(empty($fetch_order)) {
-                showDialog('暂无可抢订单','index.php?act=store_refill_order&op=index','error');
-                echo json_encode(['status' => false, 'msg' => "暂无可抢订单"]);
-            }
-            $order_ids = '';
-            foreach ($fetch_order as $order)
-            {
-                $order_ids .= "{$order['order_id']},";
-            }
-            $order_ids = rtrim($order_ids,',');
-            $member_id = $_SESSION['member_id'];
-            $update_cond['order_id'] = ['in' , $order_ids];
-            $update_cond['memeber_id'] = $member_id;
-            $res = $mod->editFetchOrder(['status' => 2, 'member_id' => $member_id], $update_cond);
-            if($res) {
-                showDialog('抢单成功','index.php?act=store_refill_order&op=index','succ');
-            } else {
-                showDialog('抢单失败','index.php?act=store_refill_order&op=index','error');
-            }
+        $num = intval($_GET['num']);
+        $card_type = intval($_GET['card_type']);
+        if(empty($num) || empty($card_type)) {
+            showDialog('请选择卡类型或抢单数量','index.php?act=store_refill_order&op=index','error');
+        }
+        $mod = Model('fetch_order');
+        $member_id = $_SESSION['member_id'];
+        $store_id = $_SESSION['store_id'];
+        $res = $mod->fetch($store_id, $member_id, $card_type, $num);
+        if(!empty($res)) {
+            showDialog('抢单成功','index.php?act=store_refill_order&op=index','succ');
         } else {
-            $this->indexOp();
+            showDialog('抢单失败','index.php?act=store_refill_order&op=index','error');
         }
     }
 
-    public function batch_disposeOp()
+    public function fetch_countOp()
     {
-        if (!chksubmit()) {
-            $model_refill_order = Model('refill_order');
+        $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;
+    }
 
-            $condition['vr_order.store_id'] = $_SESSION['store_id'];
-            $condition['vr_order.order_state'] = ORDER_STATE_SEND;
-            $condition['refill_order.inner_status'] = 0;
+    public function fetch_reputOp()
+    {
+        $fetch_id = intval($_GET['fetch_id']);
+        $mod = Model('fetch_order');
+        $res = $mod->reput($fetch_id);
+        if(!empty($res)) {
+            showDialog('操作成功','index.php?act=store_refill_order&op=index','succ');
+        } else {
+            showDialog('操作失败','index.php?act=store_refill_order&op=index','error');
+        }
+    }
 
-            $order_list = $model_refill_order->getMerchantOrderList($condition, '', 'refill_order.*,vr_order.order_state', 'refill_order.order_id asc');
+    public function batch_disposeOp()
+    {
+        $state_type = $_GET['state_type'];
+        $official_sn = $_GET['official_sn'] ?? '';
+        $fetch_id = intval($_GET['fetch_id']);
 
-            Tpl::output('order_list', $order_list);
-            Tpl::output('show_page', $model_refill_order->showpage());
-            Tpl::showpage('store_refill_order.batch_dispose');
+        $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];
+            Log::record("state: {$state_type}, order_sn: {$fetch_order['order_sn']}, official_sn: {$official_sn}", Log::DEBUG);
+            refill\util::push_notify($fetch_order['channel_name'],$params);
+            $mod->processed($fetch_id,$state_type,$official_sn);
+            showDialog("成功", 'reload', 'js');
             exit();
-        } else {
-            $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();
-                }
-            }
-
-            showDialog("失败", '', 'error');
         }
-    }
 
+        showDialog("失败", '', 'error');
+    }
 
-    private function _order_send($order_info)
+    public function fetch_listOp()
     {
-        $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']);
+        $mod = Model('fetch_order');
+
+        $condition['store_id'] = $_SESSION['store_id'];
+        $condition['member_id'] = $_SESSION['member_id'];
+        $condition['fetch_status'] = 3;
+        $order_list = $mod->getFetchOrderList($condition,20);
+
+        Tpl::output('order_list', $order_list);
+        Tpl::output('show_page', $mod->showpage());
+        Tpl::showpage('store_refill_order.batch_dispose');
     }
 
     /**

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

@@ -2,8 +2,8 @@
 
 <div class="tabmenu">
     <ul class="tab pngFix">
-        <li class="normal"><a target="" href="<?php echo urlShop('store_refill_order', 'index'); ?>">已支付订单</a></li>
-        <li class="active"><a target="" href="<?php echo urlShop('store_refill_order', 'batch_dispose'); ?>">处理待处理订单</a>
+        <li class="normal"><a target="" href="<?php echo urlShop('store_refill_order', 'index'); ?>">待处理订单</a></li>
+        <li class="active"><a target="" href="<?php echo urlShop('store_refill_order', 'fetch_list'); ?>">处理待处理订单</a>
         </li>
     </ul>
 </div>
@@ -15,8 +15,8 @@
         <th class="w150">订单编号</th>
         <th class="w150">充值卡号</th>
         <th class="w100">充值面额</th>
-        <th class="w200">第三方单号填写</th>
-        <th class="w150">交易操作</th>
+        <th class="w200">第三方单号</th>
+        <th class="w150">处理状态</th>
     </tr>
     </thead>
     <?php if (is_array($output['order_list']) and !empty($output['order_list'])) { ?>
@@ -30,11 +30,8 @@
         <td><?php echo $order['order_sn']; ?></td>
         <td class="bdl"><?php echo $order['card_no']; ?></td>
         <td class="bdl"><?php echo $order['refill_amount']; ?></td>
-        <td class="bdl"><input type="text" name="ch_trade_no" style="width: 180px" id="ch_trade_no" /></td>
-        <td class="bdl bdr">
-            <a href="#" class="ncsc-btn-mini" id="order_action_success" data-order="order_success" onclick="change_state(event)">处理成功</a>
-            <a href="#" class="ncsc-btn-mini" id="order_action_cancel"  data-order="order_cancel" onclick="change_state(event)">处理失败</a>
-        </td>
+        <td class="bdl"><?php echo $order['official_sn'] ?? '/'; ?></td>
+        <td class="bdl"><?php echo $order['notify_state']; ?></td>
     </tr>
     <?php }
     } else { ?>
@@ -61,18 +58,4 @@
 <link rel="stylesheet" type="text/css"
       href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"/>
 <script>
-    function change_state(e){
-        let url = "index.php?act=store_refill_order&op=batch_dispose&form_submit=ok&order_id=<?php echo $order['order_id'];?>"
-        let state_type = e.target.dataset.order
-        // let ch_trade_no = document.getElementById('ch_trade_no').value
-        let ch_trade_no = e.currentTarget.parentElement.previousElementSibling.firstElementChild.value
-        if(state_type == 'order_cancel') {
-            ch_trade_no = ''
-        } else {
-            ch_trade_no = ch_trade_no ? ch_trade_no : ''
-        }
-        // console.log('ch_trade_no', ch_trade_no)
-        let href = url + '&state_type=' + state_type + '&ch_trade_no=' + ch_trade_no
-        e.target.href = href
-    }
 </script>

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

@@ -9,6 +9,40 @@
         display: flex;
         justify-content: space-between;
     }
+    .tabmenuright {
+        margin-right: 20px
+    }
+    .block {
+        display: inline-block;
+        background-color: rgba(246,97,97,1)!important;
+        border:1px solid rgba(246,97,97,1)!important;
+    }
+
+    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; 
+}
+a.ncsc-btn-mini {
+
+    padding: 3px 5px;
+    margin-right: 10px;
+}
+a:nth-child(3) {
+    margin-right: 0px;
+
+}
+
 </style>
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
 
@@ -16,7 +50,7 @@
 <div class="tabmenu">
     <ul class="tab pngFix">
         <li class="active"><a target="" href="<?php echo urlShop('store_refill_order', 'index'); ?>">待处理订单</a></li>
-        <li class="normal"><a target="" href="<?php echo urlShop('store_refill_order', 'batch_dispose'); ?>">已完成订单</a>
+        <li class="normal"><a target="" href="<?php echo urlShop('store_refill_order', 'fetch_list'); ?>">已完成订单</a>
         </li>
     </ul>
     <!-- <a href="#" class="ncsc-btn ncsc-btn-orange" style="right: 80px" onclick="hCopy(event)"><i class="icon-edit"></i>拷贝</a>
@@ -24,11 +58,21 @@
     
 </div>
 <div class="tabmenu">
-    <span>前方共有<span class="rob"></span>笔订单可抢</span>
-  <div>
-  <span>抢
-        <select name="" id="" class="querySelect">
-        <option value="">请选择</option>
+    <div>
+    <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"><?php echo $output['total_fetch_order'];?></span>笔订单可抢</span>
+    </div>
+  <div class="flex">
+        <p class="flexleft">抢</p>
+        <select name="" id="queryrob" class="querySelect">
+        <option value="0">请选择</option>
         <option value="1">1</option>
         <option value="2">2</option>
         <option value="3">3</option>
@@ -40,8 +84,9 @@
         <option value="9">9</option>
         <option value="10">10</option>
         </select>
-    单</span>
-    <a href="#" class="ncsc-btn ncsc-btn-blue" onclick="hRob(event)">抢1单</a>
+        <p class="flexright">单</p>
+ 
+    <a href="#" id="blockrob" class="block ncsc-btn ncsc-btn-blue">确认抢单</a>
   </div>
 
 </div>
@@ -51,17 +96,25 @@
     <tr>
         <th class="w150">订单编号</th>
         <th class="w150">充值卡号</th>
-        <th class="w150">充值面额</th>
+        <th class="w80">充值面额</th>
+        <th class="w150">第三方单号填写</th>
+        <th class="w180">交易操作</th>
     </tr>
     </thead>
     <input type="hidden" id="order_num" value="<?php echo $output['order_num']?>">
     <tbody class="tbody">
     <?php if (is_array($output['order_list']) and !empty($output['order_list'])) { ?>
         <?php foreach ($output['order_list'] as $order_id => $order) { ?>
-            <tr class="tr" data-orderid="<?php echo $order['order_id']; ?>">
+            <tr class="tr" data-fetchid="<?php echo $order['fetch_id']; ?>">
                 <td><?php echo $order['order_sn']; ?></td>
                 <td class="bdl"><?php echo $order['card_no']; ?></td>
                 <td class="bdl"><?php echo $order['refill_amount']; ?></td>
+                <td class="bdl"><input type="text" name="ch_trade_no" style="width: 180px" id="ch_trade_no" /></td>
+                <td class="bdl bdr">
+                    <a href="#" class="ncsc-btn-mini" id="order_action_success" data-order="SUCCESS" onclick="change_state(event,<?php echo $order['fetch_id']; ?>)">处理成功</a>
+                    <a href="#" class="ncsc-btn-mini" id="order_action_cancel"  data-order="CANCEL" onclick="change_state(event,<?php echo $order['fetch_id']; ?>)">处理失败</a>
+                    <a href="#" class="ncsc-btn-mini" id="fetch_action_cancel"  data-order="cancel_fetch" onclick="change_state(event,<?php echo $order['fetch_id']; ?>)">取消处理</a>
+                </td>
             </tr>
         <?php }
     } else { ?>
@@ -76,55 +129,92 @@
 </table>
 <script charset="utf-8" type="text/javascript"
         src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/i18n/zh-CN.js"></script>
+<script type="text/javascript" src="<?php echo SHOP_TEMPLATES_URL;?>/layui/layui.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")
-    })
-    // 拷贝
-
-    function hCopy(e) {
-        let orderList = $('#order_num').val()
-        if (orderList != 0) {
-            let tbody = $('.tbody')[0].innerText
-            // console.log('tbody', $('.tbody'))
-            let tbodyData = tbody.trim().replace(/    +/g, '').replace(/\n+/g, ',').split(',')
-            // console.log('tbodyData', tbodyData)
-            let str = ''
-            for(let i = 0; i<tbodyData.length; i++ ) {
-                if (i%3 == 2) {
-                    str = str + tbodyData[i] + '\n'
-                } else {
-                    str = str + tbodyData[i] + ' '
-                }
-            }
-            let oInput = document.createElement("textarea");
-            oInput.style.border = "0 none";
-            oInput.style.color = "transparent";
-            oInput.value = str;
-            document.body.appendChild(oInput);
-            oInput.select(); // 选择对象
-            document.execCommand("Copy"); // 执行浏览器复制命令
-            oInput.parentNode.removeChild(oInput)
-            // console.log('oInput.value', oInput.value)
-        }
-    }
-    // 处理
-    function hDeal(e) {
-        let orderList = $('#order_num').val()
-        if (orderList != 0) {
-            let trData = $('.tr')
-            let trStr = ''
-            for (let i = 0; i< trData.length; i++) {
-                if (i == trData.length-1) {
-                    trStr = trStr + trData[i].dataset.orderid
+            $('#tabmenuright').click(function() {
+                    let value_rob = $(this).val()
+                    let value_ro = $("#tabmenuright  option:selected").text()
+            $.get('index.php?act=store_refill_order&op=fetch_count',{
+                card_type:value_rob
+            },function(data) {
+                    data = JSON.parse(data)
+                
+                if (data.code == 200) {
+                    const value_1 = data.count
+                    $('.rob').text(value_1)
+                } 
+                })
+        })
+        //抢单
+        $('#queryrob').click(() => {
+            let value_rob = $("#tabmenuright").val()
+
+            $.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.count == 0)
+                    layer.msg('该卡类型无单可抢');
+               
+           
+                })
+        })
+        $('#blockrob').click(() =>{
+            let value_rob = $("#tabmenuright").val()
+            let queryrob_val  = $("#queryrob").val()
+            $.get('index.php?act=store_refill_order&op=fetch_count',{
+                card_type:value_rob
+            },function(data) {
+                    data = JSON.parse(data)
+                
+                if (data.count == 0) {
+                    layer.msg('暂无订单可抢');
+                } else if (value_rob != 0 && queryrob_val!= 0 && data.count!= 0) {
+                    window.location.href = `index.php?act=store_refill_order&op=fetch_order&num= ${queryrob_val}&card_type= ${value_rob}`
                 } else {
-                    trStr = trStr + trData[i].dataset.orderid + ','
+                    layer.msg('请选择卡类型以及单数');
                 }
+                })  
+            })
+
+
+    })
+
+    function change_state(e,fetch_id) {
+        let state_type = e.target.dataset.order
+
+        if (state_type == 'cancel_fetch') {
+            layer.confirm('确定要取消处理吗', {
+                btn: ['确定', '取消'] //按钮
+            }, function () {
+                window.location.href = 'index.php?act=store_refill_order&op=fetch_reput&form_submit=ok&fetch_id='+fetch_id;
+            }, function () {
+
+            });
+
+        } else {
+            let url = "index.php?act=store_refill_order&op=batch_dispose&form_submit=ok&fetch_id="+fetch_id;
+            console.log(11111, url);
+            let official_sn = e.currentTarget.parentElement.previousElementSibling.firstElementChild.value
+            if (state_type == 'SUCCESS') {
+                official_sn = official_sn ? official_sn : ''
+            } else {
+                official_sn = ''
             }
-            e.target.href = 'index.php?act=store_refill_order&op=batch_send&form_submit=ok&order_ids=' + trStr
+            layer.confirm('确定要处理吗', {
+                btn: ['确定', '取消'] //按钮
+            }, function () {
+                window.location.href = url + '&state_type=' + state_type + '&official_sn=' + official_sn
+            }, function () {
+
+            });
+
         }
     }