dev

admin/templates/default/merchant.refill.balance.php

@@ -206,55 +206,7 @@
             </tbody>
         </table>
     </form>
-    <!--    <table class="table tb-type2" id="prompt">-->
-    <!--        <tbody>-->
-    <!--        <tr class="space odd">-->
-    <!--            <th colspan="12"><div class="title">-->
-    <!--                    <h5>总量统计</h5>-->
-    <!--                    <span class="arrow"></span></div></th>-->
-    <!--        </tr>-->
-    <!--        <tr>-->
-    <!--            <td class="row_q">-->
-    <!--                <ul class="row_w">-->
-    <!--                    <li>回调日期统计</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计成功订单量： --><?php //echo $output['total_stats']['notify_time']['success_count_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计充值中订单量： --><?php //echo $output['total_stats']['notify_time']['send_count_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计成功订单金额：--><?php //echo $output['total_stats']['notify_time']['success_refill_amounts_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计下游扣款金额：--><?php //echo $output['total_stats']['notify_time']['success_mch_amounts_toatl'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计上游扣款金额：--><?php //echo $output['total_stats']['notify_time']['success_channel_amounts_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                </ul>-->
-    <!--                <ul>-->
-    <!--                    <li>下单日期统计</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计成功订单量： --><?php //echo $output['total_stats']['order_time']['success_count_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计充值中订单量： --><?php //echo $output['total_stats']['order_time']['send_count_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计成功订单金额：--><?php //echo $output['total_stats']['order_time']['success_refill_amounts_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计下游扣款金额：--><?php //echo $output['total_stats']['order_time']['success_mch_amounts_toatl'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计上游扣款金额：--><?php //echo $output['total_stats']['order_time']['success_channel_amounts_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                </ul>-->
-    <!--            </td>-->
-    <!--        </tr>-->
-    <!--        </tbody>-->
-    <!--    </table>-->
+
 
     <script>
         var stats_list_data = <?php echo json_encode($output['stats_list'])  ?>
@@ -336,14 +288,6 @@
                                         <a style="color:#0D93BF;" href="index.php?act=orderstats&op=refill_balance_confirm&balance_id=<?php echo $v['balance_id']; ?>" data-index="<?php echo $k ?>" class="checkBtn">确认</a>
                                     <?php } ?>
                                 </td>
