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

admin/control/merchant.php

@@ -1076,27 +1076,27 @@ class merchantControl extends SystemControl
             showMessage('机构信息有误');
         }
         if (chksubmit()) {
-            $merchant_intercept['is_transfer'] = $_POST['is_transfer'];
+            $intercept_cfg['is_transfer'] = $_POST['is_transfer'];
             if (!empty($_POST['card_states'])) {
-                $merchant_intercept['card_states'] = $_POST['card_states'];
+                $intercept_cfg['card_states'] = $_POST['card_states'];
             }
-            $merchant_intercept = serialize($merchant_intercept);
-            $resp = $model_merchant->editMerchant(['merchant_intercept' => $merchant_intercept], ['mchid' => $mchid]);
+            $intercept_cfg = serialize($intercept_cfg);
+            $resp = $model_merchant->editMerchant(['intercept_cfg' => $intercept_cfg], ['mchid' => $mchid]);
             if ($resp) {
                 showMessage('操作成功', 'index.php?act=merchant&op=merchant');
             } else {
                 showMessage('操作失败');
             }
         } else {
-            $merchant_intercept = $merchant['merchant_intercept'];
-            if (empty($merchant_intercept)) {
-                $merchant_intercept = ['card_states' => [], 'is_transfer' => 0];
+            $intercept_cfg = $merchant['intercept_cfg'];
+            if (empty($intercept_cfg)) {
+                $intercept_cfg = ['card_states' => [], 'is_transfer' => 0];
             } else {
-                $merchant_intercept = unserialize($merchant_intercept);
+                $intercept_cfg = unserialize($intercept_cfg);
             }
             Tpl::output('merchant', $merchant);
             Tpl::output('card_state', mtopcard\CardState);
-            Tpl::output('merchant_intercept', $merchant_intercept);
+            Tpl::output('intercept', $intercept_cfg);
             Tpl::showpage('merchant.intercept');
         }
     }
@@ -1115,7 +1115,7 @@ class merchantControl extends SystemControl
             \refill\Quality::SlowSeventyTwo,\refill\Quality::Fastest
         ];
         if (chksubmit()) {
-            $qualities = $merchant_retry_times = [];
+            $qualities = $retry_times_cfg = [];
             foreach ($qualitys as $quality) {
                 $secs_key = "{$quality}-secs";
                 $times_key = "{$quality}-times";
@@ -1123,14 +1123,14 @@ class merchantControl extends SystemControl
                     $qualities[$quality] = ['secs' => $_POST[$secs_key], 'times' => $_POST[$times_key]];
                 }
             }
-            $merchant_retry_times['qualities'] = $qualities;
+            $retry_times_cfg['qualities'] = $qualities;
             $ratio = $_POST['ratio'] ?? 0;
             $period = $_POST['period'] ?? 0;
-            $merchant_retry_times['lower_ratio'] = ['ratio' => $ratio, 'period' => $period];
-            $merchant_retry_times['opened'] = $_POST['opened'];
+            $retry_times_cfg['lower_ratio'] = ['ratio' => $ratio, 'period' => $period];
+            $retry_times_cfg['opened'] = $_POST['opened'];
 
-            $merchant_retry_times = serialize($merchant_retry_times);
-            $resp = $model_merchant->editMerchant(['merchant_retry_times' => $merchant_retry_times], ['mchid' => $mchid]);
+            $retry_times_cfg = serialize($retry_times_cfg);
+            $resp = $model_merchant->editMerchant(['retry_times_cfg' => $retry_times_cfg], ['mchid' => $mchid]);
             if ($resp) {
                 showMessage('操作成功', 'index.php?act=merchant&op=merchant');
             } else {
@@ -1140,16 +1140,16 @@ class merchantControl extends SystemControl
             foreach ($qualitys as $value) {
                 $quality[$value] = $this->quality_format($value,mtopcard\ChinaMobileCard);
             }
-            $merchant_retry_times = $merchant['merchant_retry_times'];
-            if (empty($merchant_retry_times)) {
-                $merchant_retry_times = [];
+            $retry_times_cfg = $merchant['retry_times_cfg'];
+            if (empty($retry_times_cfg)) {
+                $retry_times_cfg = [];
             } else {
-                $merchant_retry_times = unserialize($merchant_retry_times);
+                $retry_times_cfg = unserialize($retry_times_cfg);
             }
 
             Tpl::output('merchant', $merchant);
             Tpl::output('quality', $quality);
-            Tpl::output('merchant_retry_times', $merchant_retry_times);
+            Tpl::output('retry_times', $retry_times_cfg);
             Tpl::showpage('merchant.retry.times');
         }
     }

