Merge branch 'feature/group_type' of 47.111.118.107:wmtx/platform into dev

Application/Admin/Controller/AjaxController.class.php

@@ -245,7 +245,7 @@ class AjaxController extends ThinkController{
         $withdraw_number = $_REQUEST['withdraw_number'];
 
         $data = M("withdraw","tab_")
-            ->field("widthdraw_number,promote_account,tab_promote_company.id as company_id,company_name,settlement_type,mobile_phone,real_name,bank_card,account_openin,address,game_ratio,bank_account")
+            ->field("widthdraw_number,promote_account,tab_promote_company.id as company_id,company_name,tab_withdraw.settlement_type,mobile_phone,real_name,bank_card,account_openin,address,game_ratio,bank_account")
             ->join("left join tab_promote on tab_withdraw.promote_id=tab_promote.id")
             ->join("left join tab_promote_company on tab_promote.company_id=tab_promote_company.id")
             ->where(['widthdraw_number'=>$withdraw_number])
@@ -312,9 +312,22 @@ class AjaxController extends ThinkController{
 
 //        dump($statementData);die();
         } else {
+
+            $data['address'] = json_decode($data['address'],1);
+//            dd($data['address']);
+            $address = '';
+            if (is_array($data['address'])) {
+                foreach($data['address'] as $key => $value) {
+                    $address = $address.' '.$value;
+                }
+            }
+            $data['address'] = $address;
+
             if (is_array($data['game_ratio'])) {
                 foreach ($data['game_ratio'] as $key => &$value) {
 
+
+
                     foreach ($value as $k => &$v) {
                         $v['game_name'] = get_gamename($key);
                     }

Application/Admin/Controller/PlatformController.class.php

@@ -697,7 +697,7 @@ class PlatformController extends ThinkController
         // dd($data);
         unset($map['tp1.id']);
         unset($map['tp1.chain']);
-        unset($tmap['tp1.chain']);
+        unset($tmap['tp1.id']);
         unset($tmap['tp1.chain']);
         $map['s.promote_id'] = 0;
         $tmap['s.promote_id'] = 0;

Application/Admin/View/StatementMangement/createDownstreamOrder.html

@@ -285,9 +285,9 @@
   function eventnew(){
       $(".tax").off("blur");
       $(".tax").on("blur", function() {
-        var lastNum = $(this).parent().next().text();
+        var lastNum = (parseFloat($(this).parent().next().text())).toFixed(2);
         $(this).parent().next().text(($(this).parent().next().attr('data-value')*(1-$(this).val()/100)).toFixed(2));
-        var nowNum = $(this).parent().next().text();
+        var nowNum = (parseFloat($(this).parent().next().text())).toFixed(2);
         console.log((nowNum-lastNum))
           $(".sumAll").text((parseFloat($(".sumAll").text())+(nowNum-lastNum)).toFixed(2));
     });
@@ -296,7 +296,7 @@
     $(".forfeit").on("blur", function() {
       var lastNumber = $(this).parent().next().next().next().text();
 
-      $(this).parent().next().next().next().text($(this).val());
+      $(this).parent().next().next().next().text(parseFloat($(this).val()).toFixed(2));
       $(".sumAmount").text($(".sumAmount").attr("data-value")-$(this).val());
 
       $(".sumAll").text((parseFloat($(".sumAll").text())+parseFloat(lastNumber)-parseFloat($(this).val())).toFixed(2));

Application/Admin/View/StatementMangement/edit.html

@@ -286,9 +286,9 @@
   function eventnew(){
       $(".tax").off("blur");
       $(".tax").on("blur", function() {
-        var lastNum = $(this).parent().next().text();
+        var lastNum = (parseFloat($(this).parent().next().text())).toFixed(2);
         $(this).parent().next().text(($(this).parent().next().attr('data-value')*(1-$(this).val()/100)).toFixed(2));
-        var nowNum = $(this).parent().next().text();
+        var nowNum = (parseFloat($(this).parent().next().text())).toFixed(2);
         console.log((nowNum-lastNum))
         $(".sumAll").text((parseFloat($(".sumAll").text())+(nowNum-lastNum)).toFixed(2));
       });
@@ -297,8 +297,8 @@
     $(".forfeit").on("blur", function() {
       var lastNumber = $(this).parent().next().next().next().text();
 
-      $(this).parent().next().next().next().text($(this).val());
+      $(this).parent().next().next().next().text(parseFloat($(this).val()).toFixed(2));
-      $(".sumAmount").text($(".sumAmount").attr("data-value")-$(this).val());
+      $(".sumAmount").text(($(".sumAmount").attr("data-value")-$(this).val()).toFixed(2));
 
       $(".sumAll").text((parseFloat($(".sumAll").text())+parseFloat(lastNumber)-parseFloat($(this).val())).toFixed(2));
 

Application/Admin/View/StatementMangement/lists.html

@@ -322,11 +322,11 @@
                 var str = '<option value="">对账类型</option>';
                   console.log($("#company_id option:selected").attr('company-type'))
                   if ($("#company_id option:selected").attr('company-type') == '1') {
-                      str += '                    <option value="1" selected=selected>公会对账单</option>\n' +
+                      str += '                    <option value="1" selected=selected>下游游对账单</option>\n' +
-                        '                    <option value="0">CP对账单</option>';
+                        '                    <option value="0">上游对账单</option>';
                   } else if ($("#company_id option:selected").attr('company-type') == '0') {
-                      str += '                    <option value="1">公会对账单</option>\n' +
+                      str += '                    <option value="1">下游对账单</option>\n' +
-                        '                    <option value="0" selected=selected>CP对账单</option>';
+                        '                    <option value="0" selected=selected>上游对账单</option>';
                   }
 
 

Data/update.sql

@@ -947,7 +947,7 @@ ALTER TABLE tab_partner ADD  `opening_bank` varchar(128) DEFAULT NULL COMMENT '
 
 -- 推广公会归属管理 2020-1-1 刘伟文
 CREATE TABLE `tab_promote_belong` (
-  `id` int(11) NOT NULL,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `promote_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广员id',
   `verify_status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '审核状态:0-待审核；1-审核通过；2-审核拒绝',
   `company_belong` tinyint(1) NOT NULL DEFAULT '0' COMMENT '工会归属：0-内团；1-外团',