admin update

admin/control/merchant.php

@@ -1121,21 +1121,32 @@ class merchantControl extends SystemControl
         }
         $type = $stats_data['type'];
         if (chksubmit()) {
-            $corder_success_count = $_POST['corder_success_count'];
-            $corder_success_amounts = $_POST['corder_success_amounts'];
-            $corder_success_refill_amounts = $_POST['corder_success_refill_amounts'];
+            $corder_success_count = $_POST['corder_success_count'] ?? 0;
+            $corder_success_amounts = $_POST['corder_success_amounts'] ?? 0;
+            $corder_success_refill_amounts = $_POST['corder_success_refill_amounts'] ?? 0;
+            $refund = $_POST['refund'] ?? 0;
             $remark = $_POST['remark'];
             $gap_order_count = $gap_success_amounts = $gap_success_refill_amounts = 0;
             if($type == 'provider') {
-                $gap_order_count = $corder_success_count - $stats_data['success_count'];
-                $gap_success_amounts = $corder_success_amounts - $stats_data['success_channel_amounts'];
+                if(!empty($corder_success_amounts)) {
+                    $gap_success_amounts = $corder_success_amounts - $stats_data['success_channel_amounts'];
+                }
+                if(!empty($corder_success_count)) {
+                    $gap_order_count = $corder_success_count - $stats_data['success_count'];
+                }
             }elseif ($type == 'merchant') {
-                $gap_order_count = $stats_data['success_count'] - $corder_success_count;
-                $gap_success_amounts = $stats_data['success_channel_amounts'] - $corder_success_amounts;
+                if(!empty($corder_success_count)) {
+                    $gap_order_count = $stats_data['success_count'] - $corder_success_count;
+                }
+                if(!empty($corder_success_amounts)) {
+                    $gap_success_amounts = $stats_data['success_channel_amounts'] - $corder_success_amounts;
+                }
             }else{
                 showMessage('对账数据类型错误', 'index.php?act=OrderStats&op=index');
             }
-            $gap_success_refill_amounts = $corder_success_refill_amounts - $stats_data['success_refill_amounts'];
+            if(!empty($corder_success_refill_amounts)) {
+                $gap_success_refill_amounts = $corder_success_refill_amounts - $stats_data['success_refill_amounts'];
+            }
 
             $updata['corder_success_count'] = $corder_success_count;
             $updata['corder_success_amounts'] = $corder_success_amounts;
@@ -1144,10 +1155,13 @@ class merchantControl extends SystemControl
             $updata['gap_success_amounts'] = $gap_success_amounts;
             $updata['gap_success_refill_amounts'] = $gap_success_refill_amounts;
             $updata['remark'] = $remark;
-            if($gap_order_count == 0 && $gap_success_amounts == 0) {
-                $updata['check_status'] = 1;
-            }else{
-                $updata['check_status'] = 2;
+            $updata['refund'] = $refund;
+            if(!empty($corder_success_count) && !empty($corder_success_amounts) && !empty($corder_success_refill_amounts)) {
+                if($gap_order_count == 0 && $gap_success_amounts == 0 && $gap_success_refill_amounts == 0 ) {
+                    $updata['check_status'] = 1;
+                }else{
+                    $updata['check_status'] = 2;
+                }
             }
             $res = $mod_stat->edit($stat_id, $updata);
 
@@ -1159,6 +1173,7 @@ class merchantControl extends SystemControl
         } else {
             $type_text = ['provider' => '上游', 'merchant' => '商户'];
             Tpl::output('stats_type', $type_text[$type]);
+            Tpl::output('stats_data', $stats_data);
             Tpl::showpage('order.stats.check');
         }
     }

admin/control/refill_order.php

@@ -110,7 +110,7 @@ class refill_orderControl extends SystemControl
             $this->RefillOrderExport($condition);
         }
         $merchants = [];
-        $merchant_list = Model('')->table('merchant')->limit(1000)->select();
+        $merchant_list = Model('')->table('merchant')->limit(1000)->order('name asc')->select();
         foreach ($merchant_list as $key => $value) {
             $merchants[$value['mchid']] = $value;
         }
@@ -268,6 +268,24 @@ class refill_orderControl extends SystemControl
         exit;
     }
 
+    public function provider_dataOp()
+    {
+        $provider_list = Model('')->table('refill_provider,store')
+            ->field('refill_provider.*,store.store_name')
+            ->join('inner')
+            ->on('store.store_id=refill_provider.store_id')
+            ->order('opened asc, name asc')
+            ->limit(1000)
+            ->select();
+        foreach ($provider_list as $value) {
+            $data['name'] = $value['store_name'] ?? $value['name'];
+            $data['value'] = $value['provider_id'];
+            $result[] = $data;
+        }
+        echo json_encode($result);
+        exit;
+    }
+
     public function refill_third_infoOP()
     {
         $order_id = $_GET['order_id'];

admin/control/refill_refund.php

@@ -47,6 +47,8 @@ class refill_refundControl extends SystemControl
 
             $refund_list[$key]['merchant_name'] = $merchants[$value['mchid']]['name'];
             $refund_list[$key]['company_name'] = $merchants[$value['mchid']]['company_name'];
+
+            $refund_list[$key]['card_type_text'] = $this->scard_type($value['card_type']);
         }
         Tpl::output('provider_list', $providers);
         Tpl::output('merchants', $merchants);
