Merge remote-tracking branch 'origin/dev' into dev

Application/Admin/Controller/FinanceController.class.php

@@ -1001,12 +1001,12 @@ class FinanceController extends ThinkController
         } elseif (empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) {
             $time = array('elt', (strtotime($_REQUEST['timeend']) + 86399));
         }
-        setPowerPromoteIds($map);
+//        setPowerPromoteIds($map);
 
         //获取现金充值
         $cashStatistics = M('spend', 'tab_')
             ->field('pay_way,"" as pay_type,SUM(pay_amount) AS pay_amount')
-            ->where(['pay_status' => 1,'pay_way'=>['egt',1],'pay_time'=>$time,'promote_id'=>$map['promote_id']])
+            ->where(['pay_status' => 1,'pay_way'=>['egt',1],'pay_time'=>$time])
             ->group('pay_way')
             ->select();
         foreach ($cashStatistics as $key => $value) {
@@ -1022,7 +1022,6 @@ class FinanceController extends ThinkController
             'tab_deposit.pay_way' => ['gt', 0],
             'extend'=>['eq','']
             ,'tab_deposit.create_time'=>$time,
-            'tab_deposit.promote_id'=>$map['promote_id']
         ])->field('tab_deposit.pay_way,"" as pay_type, SUM(tab_deposit.pay_amount) AS balance')
             ->join("inner join tab_pay_info on tab_pay_info.order_id=tab_deposit.pay_order_number")
             ->group('tab_deposit.pay_way')
@@ -1061,8 +1060,7 @@ class FinanceController extends ThinkController
             ->where([
                 'pay_status' => 1,
                 'pay_way' => ['gt', 0],
-                'create_time'=>$time,
-                'promote_id'=>$map['promote_id']
+                'create_time'=>$time
             ])
             ->group('pay_way')
             ->select();
@@ -1087,8 +1085,7 @@ class FinanceController extends ThinkController
             ->field("pay_way,'' as pay_type,sum(real_amount) as pay_amount")
             ->where([
                     'order_status'=>['egt',1],
-                    'pay_way'=>['egt',1],'pay_time'=>$time,
-                'promote_id'=>$map['promote_id']
+                    'pay_way'=>['egt',1],'pay_time'=>$time
                 ])
             ->group('pay_way')
             ->select();
@@ -1118,8 +1115,7 @@ class FinanceController extends ThinkController
                 'pay_status'=>1,
                 'pay_way'=>['egt',1],
                 'pay_source'=>0,
-                'create_time'=>$time,
-                'promote_id'=>$map['promote_id']
+                'create_time'=>$time
             ])
             ->group('pay_way')
             ->select();

Application/Admin/Controller/RepairController.class.php

@@ -166,6 +166,17 @@ class RepairController extends ThinkController {
                         M($tab, 'tab_')->commit();
                     }
                 } else { // deposit
+                    $user = M("user","tab_");
+                    $r = $user->where("id=".$order['user_id'])->setInc("balance", $order['pay_amount']);
+                    if ($r === false) {
+                        M($tab, 'tab_')->rollback();
+                        $this->ajaxReturn(array('status'=>1,'msg'=>'数据有误.'));
+                    }
+                    $r = $user->where("id=".$order['user_id'])->setInc("cumulative", $order['pay_amount']);
+                    if ($r === false) {
+                        M($tab, 'tab_')->rollback();
+                        $this->ajaxReturn(array('status'=>1,'msg'=>'数据有误..'));
+                    }
                     M('spend', 'tab_')->commit();
                 }
                 

Application/Admin/View/FinancePromote/gameStatistics.html

@@ -246,7 +246,7 @@
             shadeClose: true,
             shade: 0.8,
             area: ['70%', '80%'],
-            content: [url, 'no']
+            content: url
         });
     });
 
@@ -288,20 +288,6 @@
           $("#search").click();
         }
       });
-      // $(".ljcz").click(function(){
-      //   var id = $(this).attr('data-value');
-      //   var game_name = "{:I('game_name')}";
-      //   var server_name = "{:I('server_id')}";
-      //   layer.open({
-      //     type: 2,
-      //     title: '游戏消费记录',
-      //     shadeClose: true,
-      //     shade: 0.8,
-      //     area: ['70%', '80%'],
-      //     content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
-      //   });
-      // });
-
       function get_game_list()
       {
         var game_name = "{:I('game_name')}";
@@ -358,16 +344,16 @@
             // console.log(str);
             $("#partner_id").empty();
             $("#partner_id").append(str);
-            // $("#server_id").select2();
+            $("#partner_id").select2();
 
           }
         })
       }
-      $("#game_name, #game_type").change(function(){
-        get_partnet_list();
-      });
+      // $("#game_name, #game_type").change(function(){
+      //   get_partnet_list();
+      // });
 
-      $("#game_name").change();
+      // $("#game_name").change();
     })
   </script>
 </block>

Application/Admin/View/FinancePromote/index.html

@@ -223,8 +223,9 @@
                                 <td>
                                     <a
                                         href="{:U('FinancePromote/gameStatistics',array_merge(['promote_id'=>$data['p_id'],'company_id'=>$data['company_id'],'promote_type'=>1],I('get.'),['p'=>1]))}">游戏查看</a>
-                                    <a
-                                        href="{:U('FinancePromote/promoteUser',array_merge(['promote_id'=>$data['p_id'],'company_id'=>$data['company_id']],I('get.'),['p'=>1]))}">渠道查看</a>
+                                    <if condition="$data['p_id'] GT 0">
+                                    <a href="{:U('FinancePromote/promoteUser',array_merge(['promote_id'=>$data['p_id'],'company_id'=>$data['company_id']],I('get.'),['p'=>1]))}">渠道查看</a>
+                                    </if>
                                 </td>
                             </tr>
                         </volist>
@@ -306,7 +307,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: [url, 'no']
+                    content: url
                 });
             });
             $(".select_gallery").select2();

Data/update.sql

@@ -894,3 +894,16 @@ ADD COLUMN `event_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '事件是否通
 -- 菜单添加补单记录
 INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('补单记录管理', 137, 0, 'BehaviorLog/singleSupplement', 0, '', '游戏订单', 0, 1);
 
+
+-- 增加通知到账 tping
+CREATE TABLE `tab_repair_pay` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `admin_id` int(11) NOT NULL DEFAULT '0',
+  `admin_name` varchar(255) NOT NULL DEFAULT '',
+  `pay_order_number` varchar(255) NOT NULL DEFAULT '',
+  `ip` varchar(255) NOT NULL DEFAULT '',
+  `tab` varchar(255) NOT NULL DEFAULT '' COMMENT '订单表：spend,deposit',
+  `create_time` int(11) NOT NULL DEFAULT '0',
+  `type` int(11) DEFAULT '0' COMMENT '0通知到账 1补单记录',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COMMENT='通知到账补单';

README.md

@@ -1 +1,5 @@
-# cq_new_sy4.0_sdk_cha
+<p align="center"><img src="https://wmtx-test.oss-cn-hangzhou.aliyuncs.com/icon/5da6b8c08b69a.png" width="400"></p>
+
+## 天下游戏平台
+
+天下游戏平台，万盟天下版权所有。