diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index e0b20c1b6..49f76ad34 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -1199,6 +1199,7 @@ class CompanyStatementController extends ThinkController $count = []; $week_line = 2; + $withdraw_type = false; //获取对接人 foreach($infolist as $k=>&$v){ $infolist[$k]['reward'] = 0; @@ -1239,6 +1240,9 @@ class CompanyStatementController extends ThinkController $row += count($va['game_list']); foreach($va['game_list'] as $key=>&$val){ + if(!$withdraw_type){ + $withdraw_type = $v['withdraw_type']; + } $line ++; if($v['withdraw_type'] != 3) { if(isset($val['ratio'])){ @@ -1250,12 +1254,12 @@ class CompanyStatementController extends ThinkController if($is_export){ if($v['withdraw_type'] != 3) { - $val['sum_money'] = "=ROUND((K{$line}-L{$line})*(M{$line}+N{$line}),2)"; + $val['sum_money'] = "=ROUND((L{$line}-M{$line})*(N{$line}+O{$line}),2)"; } else { - $val['sum_money'] = "=ROUND((K{$line}-L{$line})*(N{$line}),2)"; + $val['sum_money'] = "=ROUND((L{$line}-M{$line})*(O{$line}),2)"; } // $val['sum_money'] = "=J{$line}*(K{$line}+L{$line})"; - $v['statement_money'] .= "S{$line}+"; + $v['statement_money'] .= "T{$line}+"; }else{ $count['platform_amount'] += $val['pay_amount']; $count['sum_money'] += $val['sum_money']; @@ -1274,14 +1278,17 @@ class CompanyStatementController extends ThinkController } if($is_export){ - $count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)"; - $count["week_money"] = "=ROUND(SUM(S2:S".$line."),2)"; - $count["sum_money"] = "=ROUND(SUM(T2:T".$line."),2)"; + $count["platform_amount"] = "=ROUND(SUM(L2:L".$line."),2)"; + $count["week_money"] = "=ROUND(SUM(T2:T".$line."),2)"; + $count["sum_money"] = "=ROUND(SUM(U2:U".$line."),2)"; } $this->assign("data",$infolist); $this->assign("count",$count); $this->assign("is_export",$is_export); + $this->assign("withdraw_type",$withdraw_type); + + // dd($infolist); $this->display("CompanyStatementPool/viewPuPool"); } diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 6e023f83b..c58ecac2b 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -1054,7 +1054,7 @@ class CompanyStatementPoolController extends ThinkController $week_line += count($hv['game_list'])-1; } - $handle_data[$hk]['week_amount'] = "=ROUND(SUM(O{$old_line}:O{$week_line})+SUM(P{$old_line}:P{$week_line})-SUM(Q{$old_line}:Q{$week_line})-SUM(R{$old_line}:R{$week_line}),2)"; + $handle_data[$hk]['week_amount'] = "=ROUND(SUM(P{$old_line}:P{$week_line})+SUM(Q{$old_line}:Q{$week_line})-SUM(R{$old_line}:R{$week_line})-SUM(S{$old_line}:S{$week_line}),2)"; if ($hk > 0) { $handle_data[0]['week_amount'] = str_replace($old_line,$week_line,$handle_data[0]['week_amount']); diff --git a/Application/Qrcode/Controller/JumpController.class.php b/Application/Qrcode/Controller/JumpController.class.php index f99022df6..2fe66ce28 100644 --- a/Application/Qrcode/Controller/JumpController.class.php +++ b/Application/Qrcode/Controller/JumpController.class.php @@ -18,15 +18,15 @@ class JumpController extends HomeController public function getURLScheme() { header('Access-Control-Allow-Origin: *'); - $id = I('request.id', 0); + $uniqueStr = I('request.unique_str', ''); $url = "https://api.weixin.qq.com/wxa/generatescheme?access_token=".$this->getAccessToken(); $data = [ 'jump_wxa' => [ 'path' => '/pages/index/index', - 'query' => "id={$id}" + 'query' => "id={$uniqueStr}" ], 'is_expire' => true, - "expire_time" => time() + 86400 + "expire_time" => time() + 86400*21 ]; $ret = $this->curl_post($url, json_encode($data)); @@ -50,8 +50,11 @@ class JumpController extends HomeController } public function jumpMp() { - $id = I('request.id', 0); - $this->assign("id", $id); + $uniqueStr = I('server.QUERY_STRING'); + $posStr = 'Qrcode/Jump/jumpMp/'; + $pos = strpos($uniqueStr, $posStr) + strlen($posStr); + $uniqueStr = substr($uniqueStr, $pos, 8); + $this->assign("unique_str", $uniqueStr); $this->display(); } @@ -59,10 +62,10 @@ class JumpController extends HomeController public function getImgs() { $isHttps = is_https(); - $backgroundImg = ($isHttps? 'https://': 'http://').$_SERVER['HTTP_HOST']."/Public/Qrcode/images/b.png"; + $backgroundImg = ($isHttps? 'https://': 'http://').$_SERVER['HTTP_HOST']."/Public/Qrcode/images/b1.png"; $qrCodeImg = ($isHttps? 'https://': 'http://').$_SERVER['HTTP_HOST']."/Public/Qrcode/images/qrcode.png"; - $id = I('request.id', 0); - if (!$id || !is_numeric($id)) { + $id = I('request.id', ''); + if (!$id || $id == 'undefined') { $this->ajaxReturn([ 'id' => $_REQUEST['id'], 'status' => 1, @@ -71,7 +74,15 @@ class JumpController extends HomeController ]); } // 二维码： - $qrcodePromotionList = M('qrcode_promotion_list', 'tab_')->where(['id' => $id])->find(); + $qrcodePromotionList = M('qrcode_promotion_list', 'tab_')->where(['unique_str' => $id])->find(); + if (!$qrcodePromotionList) { + $this->ajaxReturn([ + 'id' => $_REQUEST['id'], + 'status' => 1, + 'background_img' => $backgroundImg, + 'qrcode_img' => $qrCodeImg + ]); + } $qrcode = json_decode($qrcodePromotionList['qrcode_img'], true); $qrcodeCnt = count($qrcode); $intervalMin = $qrcodePromotionList['interval_min']; diff --git a/Application/Qrcode/Controller/QrCodePromotionController.class.php b/Application/Qrcode/Controller/QrCodePromotionController.class.php index db07d80e4..9e654c926 100644 --- a/Application/Qrcode/Controller/QrCodePromotionController.class.php +++ b/Application/Qrcode/Controller/QrCodePromotionController.class.php @@ -202,11 +202,12 @@ class QrCodePromotionController extends BaseController 'interval_min' => $params['interval_min'], ]); if ($id > 0) { - $h5Link = ($isHttps? 'https://': 'http://').$_SERVER['HTTP_HOST']."/index.php?s=/Qrcode/Jump/jumpMp/id/{$id}"; - $expireDate = date('Y-m-d', strtotime("+30 day")); - $shortLink = $this->getShortUrl($h5Link, $expireDate); + $uniqueStr = $this->getUniqueStr(); + $h5Link = ($isHttps? 'https://': 'http://').$_SERVER['HTTP_HOST']."/index.php?s=/Qrcode/Jump/jumpMp/{$uniqueStr}"; + $shortLink = $this->getShortUrl($h5Link); M('qrcode_promotion_list', 'tab_')->where(['id' => $id])->save([ + 'unique_str' => $uniqueStr, 'h5_link' => $h5Link, 'short_link' => $shortLink ]); @@ -220,16 +221,40 @@ class QrCodePromotionController extends BaseController $this->display(); } + private function getUniqueStr() { + while (1) { + $chars = $this->getRandomStr(8); + $find = M('qrcode_promotion_list', 'tab_')->where([ + 'unique_str' => $chars + ])->find(); + if (!$find) return $chars; + } + } + + private function getRandomStr($len){ + static $pol = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz"; + + $str = ''; + $max = strlen($pol) - 1; + for ($i = 0; $i < $len; $i++) { + $str .= $pol[mt_rand(0, $max)]; + } + + return $str; + } + public function linkEdit() { $id = I('request.id', 0); if (!$id) return ; if (IS_POST) { +// var_dump(json_encode(I('post.img'), JSON_FORCE_OBJECT));die; M('qrcode_promotion_list', 'tab_')->where([ "id" => $id ])->save([ - 'interval_min' => I('post.interval_min') + 'interval_min' => I('post.interval_min'), + 'qrcode_img' => json_encode(I('post.img'), JSON_FORCE_OBJECT) ]); $this->ajaxReturn(['status' => 1, 'message' => '保存成功！']); } @@ -237,7 +262,9 @@ class QrCodePromotionController extends BaseController $qrcodePromotionList = M('qrcode_promotion_list', 'tab_')->where([ "id" => $id ])->find(); + $imgs = json_decode($qrcodePromotionList['qrcode_img'], true); + $this->assign('imgs', $imgs); $this->assign('id', $id); $this->assign('qp_id', $qrcodePromotionList['qp_id']); $this->assign('interval_min', $qrcodePromotionList['interval_min']); @@ -256,6 +283,7 @@ class QrCodePromotionController extends BaseController public function linkLists() { + $this->getShortUrl('https://mg.wmtxkj.com'); $page = I('p', 1); $row = I('row', 10); $qpId = I('get.id', 0); @@ -288,23 +316,67 @@ class QrCodePromotionController extends BaseController $this->display(); } - public function getShortUrl($long_url, $expire_date) + public function getShortUrl($longUrl) { - $url = urlencode($long_url); - $key = "612a01db7889bec5e0d0d2d81f@df6cdda6eb39c505f08848f714b0433e"; - $request_url = "http://api.3w.cn/api.htm?format=json&url={$url}&key={$key}&expireDate={$expire_date}&domain=0"; - $result_str = file_get_contents($request_url); + $shortUrl = ''; + $host = "https://encsholin.market.alicloudapi.com"; + $path = "/shortlink"; + $method = "GET"; + $appcode = "783dde1552fa412293c56f9ad875579b";//开通服务后 买家中心-查看AppCode + $headers = array(); + array_push($headers, "Authorization:APPCODE " . $appcode); + $querys = "password=&url={$longUrl}"; + $url = $host . $path . "?" . $querys; + + $curl = curl_init(); + curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method); + curl_setopt($curl, CURLOPT_URL, $url); + curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); + curl_setopt($curl, CURLOPT_FAILONERROR, false); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); + curl_setopt($curl, CURLOPT_HEADER, true); + if (1 == strpos("$" . $host, "https://")) { + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); + } + $out_put = curl_exec($curl); - $url = ""; - if ($result_str) { - $result_arr = json_decode($result_str, true); + $httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE); - if ($result_arr && $result_arr['code'] == "0") { - $url = $result_arr['url']; + list($header, $body) = explode("\r\n\r\n", $out_put, 2); + if ($httpCode == 200) { + $url = json_decode($body, true); + $shortUrl = $url['url']; + if (!$shortUrl) $shortUrl = $url['msg']; + } else { + if ($httpCode == 400 && strpos($header, "Invalid Param Location") !== false) { + $shortUrl = ("参数错误"); + } elseif ($httpCode == 400 && strpos($header, "Invalid AppCode") !== false) { + $shortUrl = ("AppCode错误"); + } elseif ($httpCode == 400 && strpos($header, "Invalid Url") !== false) { + $shortUrl = ("请求的 Method、Path 或者环境错误"); + } elseif ($httpCode == 403 && strpos($header, "Unauthorized") !== false) { + $shortUrl = ("服务未被授权（或URL和Path不正确）"); + } elseif ($httpCode == 403 && strpos($header, "Quota Exhausted") !== false) { + $shortUrl = ("套餐包次数用完"); + } elseif ($httpCode == 500) { + $shortUrl = ("API网关错误"); + } elseif ($httpCode == 0) { + $shortUrl = ("URL错误"); + } else { + $shortUrl .= ("参数名错误 或 其他错误"); + $shortUrl .= ($httpCode); + $headers = explode("\r\n", $header); + $headList = array(); + foreach ($headers as $head) { + $value = explode(':', $head); + $headList[$value[0]] = $value[1]; + } + $shortUrl .= ($headList['x-ca-error-message']); } } - return $url; + return $shortUrl; } } \ No newline at end of file diff --git a/Application/Qrcode/View/default/Jump/jumpMp.html b/Application/Qrcode/View/default/Jump/jumpMp.html index c858df213..9e8bd22a9 100644 --- a/Application/Qrcode/View/default/Jump/jumpMp.html +++ b/Application/Qrcode/View/default/Jump/jumpMp.html @@ -88,6 +88,7 @@ var buttonEl = document.getElementById('public-web-jump-button') var buttonLoadingEl = document.getElementById('public-web-jump-button-loading') try { + jumpToMp(); await openWeapp(() => { buttonEl.classList.remove('weui-btn_loading') buttonLoadingEl.classList.add('hidden') @@ -120,9 +121,9 @@ dataType: 'json', type: 'POST', //url: 'http://10.0.10.185:8089/index.php?s=/Qrcode/Jump/getURLScheme', - url: 'https://mg.wmtxkj.cn/index.php?s=/Qrcode/Jump/getURLScheme', + url: 'https://mg.wmtxkj.com/index.php?s=/Qrcode/Jump/getURLScheme', data: { - 'id': "{$id}", + 'unique_str': "{$unique_str}", }, success: function(data){ window.location.href = data.openlink; @@ -196,10 +197,10 @@
- - - - - - - - - - - - -
- - - -
- - \ No newline at end of file diff --git a/Application/Qrcode/View/default/QrCodePromotion/linkAdd.html b/Application/Qrcode/View/default/QrCodePromotion/linkAdd.html index 26e45f4f3..a542d6f51 100644 --- a/Application/Qrcode/View/default/QrCodePromotion/linkAdd.html +++ b/Application/Qrcode/View/default/QrCodePromotion/linkAdd.html @@ -53,6 +53,7 @@ diff --git a/Public/Qrcode/images/b1.png b/Public/Qrcode/images/b1.png new file mode 100644 index 000000000..9a8fb9b0b Binary files /dev/null and b/Public/Qrcode/images/b1.png differ