Authored by liangxs

Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5

... ... @@ -36,7 +36,7 @@ class SearchData
// return 'http://101.200.31.165/yohosearch/search.json';
return 'http://192.168.10.64:8080/yohosearch/search.json';
case 'testing':
return 'http://testing.yohoops.org/yohosearch/search.json';
return 'http://192.168.102.216:8080/yohosearch/search.json';
case 'developer':
default:
return 'http://searchyohoops.yohobuy.com/yohosearch/search.json';
... ... @@ -100,7 +100,6 @@ class SearchData
$param += $condition;
}
$param['client_secret'] = Sign::getSign($param);
return Yohobuy::get(Yohobuy::API_URL, $param);
}
... ...
... ... @@ -70,7 +70,7 @@ class ShopProcess
//店铺简介页地址
self::$shopData['shopIntroHref'] = Helpers::url('/product/index/intro', array('shop_id' => self::$shopId));
} else {
self::$shopData['allGoods'] = Helpers::url('', $allGoodsParam, 'search').'&openby:yohobuy={"action":"go.list","params":{"title":"全部商品", "actiontype":"0","shop_id":"'.self::$shopId.'","page":"1"}}';
self::$shopData['allGoods'] = Helpers::url('', $allGoodsParam, 'search') . '&openby:yohobuy={"action":"go.list","params":{"title":"全部商品", "actiontype":"0","shop_id":"' . self::$shopId . '","page":"1"}}';
self::$shopData['shopIntroHref'] = Helpers::url('/product/index/intro', array('shop_id' => self::$shopId, 'app_version' => self::$appVersion));
}
//搜索链接
... ... @@ -78,7 +78,7 @@ class ShopProcess
//人气单品的链接
self::$shopData['more_url'] = Helpers::url('', array('shop_id' => self::$shopId, 'order' => 's_n_d', 'title' => '人气单品',), 'search');
if (self::$appVersion) {
self::$shopData['more_url'] = 'openby:yohobuy={"action":"go.list","params":{"shop_id":"'.self::$shopId.'","title":"人气单品"}}';
self::$shopData['more_url'] = 'openby:yohobuy={"action":"go.list","params":{"shop_id":"' . self::$shopId . '","title":"人气单品"}}';
}
}
... ... @@ -107,7 +107,7 @@ class ShopProcess
*/
private static function shopTopBanner_APP($data)
{
self::$shopData['branerImg'] = Images::getImageUrl($data[0]['shopSrc'], 640, 200);
self::$shopData['branerImg'] = Images::getResizeImagesUrl($data[0]['shopSrc'], 640, 200, 1);
}
/**
... ... @@ -148,11 +148,14 @@ class ShopProcess
if (empty($val['brandDomain'])) {
continue;
}
$brandId .= $val['id'].',';
$appSuffix = 'openby:yohobuy={"action":"go.brand","params":{"shop_id":"'.self::$shopId.'","brand_id":"'.$val['id'].'"}}';
$brandId .= $val['id'] . ',';
// tar modified 1606031153 跳转当前店铺下的这个品牌的商品列表
$appSuffix = 'openby:yohobuy={"action":"go.brand","params":{"shop_id":"' . self::$shopId . '","brand_id":"' . $val['id'] . '","title":"' . $val['brandName'] . '","jumptoshop":"Y","tags_filter":"1"}}';
// $appSuffix = 'openby:yohobuy={"action":"go.list","params":{"shop_id":"' . self::$shopId . '","brand":"' . $val['id'] . '","title":"' . $val['brandName'] . '"}}';
$brand['url'] = Helpers::url('', '', $val['brandDomain']);
// $brand['url'] = Helpers::url('', array('shop_id' => self::$shopId, 'brand' => $val['id'], 'title' => $val['brandName']), 'list');
if (!empty(self::$appVersion)) {
$brand['url'] .= '?'.$appSuffix;
$brand['url'] .= '?' . $appSuffix;
}
$brand['img'] = Images::getImageUrl($val['brandIco'], 640, 400);
$brand['brandName'] = $val['brandName'];
... ... @@ -178,6 +181,7 @@ class ShopProcess
self::$shopData['bannerTop']['list'][] = array('url' => $slide['data'][0]['url'], 'img' => $slide['data'][0]['src']);
}
}
/**
* 热门分类
* @param array $data
... ... @@ -204,8 +208,8 @@ class ShopProcess
'url' => Helpers::getUrlBySkc($val['productId'], $val['goodsId'], $val['cnAlphabet']),
'img' => Helpers::getImageUrl($val['src'], 235, 314),
'productName' => $val['productName'],
'salesPrice' => '¥'.$val['salesPrice'],
'presentPrice' => '¥'.$val['salesPrice']
'salesPrice' => '¥' . $val['salesPrice'],
'presentPrice' => '¥' . $val['salesPrice']
);
if (!empty(self::$appVersion)) {
$goods['url'] .= '?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":' . $val['productSkn'] . '}}';
... ...
... ... @@ -349,7 +349,7 @@ class Helpers
$result['showTags'] = $showTag;
$result['img'] = isset($articleData['src']) ? self::getImageUrl($articleData['src'], 640, 640) : '';
//逛详情页app跳转url处理 20160601
$result['url'] = $articleData['url'] . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":1,"url":"' . self::transHttpsUrl(self::url('/info/index', array(), 'guang')) . '","islogin":"N"}}';
$result['url'] = self::getUrlSafe($articleData['url'] . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":1,"url":"' . self::url('/info/index', array(), 'guang') . '","islogin":"N"}}');
$result['title'] = $articleData['title'];
$result['text'] = $articleData['intro'];
$result['publishTime'] = $articleData['publish_time'];
... ... @@ -378,6 +378,7 @@ class Helpers
}
//编辑人员 app跳转url处理 20160601
$articleData['author']['url'].='&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['author']['author_id'] . '"},"share":"","id":' . $articleData['author']['author_id'] . ',"type":0,"islogin":"N","url":"' . self::transHttpsUrl(self::url('/author/index', array(), 'guang')) . '"}}';
$articleData['author']['url'] = self::getUrlSafe($articleData['author']['url']);
$result['author'] = $articleData['author'];
if (isset($result['author']['avatar'])) {
$result['author']['avatar'] = strtr($result['author']['avatar'], array('http://' => '//'));
... ... @@ -957,4 +958,14 @@ class Helpers
{
return preg_replace('/^\/\//', 'http://', $url);
}
/**
* http和https转换成//
* @param type $url 地址
* @return type string
*/
public static function getUrlSafe($url)
{
return '//' . strtr($url, array('http://' => '', 'https://' => ''));
}
}
... ...
... ... @@ -75,6 +75,19 @@ class Images
}
/**
* 获取图片地址
* @param $fileName http://img13.static.yhbimg.com/yhb-img02/2016/06/01/19/02878f3a909f5c468a1445210b38a9512f.jpg
* @param $width
* @param $height
* @param int $mode
* @return mixed
*/
public static function getResizeImagesUrl($fileName, $width, $height, $mode = 2)
{
$fileName = self::MakeTemplateRequest($fileName);
return self::getImageUrl($fileName, $width, $height, $mode = 2);
}
/**
* 获取图片URL模板
* @param $fileName
* @param int $mode
... ...
... ... @@ -210,7 +210,7 @@ function reMarginFooter(fixedElement) {
a.src = j;
m.parentNode.insertBefore(a, m);
})(window, document, 'script', ('https:' === document.location.protocol ? 'https' : 'http') + '://' +
'cdn.yoho.cn/yas-jssdk/1.0.15/yas.js', '_yas');
'cdn.yoho.cn/yas-jssdk/1.0.16/yas.js', '_yas');
(function() {
var uid = getUid(),
... ... @@ -244,18 +244,17 @@ function reMarginFooter(fixedElement) {
// 绑定埋点点击事件
bindBpEvent = function() {
hasParentBp = false;
$(document).off('click').on('click', '.buriedpoint', function(e) {
var databpid = $(this).attr('data-bp-id') || '',
bpIdArr = databpid.split('_');
bpIdArr = databpid.split('_'),
hasParentBp = false;
if ($(e.target).parents('.buriedpoint').length > 0) {
hasParentBp = true;
}
if (!hasParentBp && bpIdArr && bpIdArr.length >= basicBpDataLength) {
sendBpData(bpIdArr);
} else {
hasParentBp = false;
}
if ($(e.target).closest('.buriedpoint').length >= 1) {
hasParentBp = true;
}
});
};
... ... @@ -9893,26 +9892,27 @@ function downCount(item) {
_minute = _second * 60,
_hour = _minute * 60,
_day = _hour * 24,
days,
hours,
minutes,
seconds;
// calculate dates
days = Math.floor(difference / _day),
hours = Math.floor((difference % _day) / _hour),
minutes = Math.floor((difference % _hour) / _minute),
seconds = Math.floor((difference % _minute) / _second);
hours = Math.floor((difference % _day) / _hour),
minutes = Math.floor((difference % _hour) / _minute),
seconds = Math.floor((difference % _minute) / _second);
// fix dates so that it will show two digets
days = (String(days).length >= 2) ? days : '0' + days;
hours = (String(hours).length >= 2) ? hours : '0' + hours;
minutes = (String(minutes).length >= 2) ? minutes : '0' + minutes;
seconds = (String(seconds).length >= 2) ? seconds : '0' + seconds;
// set to DOM
item.removeClass('hide');
hoursItem.text('剩余' + hours + ':' + minutes + ':' + seconds);
if (hours === '00') {
hoursItem.text('剩余' + minutes + ':' + seconds);
} else {
hoursItem.text('剩余' + hours + ':' + minutes + ':' + seconds);
}
difference -= 1000;
... ... @@ -10059,7 +10059,6 @@ orderHammer.on('tap', function(e) {
});
});
} else if ($cur.closest('.cancel').length > 0) {
console.log('s');
$reaMask.css('visibility', 'visible');
} else if ($cur.closest('.order-goods').length > 0) {
... ... @@ -13543,7 +13542,13 @@ $invoice.on('touchend', '.checkbox', function() {
function updateDeliverId(id) {
var $moreJit = $('.more-jit a').get(0),
url;
if ($moreJit) {
url = $moreJit.href;
} else {
return;
}
if (url.indexOf('deliveryId') < 0) {
$moreJit.href = url + '&deliveryId=' + id;
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -116,7 +116,13 @@ $invoice.on('touchend', '.checkbox', function() {
function updateDeliverId(id) {
var $moreJit = $('.more-jit a').get(0),
url;
if ($moreJit) {
url = $moreJit.href;
} else {
return;
}
if (url.indexOf('deliveryId') < 0) {
$moreJit.href = url + '&deliveryId=' + id;
... ...
... ... @@ -192,7 +192,7 @@ function reMarginFooter(fixedElement) {
a.src = j;
m.parentNode.insertBefore(a, m);
})(window, document, 'script', ('https:' === document.location.protocol ? 'https' : 'http') + '://' +
'cdn.yoho.cn/yas-jssdk/1.0.15/yas.js', '_yas');
'cdn.yoho.cn/yas-jssdk/1.0.16/yas.js', '_yas');
(function() {
var uid = getUid(),
... ... @@ -226,18 +226,17 @@ function reMarginFooter(fixedElement) {
// 绑定埋点点击事件
bindBpEvent = function() {
hasParentBp = false;
$(document).off('click').on('click', '.buriedpoint', function(e) {
var databpid = $(this).attr('data-bp-id') || '',
bpIdArr = databpid.split('_');
bpIdArr = databpid.split('_'),
hasParentBp = false;
if ($(e.target).parents('.buriedpoint').length > 0) {
hasParentBp = true;
}
if (!hasParentBp && bpIdArr && bpIdArr.length >= basicBpDataLength) {
sendBpData(bpIdArr);
} else {
hasParentBp = false;
}
if ($(e.target).closest('.buriedpoint').length >= 1) {
hasParentBp = true;
}
});
};
... ...
... ... @@ -50,26 +50,27 @@ function downCount(item) {
_minute = _second * 60,
_hour = _minute * 60,
_day = _hour * 24,
days,
hours,
minutes,
seconds;
// calculate dates
days = Math.floor(difference / _day),
hours = Math.floor((difference % _day) / _hour),
minutes = Math.floor((difference % _hour) / _minute),
seconds = Math.floor((difference % _minute) / _second);
hours = Math.floor((difference % _day) / _hour),
minutes = Math.floor((difference % _hour) / _minute),
seconds = Math.floor((difference % _minute) / _second);
// fix dates so that it will show two digets
days = (String(days).length >= 2) ? days : '0' + days;
hours = (String(hours).length >= 2) ? hours : '0' + hours;
minutes = (String(minutes).length >= 2) ? minutes : '0' + minutes;
seconds = (String(seconds).length >= 2) ? seconds : '0' + seconds;
// set to DOM
item.removeClass('hide');
hoursItem.text('剩余' + hours + ':' + minutes + ':' + seconds);
if (hours === '00') {
hoursItem.text('剩余' + minutes + ':' + seconds);
} else {
hoursItem.text('剩余' + hours + ':' + minutes + ':' + seconds);
}
difference -= 1000;
... ...
... ... @@ -92,7 +92,6 @@
img {
width: 100%;
height: 640px;
}
}
... ...
... ... @@ -62,7 +62,13 @@
color: #000;
}
.span {
span {
font-size: 28px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.brand-name {
width: 60%;
font-size: 28px;
overflow: hidden;
... ... @@ -79,6 +85,7 @@
}
.entry {
width: 150px;
color: #999;
font-size: 28px;
float: right;
... ...
... ... @@ -72,7 +72,7 @@
{{/ brandList}}
{{# newBrandWall}}
<div class="new-brand-wall branding-wall">
<div class="new-brand-wall branding-wall hide">
{{# list}}
<div class="brand-wall-box">
<a href="{{url}}">
... ... @@ -85,7 +85,7 @@
{{/ newBrandWall}}
{{# recommandBrandWall}}
<div class="recommand-brand-wall branding-wall">
<div class="recommand-brand-wall branding-wall hide">
{{# list}}
<div class="brand-wall-box">
<a href="{{url}}">
... ...
... ... @@ -15,7 +15,7 @@
<div class="brand-way">
<a href={{url}}>
<img class="brand-thumb" src={{thumb}}>
<span>{{name}}</span>
<span class="brand-name">{{name}}</span>
<span class="entry">
进入品牌
<i class="iconfont">&#xe614;</i>
... ... @@ -24,6 +24,12 @@
</div>
{{/ brandWay}}
{{# shopBanner}}
<div id="brand-header" class="brand-header" data-id={{id}}>
<img class="lazy" data-original={{banner}}>
</div>
{{/ shopBanner}}
{{# brandHome}}
<div id="brand-header" class="brand-header" data-id={{id}}>
<img class="lazy" data-original={{banner}}>
... ...
... ... @@ -939,10 +939,14 @@ class HomeController extends AbstractAction
$hasWxShare = strpos($this->server('HTTP_USER_AGENT', ''), 'MicroMessenger') !== false;
if ($hasWxShare) {
$tools = new JsApiPay();
$openId = $tools->GetOpenid();
if ($openId) {
$this->setSession('weixinOpenId', $openId);
$openId = $this->getSession('weixinOpenId' . $orderCode);
if (empty($openId)) {
$tools = new JsApiPay();
$openId = $tools->GetOpenid();
if ($openId) {
$this->setSession('weixinOpenId', $openId);
$this->setSession('weixinOpenId' . $orderCode, $openId);
}
}
}
... ...
... ... @@ -371,7 +371,7 @@ class ListModel
array_push($result['category'], array('subcategory' => $item['sub']));
}
$result['allproduct'] = Helpers::url('/search/list', array(
'shop' => $shop_id,
'shop_id' => $shop_id,
));
return $result;
}
... ... @@ -419,6 +419,10 @@ class ListModel
$data['decorator'] = ListData::getShopDecorator($shopId);
//店铺信息
$data['shopInfo'] = ListData::getShopInfo($shopId, $uid);
//店铺使用基础模板,返回品牌页面
if (isset($data['shopInfo']['data']['shop_template_type']) && $data['shopInfo']['data']['shop_template_type'] == 1) {
return array('goBrand' => $data['shopInfo']['data']);
}
//店铺分类
$channel = Helpers::getChannelByCookie();
$data['shopCategory'] = ListData::getShopCategory($shopId, $channel);
... ...
... ... @@ -61,7 +61,7 @@ class InfoController extends AbstractAction
//guang双头部的问题 20160601
$authorTmp = explode("?id=", $detail['getAuthor']['url']);
$authorId=$authorTmp[1];
$data['guang']['author']['url'] = $detail['getAuthor']['url'] .'&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $authorId . '"},"share":"","id":' .$authorId . ',"type":0,"islogin":"N","url":"' . Helpers::transHttpsUrl(Helpers::url('/author/index', array(), 'guang')) . '"}}';
$data['guang']['author']['url'] = Helpers::getUrlSafe($detail['getAuthor']['url'] .'&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $authorId . '"},"share":"","id":' .$authorId . ',"type":0,"islogin":"N","url":"' . Helpers::transHttpsUrl(Helpers::url('/author/index', array(), 'guang')) . '"}}');
}
$data['detail'] = array();
... ...
... ... @@ -142,9 +142,6 @@ class IndexController extends AbstractAction
$title = '';
$brandLogo = Product\ListModel::getBrandLogoByDomain($domain, $title);
//如果店铺使用基础模板TODO
$baseBanner = ListModel::getShopBaseBanner($brandLogo['shopId']);
//无店铺:0--->品牌页 无单品店有多品店:1--->搜索页 有单品店:2--->店铺页面
if ($brandLogo['type'] == 2 && !empty($brandLogo['shopId'])) {
$this->shop($brandLogo['shopId'], $uid);
... ... @@ -249,10 +246,7 @@ class IndexController extends AbstractAction
}
$this->setTitle($title);
$this->setNavHeader($title, true, SITE_MAIN);
//店铺页banner
if ($baseBanner) {
$data['brandHome']['banner'] = $data['brandHome'];
}
$this->_view->display('index', $data);
}
... ... @@ -461,9 +455,10 @@ class IndexController extends AbstractAction
}
/**
* 店铺首页
* 店铺首页 || 若店铺使用基础模板跳转品牌页
* @param int $shopId
* @author sefon 2016-4-26 20:50:58
* @return int
*/
private function shop($shopId)
{
... ... @@ -479,6 +474,11 @@ class IndexController extends AbstractAction
$this->setCookie('appUid', $uid);
}
$data = ListModel::shopData($shopId, $uid, $appVersion);
if (isset($data['goBrand'])) {
//跳转基础模板
self::baseShop($data['goBrand']);
exit;
}
$this->_view->display('shop', array(
'shopIndex' => $data,
'shopPage' => array(
... ... @@ -490,6 +490,97 @@ class IndexController extends AbstractAction
}
/**
* 店铺基础模板
* @param int $shop
* @author sefon 2016-4-26 20:50:58
* @return int
*/
private function baseShop($shop)
{
/* 过滤请求参数 */
$condition = filter_input_array(INPUT_GET, array(
'sort' => FILTER_DEFAULT,
'brand' => FILTER_DEFAULT,
'msort' => FILTER_DEFAULT,
'misort' => FILTER_DEFAULT,
'color' => FILTER_DEFAULT,
'size' => FILTER_DEFAULT,
'style' => FILTER_DEFAULT,
'price' => FILTER_DEFAULT,
'discount' => FILTER_DEFAULT,
'gender' => FILTER_DEFAULT,
'p_d' => FILTER_DEFAULT,), false);
if ($shop['mult_brand_shop_type'] == 2) {
// 转义店铺
$condition['shop_id'] = $shop['shops_id'];
} else {
$brands = ShopData::getShopBrands($shop['shops_id']);
if (isset($brands['code']) && $brands['code'] == 200 && isset($brands['data']) && !empty($brands['data']))
$condition['brand'] = $brands['data'][0]['brand_id'];
}
// 转义分类
if (isset($condition['sort'])) {
$condition['sort'] = rawurldecode($condition['sort']);
}
// 转义一级分类
if (isset($condition['msort'])) {
$condition['msort'] = rawurldecode($condition['msort']);
}
// 转义二级分类
if (isset($condition['misort'])) {
$condition['misort'] = rawurldecode($condition['misort']);
}
// 转义颜色
if (isset($condition['color'])) {
$condition['color'] = rawurldecode($condition['color']);
}
// 转义尺码
if (isset($condition['size'])) {
$condition['size'] = rawurldecode($condition['size']);
}
// 转义风格
if (isset($condition['style'])) {
$condition['style'] = rawurldecode($condition['style']);
}
// 转义价格
if (isset($condition['price'])) {
$condition['price'] = rawurldecode($condition['price']);
}
// 转换折扣
if (isset($condition['discount'])) {
$condition['p_d'] = rawurldecode($condition['discount']);
}
// 为了兼容现在运营在用的p_d
if (isset($condition['p_d'])) {
$condition['discount'] = rawurldecode($condition['p_d']);
}
if (isset($condition['gender'])) {
$condition['gender'] = rawurldecode($condition['gender']);
}/* else {
$condition['gender'] = Helpers::getGenderByCookie();
}*/
$data = array();
$data['goodListPage'] = true;
$data['showDownloadApp'] = true;
$title = $shop['shop_name'];
// 右下角的购物车链接
$data['goodList']['cartUrl'] = Helpers::url('/cart/index/index', null);
$data['goodList'] += $condition;
$data['pageFooter'] = true;
$this->setTitle($title);
$this->setNavHeader($title, true, SITE_MAIN);
//店铺页banner
$data['shopBanner']['banner'] = ListModel::getShopBaseBanner($shop['shops_id']);
$this->_view->display('index', $data);
}
/**
* 店铺收藏
* @author sefon 2016-4-28 23:00:11
*/
... ... @@ -516,7 +607,6 @@ class IndexController extends AbstractAction
$toUrl .= '&openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"'.$refer.'","param":{}},"requesturl":{"param":{},"url":""},"priority":"Y"}}';
}
$data['url'] = $toUrl;
// print_r($data); exit;
break;
}
if (!empty($shopId) && !empty($uid)) {
... ...
... ... @@ -34,14 +34,13 @@ class PayController extends AbstractAction
/* 判断是否有订单号参数 */
$orderCode = $this->get('order_code');
if (empty($orderCode)) {
UdpLog::info('【支付宝支付】参数校验', 'orderCode为空');
$this->go(SITE_MAIN);
break;
}
/* 判断用户是否登录 */
$uid = $this->getUid(true);
if (!$uid) {
UdpLog::info('【支付宝支付】参数校验', 'uid为空');
$this->go( Helpers::url('/signin.html', array('refer' => $this->_request->server('HTTP_REFERER'))) );
break;
}
... ... @@ -49,7 +48,7 @@ class PayController extends AbstractAction
/* 判断订单信息是否存在 */
$orderDetail = OrderData::viewOrderData($orderCode, $uid, $this->_usession);
if (empty($orderDetail['data'])) {
UdpLog::info('【支付宝支付】校验订单信息', 'orderCode:'.$orderCode.'uid:'.$uid.'返回:'.json_encode($orderDetail));
UdpLog::info("【支付宝支付】校验订单信息,orderCode:{$orderCode},uid:{$uid},返回:", $orderDetail);
$this->helpJsRedirect('没有找到该订单');
break;
}
... ... @@ -65,7 +64,7 @@ class PayController extends AbstractAction
$aliwapService = new AliwapService();
$payRequestPars = $aliwapService->getPayRequestPars($reqParams);
if (empty($payRequestPars)) {
UdpLog::info('【支付宝支付】提交支付宝端口无响应', 'orderCode:'.$orderCode.'totalFee:'.$totalFee.'createTime:'.$orderDetail['data']['create_time']);
UdpLog::info("【支付宝支付】提交支付宝端口无响应,orderCode:{$orderCode}", array('orderDetail' => $orderDetail, 'payRequestPars' => $payRequestPars));
$this->helpJsRedirect('支付系统繁忙,请稍后再试');
break;
}
... ... @@ -111,7 +110,7 @@ class PayController extends AbstractAction
/* 判断订单信息不存在 */
$orderDetail = OrderData::viewOrderData($orderCode, $uid, $this->_usession);
if (empty($orderDetail['data'])) {
UdpLog::info('【wechat支付】校验订单信息', 'orderCode:'.$orderCode.'uid:'.$uid.'返回:'.json_encode($orderDetail));
UdpLog::info("【wechat支付】校验订单信息,orderCode:{$orderCode},uid:{$uid},返回:", $orderDetail);
break;
}
... ... @@ -134,9 +133,9 @@ class PayController extends AbstractAction
$input->SetTrade_type("JSAPI");
$input->SetOpenid($openId);
$order = WxPayApi::unifiedOrder($input);
UdpLog::info('【微信支付下单】统一下单时返回结果,','input:'.json_encode($input).'返回:'.json_encode($order));
UdpLog::info('【微信支付下单】统一下单时返回结果,', array('input' => $input, 'order' => $order));
$jsApiParameters = $tools->GetJsApiParameters($order);
UdpLog::info('【微信支付下单】支付参数,','order:'.json_encode($order).'uid:'.$uid.'返回:'.$jsApiParameters);
UdpLog::info('【微信支付下单】支付参数,', array('order' => $order, 'jsApiParameters' => $jsApiParameters));
$this->echoJson(array('code' => 200, 'data' => array('jsApiParameters' => json_decode($jsApiParameters))));
... ...