Showing
5 changed files
with
10 additions
and
5 deletions
@@ -35,7 +35,7 @@ class AliwapService | @@ -35,7 +35,7 @@ class AliwapService | ||
35 | 'partner' => $this->config->partner, | 35 | 'partner' => $this->config->partner, |
36 | '_input_charset' => $this->config->input_charset, | 36 | '_input_charset' => $this->config->input_charset, |
37 | 'notify_url' => Yohobuy::SERVICE_NOTIFY . $this->config->notify_url, | 37 | 'notify_url' => Yohobuy::SERVICE_NOTIFY . $this->config->notify_url, |
38 | - 'return_url' => Helpers::url($this->config->return_url), | 38 | + 'return_url' => Helpers::transHttpsUrl(Helpers::url($this->config->return_url)), |
39 | /* 业务参数 */ | 39 | /* 业务参数 */ |
40 | 'payment_type' => $this->config->payment_type, | 40 | 'payment_type' => $this->config->payment_type, |
41 | 'seller_id' => $this->config->partner, | 41 | 'seller_id' => $this->config->partner, |
@@ -44,7 +44,7 @@ class AliwapService | @@ -44,7 +44,7 @@ class AliwapService | ||
44 | 'out_trade_no' => $params->orderCode, | 44 | 'out_trade_no' => $params->orderCode, |
45 | 'subject' => $params->goodsName, | 45 | 'subject' => $params->goodsName, |
46 | 'total_fee' => $params->totalFee / 100, //单位为元 | 46 | 'total_fee' => $params->totalFee / 100, //单位为元 |
47 | - "show_url" => Helpers::url(''), | 47 | + "show_url" => Helpers::transHttpsUrl(Helpers::url('')), |
48 | ); | 48 | ); |
49 | 49 | ||
50 | ksort($parameter); | 50 | ksort($parameter); |
This diff could not be displayed because it is too large.
888 Bytes
@@ -10,7 +10,9 @@ | @@ -10,7 +10,9 @@ | ||
10 | </div> | 10 | </div> |
11 | <div class="success-btn pt50"> | 11 | <div class="success-btn pt50"> |
12 | <a href="/">继续逛</a> | 12 | <a href="/">继续逛</a> |
13 | - <a href="/home/orders/detail?order_code=<?php echo $this->order_code; ?>">查看订单</a> | 13 | + {{#if order_code}} |
14 | + <a href="/home/orders/detail?order_code={{order_code}}">查看订单</a> | ||
15 | + {{/if}} | ||
14 | </div> | 16 | </div> |
15 | </div> | 17 | </div> |
16 | </div> | 18 | </div> |
@@ -41,7 +41,7 @@ class PayController extends AbstractAction | @@ -41,7 +41,7 @@ class PayController extends AbstractAction | ||
41 | /* 判断用户是否登录 */ | 41 | /* 判断用户是否登录 */ |
42 | $uid = $this->getUid(true); | 42 | $uid = $this->getUid(true); |
43 | if (!$uid) { | 43 | if (!$uid) { |
44 | - $this->go( Helpers::url('/signin.html', array('refer' => $this->_request->server('HTTP_REFERER'))) ); | 44 | + $this->go( Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', SITE_MAIN)))); |
45 | break; | 45 | break; |
46 | } | 46 | } |
47 | 47 | ||
@@ -203,6 +203,7 @@ class PayController extends AbstractAction | @@ -203,6 +203,7 @@ class PayController extends AbstractAction | ||
203 | */ | 203 | */ |
204 | private function commonShowResult($payResult, $payment) | 204 | private function commonShowResult($payResult, $payment) |
205 | { | 205 | { |
206 | + $orderCode = ''; | ||
206 | $this->setTitle('支付中心'); | 207 | $this->setTitle('支付中心'); |
207 | $this->setNavHeader('支付中心', Helpers::url('/home/orders'), false); | 208 | $this->setNavHeader('支付中心', Helpers::url('/home/orders'), false); |
208 | 209 | ||
@@ -210,6 +211,7 @@ class PayController extends AbstractAction | @@ -210,6 +211,7 @@ class PayController extends AbstractAction | ||
210 | if ($payResult->payResult == 200) { | 211 | if ($payResult->payResult == 200) { |
211 | $view = 'index'; | 212 | $view = 'index'; |
212 | if (!empty($payResult->orderCode)) { | 213 | if (!empty($payResult->orderCode)) { |
214 | + $orderCode = $payResult->orderCode; | ||
213 | //支付成功,发送一次支付确认 | 215 | //支付成功,发送一次支付确认 |
214 | $uid = $this->getUid(); | 216 | $uid = $this->getUid(); |
215 | OrderData::payConfirm($payResult->orderCode, $payment, $uid); | 217 | OrderData::payConfirm($payResult->orderCode, $payment, $uid); |
@@ -218,7 +220,8 @@ class PayController extends AbstractAction | @@ -218,7 +220,8 @@ class PayController extends AbstractAction | ||
218 | 220 | ||
219 | $data = array( | 221 | $data = array( |
220 | 'payBackPage' => true, | 222 | 'payBackPage' => true, |
221 | - 'pageFooter' => true | 223 | + 'pageFooter' => true, |
224 | + 'order_code' => $orderCode | ||
222 | ); | 225 | ); |
223 | $this->_view->display($view, $data); | 226 | $this->_view->display($view, $data); |
224 | } | 227 | } |
-
Please register or login to post a comment