@@ -86,6 +88,9 @@ class refill_refundControl extends SystemControl
                 $insert_array['mch_amount'] = $_POST['mch_amount'];
                 $insert_array['channel_amount'] = $_POST['channel_amount'];
                 $insert_array['refund_time'] = strtotime($_POST['refund_time']);
+                $insert_array['card_no'] = $_POST['card_no'];
+                $insert_array['card_type'] = $_POST['card_type'];
+                $insert_array['refill_amount'] = $_POST['refill_amount'];
                 $insert_array['bz'] = $_POST['bz'] ?? '';
                 $insert_array['add_time'] = time();
                 $result = $mod->addRefund($insert_array);

admin/templates/default/order.stats.check.php

@@ -26,17 +26,24 @@
                 <td class="vatop tips"></td>
             </tr>
             <tr class="noborder">
-                <td colspan="2" class="required"><label class="validation" for="name"><?php echo $output['stats_type'];?>成功订单金额:</label></td>
+                <td colspan="2" class="required"><label class="validation" for="name"><?php echo $output['stats_type'];?>成功订单面值金额:</label></td>
+            </tr>
+            <tr class="noborder">
+                <td class="vatop rowform"><input type="text" value="" name="corder_success_refill_amounts" id="corder_success_refill_amounts" class="txt"></td>
+                <td class="vatop tips"></td>
+            </tr>
+            <tr class="noborder">
+                <td colspan="2" class="required"><label class="validation" for="name"><?php echo $output['stats_type'];?>成功订单扣款金额:</label></td>
             </tr>
             <tr class="noborder">
                 <td class="vatop rowform"><input type="text" value="" name="corder_success_amounts" id="corder_success_amounts" class="txt"></td>
                 <td class="vatop tips"></td>
             </tr>
             <tr class="noborder">
-                <td colspan="2" class="required"><label class="validation" for="name"><?php echo $output['stats_type'];?>成功订单面值金额:</label></td>
+                <td colspan="2" class="required"><label class="validation" for="name"><?php echo $output['stats_type'];?>退款:</label></td>
             </tr>
             <tr class="noborder">
-                <td class="vatop rowform"><input type="text" value="" name="corder_success_refill_amounts" id="corder_success_refill_amounts" class="txt"></td>
+                <td class="vatop rowform"><input type="text" value="" name="refund" id="refund" class="txt"></td>
                 <td class="vatop tips"></td>
             </tr>
             <tr>
@@ -73,28 +80,6 @@
         $('#user_form').validate({
             errorPlacement: function (error, element) {
             error.appendTo(element.parent().parent().prev().find('td:first'));
-            },
-            rules: {
-                corder_success_count: {
-                    required: true,
-                },
-                corder_success_amounts: {
-                    required: true,
-                },
-                corder_success_refill_amounts: {
-                    required: true,
-                }
-            },
-            messages: {
-                corder_success_count: {
-                    required: '不能为空',
-                },
-                corder_success_amounts: {
-                    required: '不能为空',
-                },
-                corder_success_refill_amounts: {
-                    required: '不能为空',
-                }
             }
         });
     });

admin/templates/default/refill.order.index.php

@@ -500,15 +500,19 @@
         let default_no_mch = $('input[name="default_no_mch"]').val().split(',');
         $.get('index.php?act=refill_order&op=merchant_data',function(data) {
             data = JSON.parse(data)
+         console.log(data);
             if (default_no_mch) {
+                console.log(default_no_mch);
                 for (let index = 0; index < default_no_mch.length; index++) {
                     for (let j = 0; j < data.length; j++) {
                         if (default_no_mch[index] == data[j].value) {
                             data[j].selected = true
+                            
                         }
                     }
                 }
             }
+           
             selest_nc = xmSelect.render({
                 el: '#selest_nc',
                 size: 'mini',
@@ -534,6 +538,7 @@
                 selectStr += selectArr[i].value+','
             }
             selectStr = selectStr.substr(0, selectStr.length-1)
+            console.log(selectStr);
             $('input[name="no_mchid"]').val(selectStr);
             // console.log('selectArr', selectArr, selectStr);
             $('#formSearch').submit();

admin/templates/default/refill.refund.add.php

@@ -89,8 +89,17 @@
             <tr class="noborder">
                 <td colspan="2" class="required"><label class="validation" for="card_type">卡类型:</label></td>
             </tr>
-            <tr class="noborder">
-                <td class="vatop rowform"><input type="text" value="" name="card_type" id="card_type" class="txt"></td>
+            <tr class="">
+                <td class="">
+                    <select name="card_type" id="card_type"  class="layui_in" lay-verify="" lay-search>
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></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>
+                </td>
                 <td class="vatop tips"></td>
             </tr>
             <tr class="noborder">

admin/templates/default/refill.refund.php

@@ -103,7 +103,7 @@
                         <td class="align-center"><?php echo $v['company_name'] ?? $v['name']; ?></td>
                         <td class="align-center"><?php echo $v['mch_amount']; ?></td>
                         <td class="align-center"><?php echo $v['card_no']; ?></td>
-                        <td class="align-center"><?php echo $v['card_type']; ?></td>
+                        <td class="align-center"><?php echo $v['card_type_text']; ?></td>
                         <td class="align-center"><?php echo $v['refill_amount']; ?></td>
                         <td class="align-center"><?php echo date('Y-m-d H:i:s', $v['refund_time']); ?></td>
                         <td class="align-center"><?php echo date('Y-m-d H:i:s', $v['add_time']); ?></td>