From aa7e6fa0ec820ea3785948e0cf4f19cc89538eb6 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 28 Feb 2020 09:54:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8E=E7=BC=96=E8=BE=91=E5=87=8F=E5=B0=91?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/PromoteCompany/add.html | 24 +++++++++---------- .../Admin/View/PromoteCompany/edit.html | 22 ++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Application/Admin/View/PromoteCompany/add.html b/Application/Admin/View/PromoteCompany/add.html index 7c71459f6..4a03c7299 100644 --- a/Application/Admin/View/PromoteCompany/add.html +++ b/Application/Admin/View/PromoteCompany/add.html @@ -94,7 +94,7 @@ - *是否签署合同: + 是否签署合同:
- *银行卡号： + 银行卡号： @@ -151,13 +151,13 @@ --> - *收款银行： + 收款银行： - *开户网点： + 开户网点： @@ -287,18 +287,18 @@ var obj = { "company_name":["required","推广公司名称不允许为空"], "platform_name":["nocheck"], - "contact_begin":["date","合同开始时间不能为空"], - "contact_end":["date","合同结束时间不能为空"], + // "contact_begin":["date","合同开始时间不能为空"], + // "contact_end":["date","合同结束时间不能为空"], "fax_ratio":["number","开票税率必须是数字，如果无此项请填0"], "company_type":["required","公司性质不能为空","select"], - "is_sign_contact":["required","是否签署合同项不能为空","select"], + // "is_sign_contact":["required","是否签署合同项不能为空","select"], "company_belong":["required","团体归属不能为空","select"], "settlement_contact":["required","结算联系人不能为空"], "contact_phone":["phone","联系人电话格式不对或不能为空"], - "address":["required","联系人地址不能为空"], - "bank_card":["bankid","银行卡格式错误或不能为空"], - "bank_name":["required","银行名称不能为空"], - "bank_address":["required","银行开户网点不能为空"], + // "address":["required","联系人地址不能为空"], + // "bank_card":["bankid","银行卡格式错误或不能为空"], + // "bank_name":["required","银行名称不能为空"], + // "bank_address":["required","银行开户网点不能为空"], "content":["nocheck"], "status":["nocheck","","radio"] } diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html index 015297b55..733136c13 100644 --- a/Application/Admin/View/PromoteCompany/edit.html +++ b/Application/Admin/View/PromoteCompany/edit.html @@ -96,7 +96,7 @@ - *是否签署合同: + 是否签署合同:
- *银行卡号： + 银行卡号： @@ -159,13 +159,13 @@ --> - *收款银行： + 收款银行： - *开户网点： + 开户网点： @@ -360,18 +360,18 @@ var obj = { "company_name":["required","推广公司名称不允许为空"], "platform_name":["nocheck"], - "contact_begin":["date","合同开始时间不能为空"], - "contact_end":["date","合同结束时间不能为空"], + // "contact_begin":["date","合同开始时间不能为空"], + // "contact_end":["date","合同结束时间不能为空"], "fax_ratio":["number","开票税率必须是数字，如果无此项请填0"], "company_type":["required","公司性质不能为空","select"], "is_sign_contact":["required","是否签署合同项不能为空","select"], "company_belong":["required","团体归属不能为空","select"], "settlement_contact":["required","结算联系人不能为空"], "contact_phone":["phone","联系人电话格式不对或不能为空"], - "address":["required","联系人地址不能为空"], - "bank_card":["bankid","银行卡格式错误或不能为空"], - "bank_name":["required","银行名称不能为空"], - "bank_address":["required","银行开户网点不能为空"], + // "address":["required","联系人地址不能为空"], + // "bank_card":["bankid","银行卡格式错误或不能为空"], + // "bank_name":["required","银行名称不能为空"], + // "bank_address":["required","银行开户网点不能为空"], "content":["nocheck"], "status":["nocheck","","radio"] } From c6e1493035d71aa73e18e5957b08f6e1714bc65c Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Fri, 28 Feb 2020 10:25:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=98=93=E5=AE=9D=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 0858173e2..6a68ef369 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -315,6 +315,8 @@ function get_pay_way($id=null) case 15: return "双乾支付-快捷"; break; + case 17: + return "易宝支付"; } } @@ -1818,6 +1820,7 @@ function all_pay_way_other($type=false) /* $pay_way[6]=array('key'=>7,'value'=>"苹果支付"); */ $pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷'); + $pay_way[17]=array('key'=>17,'value'=>'易宝支付'); return $pay_way; } From 3b415976eb2d5b8ff03955a592a095d01e36ed8d Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 28 Feb 2020 11:49:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=93=E5=AE=9D?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 2 +- .../FinancialSummaryController.class.php | 6 +++- .../FinancialSummarySetController.class.php | 34 +++++++++++++++---- .../Controller/OldCountController.class.php | 3 +- .../Admin/View/Promote/spend_list.html | 2 +- .../Admin/View/TestOrder/addOrder.html | 1 + Application/Admin/View/TestOrder/lists.html | 1 + 7 files changed, 38 insertions(+), 11 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 6a68ef369..4481e9d05 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -314,9 +314,9 @@ function get_pay_way($id=null) break; case 15: return "双乾支付-快捷"; - break; case 17: return "易宝支付"; + break; } } diff --git a/Application/Admin/Controller/FinancialSummaryController.class.php b/Application/Admin/Controller/FinancialSummaryController.class.php index bd39dac4f..b7b23edc9 100644 --- a/Application/Admin/Controller/FinancialSummaryController.class.php +++ b/Application/Admin/Controller/FinancialSummaryController.class.php @@ -22,7 +22,8 @@ class FinancialSummaryController extends AdminController "sqkj_count"=>"双乾-快捷", "wx_count"=>"微信", "zfb_count"=>"支付宝", - "kj_count"=>"快捷" + "kj_count"=>"快捷", + "ybzf_count"=>"易宝支付", ); public function _initialize() { @@ -31,6 +32,9 @@ class FinancialSummaryController extends AdminController } public function index($p=1) { + $this->beginThismonth = mktime(0,0,0,date('m'),1,date('Y')); + $this->endThismonth = mktime(0,0,0,date('m')+1,1,date('Y'))-1; + dd($this->beginThismonth, $this->endThismonth); if(!array_key_exists("year",$_REQUEST) || !array_key_exists("type",$_REQUEST)){ $this->redirect(ACTION_NAME, array('year' => date('Y',time()),"type"=>2)); } diff --git a/Application/Admin/Controller/FinancialSummarySetController.class.php b/Application/Admin/Controller/FinancialSummarySetController.class.php index 2f49c500a..0cd903e88 100644 --- a/Application/Admin/Controller/FinancialSummarySetController.class.php +++ b/Application/Admin/Controller/FinancialSummarySetController.class.php @@ -334,7 +334,8 @@ class FinancialSummarySetController extends \Think\Controller "zfb"=>0, "gfzfb"=>0, "sqzfb"=>0, - "sqkj"=>0 + "sqkj"=>0, + "ybzf"=>0, ]; $this->getSpendPayWay($moneyarry); $this->getGameSupersignPayWay($moneyarry); @@ -377,13 +378,24 @@ class FinancialSummarySetController extends \Think\Controller "type"=>5,"sort"=>3, "sum_money"=>number_format($moneyarry['sqkj']/100, 2, '.', '') ); + $this->adddata[] = array( + "key_name"=>'ybzf_count', + "type"=>4,"sort"=>5, + "sum_money"=>number_format($moneyarry['ybzf']/100, 2, '.', '') + ); + $this->adddata[] = array( + "key_name"=>'ybzf_count', + "type"=>5,"sort"=>4, + "sum_money"=>number_format($moneyarry['ybzf']/100, 2, '.', '') + ); + echo 'success'; } //获取spend表 protected function getSpendPayWay(&$moneyarry){ $map = array( "pay_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)), "pay_status"=>1, - "pay_way"=>array("IN","1,2,3,9,15") + "pay_way"=>array("IN","1,2,3,9,15,17") ); $dbres=$this->SpendModel ->field(" @@ -391,7 +403,8 @@ class FinancialSummarySetController extends \Think\Controller IFNULL(SUM(CASE WHEN pay_way = 3 THEN pay_amount ELSE 0 END),0) as wxapp_count, IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_amount ELSE 0 END),0) as zfbgf_count, IFNULL(SUM(CASE WHEN pay_way = 9 THEN pay_amount ELSE 0 END),0) as zfbsq_count, - IFNULL(SUM(CASE WHEN pay_way = 15 THEN pay_amount ELSE 0 END),0) as kjsq_count + IFNULL(SUM(CASE WHEN pay_way = 15 THEN pay_amount ELSE 0 END),0) as kjsq_count, + IFNULL(SUM(CASE WHEN pay_way = 17 THEN pay_amount ELSE 0 END),0) as ybzf_count ") ->where($map) ->find(); @@ -399,6 +412,7 @@ class FinancialSummarySetController extends \Think\Controller $moneyarry['gfzfb'] += $dbres['zfbgf_count']*100; $moneyarry['sqzfb'] += $dbres['zfbsq_count']*100; $moneyarry['sqkj'] += $dbres['kjsq_count']*100; + $moneyarry['ybzf'] += $dbres['ybzf_count']*100; } //获取超级签购买 protected function getGameSupersignPayWay(&$moneyarry) @@ -410,12 +424,14 @@ class FinancialSummarySetController extends \Think\Controller $dbres=$this->GameSupersignModel ->field(" IFNULL(SUM(CASE WHEN pay_way = 2 THEN pay_price ELSE 0 END),0) as wx_count, - IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_price ELSE 0 END),0) as zfb_count + IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_price ELSE 0 END),0) as zfb_count, + IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_price ELSE 0 END),0) as ybzf_count ") ->where($map) ->find(); $moneyarry['wx'] += $dbres['wx_count']*100; $moneyarry['gfzfb'] += $dbres['zfb_count']*100; + $moneyarry['ybzf'] += $dbres['ybzf_count']*100; } //玩家购买平台币 protected function getDepositPayWay(&$moneyarry) @@ -423,7 +439,7 @@ class FinancialSummarySetController extends \Think\Controller $map = array( "create_time"=> array('BETWEEN',array($this->beginThismonth, $this->endThismonth)), "pay_status"=>1, - "pay_way"=>array("IN","1,2,3,9,15") + "pay_way"=>array("IN","1,2,3,9,15,17") ); $dbres=$this->DepositModel ->field(" @@ -431,7 +447,8 @@ class FinancialSummarySetController extends \Think\Controller IFNULL(SUM(CASE WHEN pay_way = 3 THEN pay_amount ELSE 0 END),0) as wxapp_count, IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_amount ELSE 0 END),0) as zfbgf_count, IFNULL(SUM(CASE WHEN pay_way = 9 THEN pay_amount ELSE 0 END),0) as zfbsq_count, - IFNULL(SUM(CASE WHEN pay_way = 15 THEN pay_amount ELSE 0 END),0) as kjsq_count + IFNULL(SUM(CASE WHEN pay_way = 15 THEN pay_amount ELSE 0 END),0) as kjsq_count, + IFNULL(SUM(CASE WHEN pay_way = 17 THEN pay_amount ELSE 0 END),0) as ybzf_count ") ->where($map) ->find(); @@ -439,6 +456,7 @@ class FinancialSummarySetController extends \Think\Controller $moneyarry['gfzfb'] += $dbres['zfbgf_count']*100; $moneyarry['sqzfb'] += $dbres['zfbsq_count']*100; $moneyarry['sqkj'] += $dbres['kjsq_count']*100; + $moneyarry['ybzf'] += $dbres['ybzf_count']*100; } //会长充值平台币 protected function getCoinPayOrderPayWay(&$moneyarry) @@ -450,12 +468,14 @@ class FinancialSummarySetController extends \Think\Controller $dbres= $this->CoinPayOrderModel ->field(" IFNULL(SUM(CASE WHEN pay_way = 2 THEN pay_amount ELSE 0 END),0) as wx_count, - IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_amount ELSE 0 END),0) as zfb_count + IFNULL(SUM(CASE WHEN pay_way = 1 THEN pay_amount ELSE 0 END),0) as zfb_count, + IFNULL(SUM(CASE WHEN pay_way = 17 THEN pay_amount ELSE 0 END),0) as ybzf_count ") ->where($map) ->find(); $moneyarry['wx'] += $dbres['wx_count']*100; $moneyarry['gfzfb'] += $dbres['zfb_count']*100; + $moneyarry['ybzf'] += $dbres['ybzf_count']*100; } public function addDb() { diff --git a/Application/Admin/Controller/OldCountController.class.php b/Application/Admin/Controller/OldCountController.class.php index 30e95b003..903f911de 100644 --- a/Application/Admin/Controller/OldCountController.class.php +++ b/Application/Admin/Controller/OldCountController.class.php @@ -1,5 +1,6 @@ diff --git a/Application/Admin/View/TestOrder/addOrder.html b/Application/Admin/View/TestOrder/addOrder.html index d1c160c14..8431b91ff 100644 --- a/Application/Admin/View/TestOrder/addOrder.html +++ b/Application/Admin/View/TestOrder/addOrder.html @@ -147,6 +147,7 @@ + diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html index d54ff84ba..c22845ba8 100644 --- a/Application/Admin/View/TestOrder/lists.html +++ b/Application/Admin/View/TestOrder/lists.html @@ -86,6 +86,7 @@ +
From f74cfcc756c3b47f6649f0ebd47bd22271b1355c Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 28 Feb 2020 11:51:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=93=E5=AE=9D?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/FinancialSummaryController.class.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/Application/Admin/Controller/FinancialSummaryController.class.php b/Application/Admin/Controller/FinancialSummaryController.class.php index b7b23edc9..aee550b32 100644 --- a/Application/Admin/Controller/FinancialSummaryController.class.php +++ b/Application/Admin/Controller/FinancialSummaryController.class.php @@ -32,9 +32,6 @@ class FinancialSummaryController extends AdminController } public function index($p=1) { - $this->beginThismonth = mktime(0,0,0,date('m'),1,date('Y')); - $this->endThismonth = mktime(0,0,0,date('m')+1,1,date('Y'))-1; - dd($this->beginThismonth, $this->endThismonth); if(!array_key_exists("year",$_REQUEST) || !array_key_exists("type",$_REQUEST)){ $this->redirect(ACTION_NAME, array('year' => date('Y',time()),"type"=>2)); } From 5d596094a6a5818af96f575565d6dcd091d1d737 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 28 Feb 2020 13:39:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=93=E5=AE=9D?= =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 5 +++++ Application/Admin/View/Finance/gameStatisticsDetail.html | 1 + .../Admin/View/FinancePromote/gameStatisticsDetail.html | 1 + Application/Admin/View/PayChannel/testDetail.html | 1 + 4 files changed, 8 insertions(+) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 4481e9d05..b7712232b 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -267,6 +267,7 @@ function all_pay_way($type=false) /* $pay_way[6]=array('key'=>7,'value'=>"苹果支付"); */ $pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷'); + $pay_way[17]=array('key'=>17,'value'=>'易宝支付'); return $pay_way; } /* //获取支付方式 */ @@ -1490,6 +1491,7 @@ function cash_pay_way() $pay_way[9]=array('key'=>9,'value'=>"双乾支付-支付宝"); $pay_way[10]=array('key'=>10,'value'=>"双乾支付-银联"); $pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷'); + $pay_way[17]=array('key'=>17,'value'=>'易宝支付'); return $pay_way; } @@ -1548,6 +1550,9 @@ function getPayType($type) { case 15: $return = '双乾支付-快捷'; break; + case 17: + $return = '易宝支付'; + break; default: $return = '未知'; break; diff --git a/Application/Admin/View/Finance/gameStatisticsDetail.html b/Application/Admin/View/Finance/gameStatisticsDetail.html index dedd6862e..486c4e509 100644 --- a/Application/Admin/View/Finance/gameStatisticsDetail.html +++ b/Application/Admin/View/Finance/gameStatisticsDetail.html @@ -84,6 +84,7 @@ +
diff --git a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html index 59acf1702..a380574d6 100644 --- a/Application/Admin/View/FinancePromote/gameStatisticsDetail.html +++ b/Application/Admin/View/FinancePromote/gameStatisticsDetail.html @@ -137,6 +137,7 @@ + diff --git a/Application/Admin/View/PayChannel/testDetail.html b/Application/Admin/View/PayChannel/testDetail.html index 57ea61fc1..95a64b1b0 100644 --- a/Application/Admin/View/PayChannel/testDetail.html +++ b/Application/Admin/View/PayChannel/testDetail.html @@ -91,6 +91,7 @@ +