admin/control/orderstats.php

@@ -41,7 +41,7 @@ class orderstatsControl extends SystemControl
             }
         }
         
-        $total_stats = $this->stats($stats_list);
+        $total_stats = $this->stats($condition);
         $order_time_type_text = ['notify_time' => '回调时间', 'order_time' => '下单时间'];
         Tpl::output('total_stats', $total_stats);
         Tpl::output('stats_list', $stats_list);
@@ -72,7 +72,7 @@ class orderstatsControl extends SystemControl
         }
         $stats_list = $this->all_orderstats_data($condition);
 
-        $total_stats = $this->stats($stats_list);
+        $total_stats = $this->stats($condition);
         $stats = $total_stats[$_GET['order_time_type']];
         if(empty($stats)) {
             $stats = $total_stats['notify_time'];
@@ -83,25 +83,21 @@ class orderstatsControl extends SystemControl
         exit;
     }
 
-    private function stats($stats_list): array
+    private function stats($condition)
     {
         $order_time_type = ['notify_time','order_time'];
         foreach ($order_time_type as $type){
-            $success_count_total = $success_refill_amounts_total = $success_mch_amounts_total = $success_channel_amounts_total = $profit_amounts_total = 0;
-            foreach ($stats_list as $stats) {
-                if($stats['order_time_type'] != $type) continue;
-                $success_count_total += $stats['success_count'];
-                $success_refill_amounts_total += $stats['success_refill_amounts'];
-                $success_mch_amounts_total += $stats['success_mch_amounts'];
-                $success_channel_amounts_total += $stats['success_channel_amounts'];
-                $profit_amounts_total += $stats['profit_amounts'];
-            }
+            $condition['order_time_type'] = $type;
+            $stats = Model('')->table('refill_stats')
+                ->field('sum(success_count) as success_count,sum(success_refill_amounts) as success_refill_amounts,sum(success_mch_amounts) as success_mch_amounts,sum(success_channel_amounts) as success_channel_amounts,sum(profit_amounts) as profit_amounts')
+                ->where($condition)
+                ->find();
             $total_stats[$type] = [
-                'success_count_total' => $success_count_total,
-                'success_refill_amounts_total' => ncPriceFormat($success_refill_amounts_total),
-                'success_mch_amounts_toatl' => ncPriceFormat($success_mch_amounts_total),
-                'success_channel_amounts_total' => ncPriceFormat($success_channel_amounts_total),
-                'profit_amounts_total' => ncPriceFormat($profit_amounts_total)
+                'success_count_total' => $stats['success_count'],
+                'success_refill_amounts_total' => ncPriceFormat($stats['success_refill_amounts']),
+                'success_mch_amounts_toatl' => ncPriceFormat($stats['success_mch_amounts']),
+                'success_channel_amounts_total' => ncPriceFormat($stats['success_channel_amounts']),
+                'profit_amounts_total' => ncPriceFormat($stats['profit_amounts'])
             ];
         }
         return $total_stats;

admin/control/refill_successful.php

@@ -114,6 +114,7 @@ class refill_successfulControl extends SystemControl
 
     public function merchant_ratiosOp()
     {
+        //0:成功单,1:失败单,2:成功率
         $ins = Cache::getInstance('cacheredis');
         $json = $ins->get_org('merchant_card_type_ratios');
         $data = json_decode($json);
@@ -132,15 +133,17 @@ class refill_successfulControl extends SystemControl
                     $result[$mchid]['time_out'] = $this->elapse_time($value['time_out']);
 
                     foreach ($card_types as $type) {
-                        $stats[$type]['success'] += $data[$mchid][$type][3600][0];
-                        $stats[$type]['ratio'] += $data[$mchid][$type][3600][2];
+                        if($data[$mchid][$type][3600][0] + $data[$mchid][$type][3600][1] > 0) {
+                            $stats[$type]['success'] += $data[$mchid][$type][3600][0];
+                            $stats[$type]['ratio'] += $data[$mchid][$type][3600][2];
+                            $stats[$type]['count'] += 1;
+                        }
                     }
                 }
             }
             Tpl::output('stats', $stats);
             Tpl::output('count', count($result));
         }