-                                <!--                        <td class="align-center w200">-->
-                                <!--                            <a href="index.php?act=merchant&op=OrderStatsReload&stat_id=--><?php //echo $v['stat_id'];
-                                                                                                                                ?>
-                                <!--">重新统计</a>-->
-                                <!--                            |<a href="index.php?act=merchant&op=OrderStatsCheck&stat_id=--><?php //echo $v['stat_id'] 
-                                                                                                                                ?>
-                                <!--">编辑</a>-->
-                                <!--                        </td>-->
                             </tr>
                         <?php } ?>
                     <?php } else { ?>

admin/templates/default/provider.refill.balance.php

@@ -197,55 +197,7 @@
             </tbody>
         </table>
     </form>
-    <!--    <table class="table tb-type2" id="prompt">-->
-    <!--        <tbody>-->
-    <!--        <tr class="space odd">-->
-    <!--            <th colspan="12"><div class="title">-->
-    <!--                    <h5>总量统计</h5>-->
-    <!--                    <span class="arrow"></span></div></th>-->
-    <!--        </tr>-->
-    <!--        <tr>-->
-    <!--            <td class="row_q">-->
-    <!--                <ul class="row_w">-->
-    <!--                    <li>回调日期统计</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计成功订单量： --><?php //echo $output['total_stats']['notify_time']['success_count_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计充值中订单量： --><?php //echo $output['total_stats']['notify_time']['send_count_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计成功订单金额：--><?php //echo $output['total_stats']['notify_time']['success_refill_amounts_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计下游扣款金额：--><?php //echo $output['total_stats']['notify_time']['success_mch_amounts_toatl'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计上游扣款金额：--><?php //echo $output['total_stats']['notify_time']['success_channel_amounts_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                </ul>-->
-    <!--                <ul>-->
-    <!--                    <li>下单日期统计</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计成功订单量： --><?php //echo $output['total_stats']['order_time']['success_count_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计充值中订单量： --><?php //echo $output['total_stats']['order_time']['send_count_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计成功订单金额：--><?php //echo $output['total_stats']['order_time']['success_refill_amounts_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计下游扣款金额：--><?php //echo $output['total_stats']['order_time']['success_mch_amounts_toatl'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计上游扣款金额：--><?php //echo $output['total_stats']['order_time']['success_channel_amounts_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                </ul>-->
-    <!--            </td>-->
-    <!--        </tr>-->
-    <!--        </tbody>-->
-    <!--    </table>-->
+
     <script>
         var stats_list_data = <?php echo json_encode($output['stats_list'])  ?>
     </script>

admin/templates/default/system.refill.balance.php

@@ -142,7 +142,7 @@
                     </td>
                     <td>
                         <a href="javascript:void(0);" id="create" class="btn">
-                            <span>新建</span>
+                            <span>新建全部</span>
                         </a>
                     </td>
                 </tr>
@@ -156,55 +156,7 @@
             </tbody>
         </table>
     </form>
-    <!--       <table class="table tb-type2" id="prompt">-->
-    <!--        <tbody>-->
-    <!--          <tr class="space odd">-->
-    <!--            <th colspan="12"><div class="title">-->
-    <!--                <h5>总量统计</h5>-->
-    <!--                <span class="arrow"></span></div></th>-->
-    <!--          </tr>-->
-    <!--          <tr>-->
-    <!--            <td class="row_q">-->
-    <!--                <ul class="row_w">-->
-    <!--                    <li>回调日期统计</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计成功订单量： --><?php //echo $output['total_stats']['notify_time']['success_count_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计成功订单金额：--><?php //echo $output['total_stats']['notify_time']['success_refill_amounts_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计下游扣款金额：--><?php //echo $output['total_stats']['notify_time']['success_mch_amounts_toatl'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计上游扣款金额：--><?php //echo $output['total_stats']['notify_time']['success_channel_amounts_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计利润：--><?php //echo $output['total_stats']['notify_time']['profit_amounts_total'] ?? 0
-                                                                            ?>
-    <!--</li>-->
-    <!--                </ul>-->
-    <!--                <ul>-->
-    <!--                    <li>下单日期统计</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计成功订单量： --><?php //echo $output['total_stats']['order_time']['success_count_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计成功订单金额：--><?php //echo $output['total_stats']['order_time']['success_refill_amounts_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计下游扣款金额：--><?php //echo $output['total_stats']['order_time']['success_mch_amounts_toatl'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计上游扣款金额：--><?php //echo $output['total_stats']['order_time']['success_channel_amounts_total'] ?? 0
-                                                                                ?>
-    <!--</li>-->
-    <!--                    <li class="lineLi" style="color:#000;">总计利润：--><?php //echo $output['total_stats']['order_time']['profit_amounts_total'] ?? 0
-                                                                            ?>
-    <!--</li>-->
-    <!--                </ul>-->
-    <!--            </td>-->
-    <!--          </tr>-->
-    <!--        </tbody>-->
-    <!--      </table>-->
+
     <div>
         <script>
             var stats_list_data = <?php echo json_encode($output['stats_list'])  ?>

helper/statistics/refill_balance.php

@@ -93,7 +93,17 @@ class refill_balance
                 $time_types = $this->find_timetypes($type,$cid);
                 foreach ($time_types as $time_type)
                 {
-                    [$parent_id,$start] = $this->find_parent($type, $cid, $time_type);
+                    [$parent_id,$start,$confirmed] = $this->find_parent($type, $cid, $time_type);
+                    if($start == $end) {
+                        Log::record("type=$type cid=$cid, time_type=$time_type has been stat.",Log::DEBUG);
+                        continue;
+                    }
+
+                    if($parent_id > 0 && $confirmed == false) {
+                        Log::record("type=$type cid=$cid, time_type=$time_type had not confirmed.",Log::DEBUG);
+                        continue;
+                    }
+
                     $ret = $this->add_balance($type, $cid, $start, $end, $time_type, $parent_id);
                     if(!$ret) {
                         Log::record("type=$type cid=$cid, time_type=$time_type fail",Log::ERR);
@@ -106,11 +116,13 @@ class refill_balance
     private function find_parent($type, $cid, $time_type)
     {
         $mod = Model('refill_balance');
-        $cond = ['type' => $type, 'cid' => $cid, 'time_type' => $time_type, 'confirmed' => 1];
+        $cond = ['type' => $type, 'cid' => $cid, 'time_type' => $time_type];
+
+        $item = $mod->field('balance_id,end_stamp,confirmed')->where($cond)->order('end_stamp desc')->find();
 
-        $item = $mod->field('balance_id,end_stamp')->where($cond)->order('end_stamp desc')->find();
+        $confirmed = boolval($item['confirmed']);
 
-        return [intval($item['balance_id']),intval($item['end_stamp'])];
+        return [intval($item['balance_id']), intval($item['end_stamp']), $confirmed];
     }
 
     private function refill_time_finder($type, $cid, $start,$end)