-
         Tpl::output('list', $result);
         Tpl::showpage('merchant.ratios');
     }

admin/templates/default/merchant.index.php

@@ -80,7 +80,7 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
                 <th class="align-center">上次登录日期</th>
                 <th class="align-center">加款操作</th>
                 <th class="align-center">机构操作</th>
-<!--                <th class="align-center">充值操作</th>-->
+                <th class="align-center">充值操作（暂不生效）</th>
                 <th class="align-center"><?php echo $lang['operation']; ?></th>
             </tr>
             </thead>
@@ -134,15 +134,15 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
                                 <a href="index.php?act=merchant&op=changeState&state=1&mchid=<?php echo $v['mchid'] ?>" style="color: green">启用机构</a>
                             <?php }?>
                         </td>
-<!--                        <td class="align-center">-->
-<!--                            <a href="index.php?act=merchant&op=merchant_retry_times&mchid=--><?php //echo $v['mchid'] ?><!--">-->
-<!--                                质量设置-->
-<!--                            </a>-->
-<!--                            |-->
-<!--                            <a href="index.php?act=merchant&op=merchant_intercept&mchid=--><?php //echo $v['mchid'] ?><!--">-->
-<!--                                拦截设置-->
-<!--                            </a>-->
-<!--                        </td>-->
+                        <td class="align-center">
+                            <a href="index.php?act=merchant&op=merchant_retry_times&mchid=<?php echo $v['mchid'] ?>">
+                                质量设置
+                            </a>
+                            |
+                            <a href="index.php?act=merchant&op=merchant_intercept&mchid=<?php echo $v['mchid'] ?>">
+                                拦截设置
+                            </a>
+                        </td>
                         <td class="align-center w200">
                             <a href="index.php?act=merchant&op=price&quality=1&mchid=<?php echo $v['mchid'] ?>">通道费率设置</a>
                             |

admin/templates/default/merchant.intercept.php

@@ -24,15 +24,15 @@
             </tr>
             <tr class="noborder">
                 <td colspan="2" class="required"><label for="name">是否拦截转网：</label>
-                <input type="radio" name="is_transfer" value="1" <?php if($output['merchant_intercept']['is_transfer'] == 1){ echo 'checked'; }?>>是
-                <input type="radio" name="is_transfer" value="0" <?php if($output['merchant_intercept']['is_transfer'] == 0){ echo 'checked'; }?>>否
+                <input type="radio" name="is_transfer" value="1" <?php if($output['intercept']['is_transfer'] == 1){ echo 'checked'; }?>>是
+                <input type="radio" name="is_transfer" value="0" <?php if($output['intercept']['is_transfer'] == 0){ echo 'checked'; }?>>否
             </td>
             </tr>
             <tr class="noborder">
                 <td colspan="2" class="required"><label for="name">拦截号码状态：</label>
                     <?php foreach ($output['card_state'] as $key => $value){?>
                     <input type="checkbox" name="card_states[]" value="<?php echo $key;?>"
-                        <?php if( !empty($output['merchant_intercept']['card_states']) && in_array($key, $output['merchant_intercept']['card_states'])){ echo 'checked'; }?>
+                        <?php if( !empty($output['intercept']['card_states']) && in_array($key, $output['intercept']['card_states'])){ echo 'checked'; }?>
                         ><?php echo $value;?>
                     <?php }?>
             </td>

admin/templates/default/merchant.retry.times.php

@@ -43,8 +43,8 @@
             </tr>
             <tr class="noborder">
                 <td colspan="2" class="required"><label class="validation" for="name">开启状态：</label>
-                开启<input type="radio" class="open" name="opened" value="1" <?php if($output['merchant_retry_times']['opened'] == 1){ echo 'checked'; }?>>
-                关闭<input type="radio" class="open" name="opened" value="0" <?php if($output['merchant_retry_times']['opened'] == 0){ echo 'checked'; }?>>
+                开启<input type="radio" class="open" name="opened" value="1" <?php if($output['retry_times']['opened'] == 1){ echo 'checked'; }?>>
+                关闭<input type="radio" class="open" name="opened" value="0" <?php if($output['retry_times']['opened'] == 0){ echo 'checked'; }?>>
             </td>
             </tr>
             <tr class="noborder">
@@ -53,9 +53,9 @@
             </tr>
             <tr class="noborder">
             <td colspan="2" class="required"><label style="margin-left: 16px;" for="name">成功率：</label>
-            <input type="text" name="ratio" value="<?php echo $output['merchant_retry_times']['lower_ratio']['ratio'] ?? 0;?>" id="success">
+            <input type="text" name="ratio" value="<?php echo $output['retry_times']['lower_ratio']['ratio'] ?? 0;?>" id="success">
             <label style="margin-left: 15px;" for="name">时间期限（秒）：</label>
-            <input type="text" name="period" value="<?php echo $output['merchant_retry_times']['lower_ratio']['period'] ?? 0;?>" id="term">
+            <input type="text" name="period" value="<?php echo $output['retry_times']['lower_ratio']['period'] ?? 0;?>" id="term">
 
             </td>
             </tr>
@@ -68,9 +68,9 @@
                 <td colspan="2" class="required">
                     <label class="seconds" style="margin-left: 16px;display:inline-block;  margin-right: 16px; min-width: 38px" for="name"><?php echo $value;?>：</label>
                     <label for="name">秒数：</label>
-                    <input type="text" name="<?php echo "{$key}-secs";?>" value="<?php echo $output['merchant_retry_times']['qualities'][$key]['secs'] ?? 0;?>" class="secondss">
+                    <input type="text" name="<?php echo "{$key}-secs";?>" value="<?php echo $output['retry_times']['qualities'][$key]['secs'] ?? 0;?>" class="secondss">
                     <label style="margin-left: 15px;" for="name">重试次数：</label>
-                    <input type="text" name="<?php echo "{$key}-times";?>" value="<?php echo $output['merchant_retry_times']['qualities'][$key]['times'] ?? 0;?>" class="frequency">
+                    <input type="text" name="<?php echo "{$key}-times";?>" value="<?php echo $output['retry_times']['qualities'][$key]['times'] ?? 0;?>" class="frequency">
                 </td>
             </tr>
             <?php }?>

data/config/win/refill.ini.php

@@ -2691,17 +2691,17 @@ $chizeng_phone = ['name' => 'chizeng', 'store_id' => 133, 'qualitys' => '1',
 //            ['goods_id' => 7149, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinatelecom']
 //        ],
         50 => [
-            ['goods_id' => 7150, 'price' => 47.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7150, 'price' => 47.45, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7150, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7150, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7151, 'price' => 95.2, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7151, 'price' => 94.9, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7151, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7151, 'price' => 95, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7152, 'price' => 190.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7152, 'price' => 189.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7152, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7152, 'price' => 190, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
@@ -2960,6 +2960,11 @@ $config['merchant_retry_times'] = [
     10217 => [ //天采-混充50m
         'qualities' => [1 => ['secs' => 2400, 'times' => 200], 2 => ['secs' => 600, 'times' => 20]],
         'lower_ratio' => ['ratio' => 0.85, 'period' => 3600], 'profit_ratio' => 0.003
+    ],
+
+    10231 => [ //汇通-普充2号
+        'qualities' => [1 => ['secs' => 1000, 'times' => 200], 2 => ['secs' => 200, 'times' => 20]],
+        'lower_ratio' => ['ratio' => 0.6, 'period' => 3600], 'profit_ratio' => 0.003
     ]
 ];
 

data/config/xyz/refill.ini.php

@@ -2691,17 +2691,17 @@ $chizeng_phone = ['name' => 'chizeng', 'store_id' => 133, 'qualitys' => '1',
 //            ['goods_id' => 7149, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinatelecom']
 //        ],
         50 => [
-            ['goods_id' => 7150, 'price' => 47.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7150, 'price' => 47.45, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7150, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7150, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7151, 'price' => 95.2, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7151, 'price' => 94.9, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7151, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7151, 'price' => 95, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7152, 'price' => 190.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7152, 'price' => 189.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7152, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7152, 'price' => 190, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],

data/config/xyzadm/refill.ini.php

@@ -2691,17 +2691,17 @@ $chizeng_phone = ['name' => 'chizeng', 'store_id' => 133, 'qualitys' => '1',
 //            ['goods_id' => 7149, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinatelecom']
 //        ],
         50 => [
-            ['goods_id' => 7150, 'price' => 47.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7150, 'price' => 47.45, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7150, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7150, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7151, 'price' => 95.2, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7151, 'price' => 94.9, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7151, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7151, 'price' => 95, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7152, 'price' => 190.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7152, 'price' => 189.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7152, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7152, 'price' => 190, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],