Merge branch 'hotfix/payLaftTime' into develop

郝肖肖
Commit 6fb76e6b62da345d7ac00d0c138f88f86c3c9bb5 2 parents 7a7099c6 68272823
Showing 51 changed files with 311 additions and 182 deletions
compile/www.yohobuy.com/0.0.26/test.php
library/Action/WebAction.php
library/Api/Yohobuy.php
library/LibModels/Web/Guang/InfoData.php
library/LibModels/Web/Home/CartData.php
library/LibModels/Web/Product/PayData.php
library/LibModels/Web/Product/SaleData.php
library/WebPlugin/Pay/Alibank/Service.php
library/WebPlugin/Pay/Alipay/Service.php
library/WebPlugin/Pay/Reqparams.php
library/WebPlugin/TemplateLayout.php
library/WebPlugin/TriggerError.php
library/WebPlugin/UdpLog.php
template/www.yohobuy.com/partials/layout/simple-header.phtml
web-static/dist/yohobuy/0.0.23/index.css
web-static/dist/yohobuy/0.0.23/index.js
web-static/dist/yohobuy/0.0.25/index-debug.js
web-static/dist/yohobuy/0.0.25/index.css
web-static/dist/yohobuy/0.0.25/index.js
web-static/dist/yohobuy/0.0.25/lib.js
--- a/compile/www.yohobuy.com/0.0.26/test.php 0 → 100644
View file @6fb76e6
+++ b/compile/www.yohobuy.com/0.0.26/test.php 0 → 100644
View file @6fb76e6
--- a/library/Action/WebAction.php
View file @6fb76e6
+++ b/library/Action/WebAction.php
View file @6fb76e6
@@ -20,6 +20,7 @@ use Hood\Session;
 use WebPlugin\Mobile;
 use Api\Yohobuy;
 use LibModels\Web\Passport\LoginData;
+use WebPlugin\UdpLog;
 class WebAction extends Controller_Abstract
 {
@@ -383,6 +384,7 @@ class WebAction extends Controller_Abstract
             $token = Helpers::makeToken($uid);
             $uidCookie = $userInfo['data']['profile_name'] . '::' . $userInfo['data']['uid'] . '::' . $userInfo['data']['vip_info']['title'] . '::' . $token;
             $this->setCookie('_UID',$uidCookie,time() + 86400 * 360);
+            UdpLog::info('【登录】同步登陆cookie生成',$uidCookie);
         }
         $this->setSession('_TOKEN', $token);
         $this->setSession('_LOGIN_UID', $uid);
@@ -402,7 +404,7 @@ class WebAction extends Controller_Abstract
         if (!$this->_useSession) {
             $useSession = false;
         }
-        $useSession = false;
+        //$useSession = false;
         if (!$this->_uid) {
             $cookie = $this->getCookie('_UID');
--- a/library/Api/Yohobuy.php
View file @6fb76e6
+++ b/library/Api/Yohobuy.php
View file @6fb76e6
@@ -22,20 +22,21 @@ class Yohobuy
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
     //java API
-    // const API_URL = 'http://api.yoho.yohoops.org/';//
-    // const API_URL2 = 'http://api.yoho.yohoops.org/';//
-    // const SERVICE_URL = 'http://service.yoho.yohoops.org/';
-    // const YOHOBUY_URL = 'http://www.yohobuy.com/';
-    // const API_OLD = 'http://api2.open.yohobuy.com/';
-    // const SERVICE_NOTIFY = 'http://service.yoho.cn/';// 支付回调地址
-
-    // 测试环境
-    const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
-    const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
+    const API_URL = 'http://api.yoho.yohoops.org/';//
+    const API_URL2 = 'http://api.yoho.yohoops.org/';//
+    const SERVICE_URL = 'http://service.yoho.yohoops.org/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
-    const API_OLD = 'http://test2.open.yohobuy.com/';
-    //   支付回调地址
-    const SERVICE_NOTIFY = 'http://testservice.yoho.cn:28077/';
+    const API_OLD = 'http://api2.open.yohobuy.com/';
+//// 支付回调地址
+    const SERVICE_NOTIFY = 'http://service.yoho.cn/';
+    
+    // 测试环境 */
+//     const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://192.168.102.205:8080/gateway/'
+//     const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
+//     const YOHOBUY_URL = 'http://www.yohobuy.com/';
+//     const API_OLD = 'http://test2.open.yohobuy.com/';
+////   支付回调地址
+//    const SERVICE_NOTIFY = 'http://testservice.yoho.cn:28077/';
     /* 预览环境 */
 //     const API_URL = 'http://preapi.yoho.cn/';
--- a/library/LibModels/Web/Guang/InfoData.php
View file @6fb76e6
+++ b/library/LibModels/Web/Guang/InfoData.php
View file @6fb76e6
@@ -95,7 +95,7 @@ class InfoData
      */
     public static function getArticleInfo($id, $onlyUrl = false)
     {
-        $param['article_id'] = $id;
+        $param['article_id'] = intval($id);
         return self::webApi(self::getUrl('getArticle'), $param, $onlyUrl);
     }
@@ -107,7 +107,7 @@ class InfoData
      */
     public static function author($authorId, $onlyUrl = false)
     {
-        $param['author_id'] = $authorId;
+        $param['author_id'] = intval($authorId);
         return self::webApi(self::getUrl('author'), $param, $onlyUrl);
     }
@@ -121,8 +121,8 @@ class InfoData
     public static function tagTop($page = 1,$limit = 10, $onlyUrl = false)
     {
-        $param['page'] = $page;
-        $param['limit'] = $limit;
+        $param['page'] = intval($page);
+        $param['limit'] = intval($limit);
         return self::webApi(self::getUrl('getTagTop'), $param, $onlyUrl);
     }
@@ -136,9 +136,9 @@ class InfoData
      */
     public static function comment($articleId, $page = 1, $limit = 10, $onlyUrl = false)
     {
-        $param['article_id'] = $articleId;
-        $param['page'] = $page;
-        $param['limit'] = $limit;
+        $param['article_id'] = intval($articleId);
+        $param['page'] = intval($page);
+        $param['limit'] = intval($limit);
         return self::webApi(self::getUrl('commentList'), $param, $onlyUrl);
     }
@@ -150,7 +150,7 @@ class InfoData
      */
     public static function articleContent($articleId, $onlyUrl = false)
     {
-        $param['article_id'] = $articleId;
+        $param['article_id'] = intval($articleId);
         return self::webApi(self::getUrl('getArticleContent'), $param, $onlyUrl);
     }
@@ -164,7 +164,7 @@ class InfoData
      */
     public static function baseInfo($articleId, $uid, $udid, $onlyUrl = false)
     {
-        $param['id'] = $articleId;
+        $param['id'] = intval($articleId);
         $param['uid'] = $uid;
         $param['udid'] = $udid;
         return self::webApi(self::getUrl('getArticleBaseInfo'), $param, $onlyUrl);
@@ -178,7 +178,7 @@ class InfoData
      */
     public static function relateBrand($articleId, $onlyUrl = false)
     {
-        $param['article_id'] = $articleId;
+        $param['article_id'] = intval($articleId);
         return self::webApi(self::getUrl('getBrand'), $param, $onlyUrl);
     }
@@ -192,9 +192,9 @@ class InfoData
      */
     public static function relateList($articleId, $tag, $limit = 3, $onlyUrl = false)
     {
-        $param['article_id'] = $articleId;
+        $param['article_id'] = intval($articleId);
         $param['tags'] = $tag;
-        $param['limit'] = $limit;
+        $param['limit'] = intval($limit);
         return self::webApi(self::getUrl('getOtherArticle'), $param, $onlyUrl);
     }
@@ -210,8 +210,8 @@ class InfoData
     public static function recommend($gender, $page = 1, $limit = 10, $onlyUrl = false)
     {
         $param['gender'] = $gender;
-        $param['page'] = $page;
-        $param['limit'] = $limit;
+        $param['page'] = intval($page);
+        $param['limit'] = intval($limit);
         return self::webApi(self::getUrl('getArticleByViewsNum'), $param, $onlyUrl);
     }
@@ -224,7 +224,7 @@ class InfoData
      */
     public static function addComment($id, $uid, $content)
     {
-        $param['article_id'] = $id;
+        $param['article_id'] = intval($id);
         $param['uid'] = $uid;
         $param['content'] = $content;
         return self::webApi(self::getUrl('addComment'), $param);
@@ -238,7 +238,7 @@ class InfoData
      */
     public static function setPraise($id, $udid)
     {
-        $param['article_id'] = $id;
+        $param['article_id'] = intval($id);
         $param['udid'] = $udid;
         return self::webApi(self::getUrl('setPraise'), $param);
     }
@@ -251,7 +251,7 @@ class InfoData
      */
     public static function cancelPraise($id, $udid)
     {
-        $param['article_id'] = $id;
+        $param['article_id'] = intval($id);
         $param['udid'] = $udid;
         return self::webApi(self::getUrl('cancelPraise'), $param);
     }
@@ -264,7 +264,7 @@ class InfoData
      */
     public static function setFavorite($id, $uid)
     {
-        $param['article_id'] = $id;
+        $param['article_id'] = intval($id);
         $param['uid'] = $uid;
         return self::webApi(self::getUrl('setFavorite'), $param);
     }
@@ -277,7 +277,7 @@ class InfoData
      */
     public static function cancelFavorite($id, $uid)
     {
-        $param['article_id'] = $id;
+        $param['article_id'] = intval($id);
         $param['uid'] = $uid;
         return self::webApi(self::getUrl('cancelFavorite'), $param);
     }
--- a/library/LibModels/Web/Home/CartData.php
View file @6fb76e6
+++ b/library/LibModels/Web/Home/CartData.php
View file @6fb76e6
@@ -522,5 +522,5 @@ class CartData
         $param['payment'] = $payment;
         $param['client_secret'] = Sign::getSign($param);
         return Yohobuy::get(Yohobuy::API_URL, $param);
-    }
+    }
 }
--- a/library/LibModels/Web/Product/PayData.php
View file @6fb76e6
+++ b/library/LibModels/Web/Product/PayData.php
View file @6fb76e6
@@ -25,6 +25,7 @@ class PayData
     {
         $param = Yohobuy::param();
         $param['client_type'] = 'web';
+        $param['uid'] = intval($uid);
         $param['private_key'] = Yohobuy::$privateKeyList['web'];
         $param['method'] = 'web.SpaceOrders.getOrderCountByUid';
--- a/library/LibModels/Web/Product/SaleData.php
View file @6fb76e6
+++ b/library/LibModels/Web/Product/SaleData.php
View file @6fb76e6
@@ -15,13 +15,13 @@ use Api\Sign;
 class SaleData 
 {
     /**
-     * @param $specialsaleId    专区ID
+     * @param int $specialsaleId    专区ID
      * @return array
      */
     public static function getSpecial($specialsaleId) 
     {
         $param = Yohobuy::param();
-        $param['special_id'] = $specialsaleId;
+        $param['special_id'] = intval($specialsaleId);
         $param['method'] = 'app.resources.getOneSpecial';
         $param['client_secret'] = Sign::getSign($param);
--- a/library/WebPlugin/Pay/Alibank/Service.php
View file @6fb76e6
+++ b/library/WebPlugin/Pay/Alibank/Service.php
View file @6fb76e6
@@ -42,8 +42,6 @@ class Service extends PayAbstract
     public function getPayRequestPars(Reqparams $params)
     {
 //        $baseUrl = $this->getBaseNoticeUrl($params->isTest);
-//        $loseTime = intval(($params->orderTime + 7200 - time()) / 60);
-        //	$loseTime = intval((strtotime(date("Y-m-d 10:00:00", strtotime("+1 day")))-time())/60);
         UdpLog::info("【{$this->logProjectPrefix}-支付宝银行支付】,function:getPayRequestPars,参数", $params);
         $parameter = array(
             'service' => $this->config->service,
@@ -58,7 +56,7 @@ class Service extends PayAbstract
             'payment_type' => $this->config->payment_type,
             'defaultbank' => $params->paymentParameter,
             'seller_email' => $this->config->sellerMail,
-//				'it_b_pay'  => $loseTime . 'm'
+            'it_b_pay'  =>  $params->payExpireMinute . 'm',
         );
         if ($this->config->anti_fishing['timestamp_enable']) {
             $anti_phishing_key = $this->getTimestamp();
--- a/library/WebPlugin/Pay/Alipay/Service.php
View file @6fb76e6
+++ b/library/WebPlugin/Pay/Alipay/Service.php
View file @6fb76e6
@@ -47,8 +47,6 @@ class Service extends PayAbstract
     {
         UdpLog::info("【{$this->logProjectPrefix}-支付宝支付】,function:getPayRequestPars,参数", $params);
 //        $baseUrl = $this->getBaseNoticeUrl($params->isTest);
-//		$loseTime = intval(($params->orderTime + 7200 -time())/60);
-//		$loseTime = intval((strtotime(date("Y-m-d 10:00:00", strtotime("+1 day")))-time())/60); //第二天十点
         $parameter = array(
             'service' => $this->config->service,
             'partner' => $this->config->partner,
@@ -58,13 +56,14 @@ class Service extends PayAbstract
             /* 业务参数 */
             'subject' => $params->goodsName,
             'out_trade_no' => $params->orderCode,
-//			'it_b_pay'  =>  $loseTime . 'm',
+            'it_b_pay'  =>  $params->payExpireMinute . 'm',
             'total_fee' => $params->totalFee / 100,   //单位为元
             'payment_type' => $this->config->payment_type,
             'seller_email' => $this->config->sellerMail,
             'sign_id_ext' => $params->uid,
             'sign_name_ext' => $params->userName
         );
+
         if ($this->config->anti_fishing['timestamp_enable']) {
             $anti_phishing_key = $this->getTimestamp();
             if (!empty($anti_phishing_key)) {
--- a/library/WebPlugin/Pay/Reqparams.php
View file @6fb76e6
+++ b/library/WebPlugin/Pay/Reqparams.php
View file @6fb76e6
@@ -11,17 +11,25 @@ namespace WebPlugin\Pay;
 class Reqparams
 {
-	public function __construct($_orderCode, $_totalFee, $_goodName, $client_ip, $_orderTime, $_paymentParameter="", $_isTest=false, $uid=0, $userName='')
+	public function __construct($_orderCode, $_totalFee, $_goodName, $client_ip, $_orderTime, $_paymentParameter="", $_isTest=false, $uid=0, $userName='', $_payExpire = '')
 	{
-		$this->orderCode = $_orderCode;
-		$this->totalFee = $_totalFee;
-		$this->goodsName = $_goodName;
-		$this->spbill_create_ip = $client_ip;
-		$this->orderTime = $_orderTime;
-		$this->paymentParameter = $_paymentParameter;
-		$this->isTest = $_isTest;
-		$this->uid = $uid;
-		$this->userName = $userName;
+            //到期时间，默认为当前时间加2个小时的时间戳
+            $_payExpire = empty($_payExpire) ? strtotime('+2 hours') : strtotime($_payExpire);
+            $payExpireMinute = 0;//剩余分钟数
+            if ($_payExpire && ($expireTime = $_payExpire - time()) > 0) {
+                $payExpireMinute = floor($expireTime / 60);
+            }
+
+            $this->orderCode = $_orderCode;
+            $this->totalFee = $_totalFee;
+            $this->goodsName = $_goodName;
+            $this->spbill_create_ip = $client_ip;
+            $this->orderTime = $_orderTime;
+            $this->payExpireMinute = $payExpireMinute;
+            $this->paymentParameter = $_paymentParameter;
+            $this->isTest = $_isTest;
+            $this->uid = $uid;
+            $this->userName = $userName;
 	}
 	/**
--- a/library/WebPlugin/TemplateLayout.php
View file @6fb76e6
+++ b/library/WebPlugin/TemplateLayout.php
View file @6fb76e6
@@ -162,7 +162,7 @@ class TemplateLayout implements View_Interface
             $template = file_get_contents($viewName, false, null);
             $phpStr = LightnCandy::compile($template, array(
                 // DEBUG: LightnCandy::FLAG_RENDER_DEBUG | LightnCandy::FLAG_ERROR_EXCEPTION
-                'flags' => LightnCandy::FLAG_RENDER_DEBUG | LightnCandy::FLAG_ERROR_EXCEPTION | LightnCandy::FLAG_MUSTACHE | LightnCandy::FLAG_HANDLEBARS, // 使用MUSTACHE和HANDLEBARS的模板格式
+                'flags' => LightnCandy::FLAG_MUSTACHE | LightnCandy::FLAG_HANDLEBARS, // 使用MUSTACHE和HANDLEBARS的模板格式
                 'basedir' => array($config->template->partials), // 模板里使用 {{> partial_name}} 时查找的目录
                 'fileext' => array($tplExt), // 允许查找文件的后缀
                 'lcrun' => 'Plugin\LCRun3', // 指定编译模板的runtime
--- a/library/WebPlugin/TriggerError.php 0 → 100644
View file @6fb76e6
+++ b/library/WebPlugin/TriggerError.php 0 → 100644
View file @6fb76e6
+<?php
+
+namespace WebPlugin;
+
+use WebPlugin\UdpLog;
+/**
+ * 异常错误日志
+ */
+class TriggerError
+{
+ public static function myErrorHandler($errno, $errstr, $errfile, $errline)
+ {
+//     print_r(get_defined_constants());exit;
+     switch ($errno) {
+         case \YAF\ERR\NOTFOUND\CONTROLLER:
+         case \YAF\ERR\NOTFOUND\MODULE:
+         case \YAF\ERR\NOTFOUND\ACTION:
+             header("Not Found");
+             break;
+         default:
+             $data['errno'] = $errno;
+             $data['errstr'] = $errstr;
+             $data['errfile'] = $errfile;
+             $data['errline'] = $errline;
+             UdpLog::triggerError('triggerError',$data);
+             break;
+     }
+     return true;
+ }
+}
--- a/library/WebPlugin/UdpLog.php
View file @6fb76e6
+++ b/library/WebPlugin/UdpLog.php
View file @6fb76e6
@@ -17,6 +17,8 @@ namespace WebPlugin;
  */
 class UdpLog
 {
+    //日志开关
+    private static $flag = true;
     //influxdb url
     public static $url = 'influxdb.yohobuy.com';
     //influxdb port
@@ -32,6 +34,15 @@ class UdpLog
     const RECORD_MODE = 'FILE';//mode: FILE | UDP
     /**
+     * 初始化
+     */
+    private function __construct()
+    {
+        if (self::$flag) {
+            return;
+        }
+    }
+    /**
      * proc line and send log to influxdb
      * @param $level
      * @param $message
@@ -158,4 +169,13 @@ class UdpLog
     public static function debug($message, $meta = '') {
         self::procLog(__METHOD__, $message, debug_backtrace(), $meta);
     }
+
+    /**
+     * yaf trigger error
+     * @param $message
+     * @param mixed $meta
+     */
+    public static function triggerError($message, $meta = '') {
+        self::procLog(__METHOD__, $message, debug_backtrace(), $meta);
+    }
 }
--- a/template/www.yohobuy.com/partials/layout/simple-header.phtml
View file @6fb76e6
+++ b/template/www.yohobuy.com/partials/layout/simple-header.phtml
View file @6fb76e6
@@ -45,7 +45,7 @@
             </li>
             <li>
                 <i class="tell-icon iconfont">&#xe61c;</i>
-                <span>400-9889-9646</span>
+                <span>400-8899-646</span>
             </li>
             {{/ tool}}
         </ul>
--- a/web-static/dist/yohobuy/0.0.23/index.css deleted 100644 → 0
View file @7a7099c
+++ b/web-static/dist/yohobuy/0.0.23/index.css deleted 100644 → 0
View file @7a7099c
--- a/web-static/dist/yohobuy/0.0.23/index.js deleted 100644 → 0
View file @7a7099c
+++ b/web-static/dist/yohobuy/0.0.23/index.js deleted 100644 → 0
View file @7a7099c
--- a/web-static/dist/yohobuy/0.0.25/index-debug.js
View file @6fb76e6
+++ b/web-static/dist/yohobuy/0.0.25/index-debug.js
View file @6fb76e6
--- a/web-static/dist/yohobuy/0.0.25/index.css
View file @6fb76e6
+++ b/web-static/dist/yohobuy/0.0.25/index.css
View file @6fb76e6
--- a/web-static/dist/yohobuy/0.0.25/index.js
View file @6fb76e6
+++ b/web-static/dist/yohobuy/0.0.25/index.js
View file @6fb76e6
--- a/web-static/dist/yohobuy/0.0.25/lib.js
View file @6fb76e6
+++ b/web-static/dist/yohobuy/0.0.25/lib.js
View file @6fb76e6
--- a/web-static/dist/yohobuy/0.0.23/index-debug.js → web-static/dist/yohobuy/0.0.26/index-debug.js
View file @6fb76e6
+++ b/web-static/dist/yohobuy/0.0.23/index-debug.js → web-static/dist/yohobuy/0.0.26/index-debug.js
View file @6fb76e6
--- a/web-static/dist/yohobuy/0.0.26/index.css 0 → 100644
View file @6fb76e6
+++ b/web-static/dist/yohobuy/0.0.26/index.css 0 → 100644
View file @6fb76e6
--- a/web-static/dist/yohobuy/0.0.26/index.js 0 → 100644
View file @6fb76e6
+++ b/web-static/dist/yohobuy/0.0.26/index.js 0 → 100644
View file @6fb76e6
--- a/web-static/dist/yohobuy/0.0.26/lib.js 0 → 100644
View file @6fb76e6
+++ b/web-static/dist/yohobuy/0.0.26/lib.js 0 → 100644
View file @6fb76e6
--- a/web-static/dist/yohobuy/0.0.27/index-debug.js 0 → 100644
View file @6fb76e6
+++ b/web-static/dist/yohobuy/0.0.27/index-debug.js 0 → 100644
View file @6fb76e6
--- a/web-static/dist/yohobuy/0.0.27/index.css 0 → 100644
View file @6fb76e6
+++ b/web-static/dist/yohobuy/0.0.27/index.css 0 → 100644
View file @6fb76e6
--- a/web-static/dist/yohobuy/0.0.27/index.js 0 → 100644
View file @6fb76e6
+++ b/web-static/dist/yohobuy/0.0.27/index.js 0 → 100644
View file @6fb76e6
--- a/web-static/dist/yohobuy/0.0.23/lib.js → web-static/dist/yohobuy/0.0.27/lib.js
View file @6fb76e6
+++ b/web-static/dist/yohobuy/0.0.23/lib.js → web-static/dist/yohobuy/0.0.27/lib.js
View file @6fb76e6
--- a/web-static/dist/yohobuy/assets/img/sprite.cart.png
View file @6fb76e6
+++ b/web-static/dist/yohobuy/assets/img/sprite.cart.png
View file @6fb76e6
--- a/web-static/dist/yohobuy/assets/img/sprite.passport.png
View file @6fb76e6
+++ b/web-static/dist/yohobuy/assets/img/sprite.passport.png
View file @6fb76e6
--- a/web-static/img/sprite.product.png
View file @6fb76e6
+++ b/web-static/img/sprite.product.png
View file @6fb76e6
--- a/web-static/package.json
View file @6fb76e6
+++ b/web-static/package.json
View file @6fb76e6
 {
   "name": "web-yohobuy",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "description": "web yohobuy static",
   "keywords": [],
   "homepage": "",
--- a/web-static/sass/home/_order-block.css
View file @6fb76e6
+++ b/web-static/sass/home/_order-block.css
View file @6fb76e6
@@ -204,6 +204,7 @@
             background: #fff;
             right: 185px;
             margin-top: -40px;
+            z-index: 1000;
             li {
                 line-height: 18px;
--- a/web-static/sass/product/_shop-index.css
View file @6fb76e6
+++ b/web-static/sass/product/_shop-index.css
View file @6fb76e6
@@ -191,6 +191,7 @@
             text-align: center;
             line-height: 1.5;
             background: #f5f5f5;
+            font-weight: bold;
             img {
                 width: 235px;
@@ -431,7 +432,7 @@
             }
         }
     }
-    
+
     .goods-wrap {
         .goods-container {
             .good-info {
@@ -499,6 +500,7 @@
             display: inline-block;
             line-height: 14px;
             vertical-align: middle;
+            font-weight: bold;
             .name {
                 font-size: 14px;
--- a/yohobuy/m.yohobuy.com/application/models/Product/Search.php
View file @6fb76e6
+++ b/yohobuy/m.yohobuy.com/application/models/Product/Search.php
View file @6fb76e6
@@ -58,7 +58,7 @@ class SearchModel
             }
             // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
             else {
-                Cache::set($key, $result, 600); // 缓存10分钟
+                Cache::set($key, $result, 300); // 缓存5分钟
             }
         }
@@ -116,7 +116,7 @@ class SearchModel
             }
             // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
             else {
-                Cache::set($key, $result, 600); // 缓存10分钟
+                Cache::set($key, $result, 300); // 缓存5分钟
             }
         }
--- a/yohobuy/www.yohobuy.com/application/Bootstrap.php
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/application/Bootstrap.php
View file @6fb76e6
@@ -149,6 +149,15 @@ class Bootstrap extends Bootstrap_Abstract
         //}
     }
+    /**
+     * triggerError
+     * @param Dispatcher $dispatcher
+     */
+    public function _initError(Dispatcher $dispatcher)
+    {
+        $dispatcher->getInstance()->setErrorHandler(array("\\WebPlugin\\TriggerError","myErrorHandler"));
+    }
+
 //    /**
 //     * 初始化第三方包
 //     * @param Dispatcher $dispatcher
--- a/yohobuy/www.yohobuy.com/application/models/Index/Coupon.php
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/application/models/Index/Coupon.php
View file @6fb76e6
@@ -45,7 +45,7 @@ class CouponModel
                     foreach ($couponlistval['data'] as $focus) {
                         $result['slide']['list'][] = array(
                             'href' => $focus['url'], //banner跳转链接
-                            'img' => Images::getImageUrl($focus['src'], 0, 0)//banner图片
+                            'img' => Images::getForceSourceUrl($focus['src'])//banner图片
                         );
                     }
                 }
@@ -61,7 +61,7 @@ class CouponModel
                     foreach ($couponlistval['data'] as $couponskey => $couponsval) {
                         $result['categories'][$i]['coupons'][$couponskey] = array(
                             'id' => $couponsval['couponID'], //优惠券号
-                            'img' => Images::getImageUrl($couponsval['image']['src'], 0, 0), //优惠券图片
+                            'img' => Images::getForceSourceUrl($couponsval['image']['src']), //优惠券图片
                             'url' => $couponsval['image']['url']    //去逛逛链接
                         );
--- a/yohobuy/www.yohobuy.com/application/models/Product/Item.php
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/application/models/Product/Item.php
View file @6fb76e6
@@ -199,13 +199,19 @@ class ItemModel
         if (!empty($banner['brandId'])) {
             $domainBrand = BrandsModel::getBrandByDomain($banner['brandDomain']);
-            if (empty($domainBrand['type']) || $domainBrand['type'] !== 2) {
-                //多品店不显示
-                $banner = array();
-            } else {
-                $basisData = ShopModel::basisTemplate($domainBrand['shopId']);
-                $banner['bgImg'] = empty($basisData['shopTopBanner']['banner']) ?
-                    $banner['bgImg'] : $basisData['shopTopBanner']['banner'];
+            if (!empty($domainBrand['type']) && !empty($domainBrand['shopId'])) {
+                switch (intval($domainBrand['type'])) {
+                    case 1: 
+                        //多品店不显示
+                        $banner = array();
+                        break;
+                    case 2: 
+                        //单品店显示新版的店铺banner
+                        $basisData = ShopModel::basisTemplate($domainBrand['shopId']);
+                        $banner['bgImg'] = empty($basisData['shopTopBanner']['banner']) ?
+                            $banner['bgImg'] : $basisData['shopTopBanner']['banner'];
+                        break;
+                }
             }
         }
--- a/yohobuy/www.yohobuy.com/application/models/Product/Shop.php
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/application/models/Product/Shop.php
View file @6fb76e6
@@ -426,7 +426,10 @@ class ShopModel
             }
         }
-        return $result;
+        return array(
+            'title' => empty($result[0]['title']) ? '' :  $result[0]['title'],
+            'list'=> $result
+        );
     }
     /**
@@ -571,13 +574,8 @@ class ShopModel
                     $list = self::$fun(self::getResourceData($list), $parameters);
                     switch ($fun) {
                         case 'shopTopBanner':
-                            $data[$fun] = $list;
-                            break;
                         case 'signboard':
-                            $data[$fun] = array(
-                                'title' => isset($list[0]['title']) ? $list[0]['title'] : '',
-                                'list'=> $list
-                            );
+                            $data[$fun] = $list;
                             break;
                     }
                 }
--- a/yohobuy/www.yohobuy.com/application/models/Shopping/Cart.php
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/application/models/Shopping/Cart.php
View file @6fb76e6
@@ -11,6 +11,7 @@ use WebPlugin\Cache;
 use WebPlugin\Images;
 use Configs\WebCacheConfig;
 use Hood\Core\Security\AuthCode;
+use WebPlugin\UdpLog;
 use Configs\ChannelConfig;
 /**
@@ -58,6 +59,7 @@ class CartModel
                 $result['isEmpty'] = true;
                 $result['guangUrl'] = Helpers::url('', null, 'list');
                 $result['viewOrderUrl'] = Helpers::url('/home/orders', array('t' => time()));
+                UdpLog::info('【购物车】校验参数传递auth','uid:'.$uid.'shoppingKey:'.$shoppingKey);
                 break;
             }
@@ -225,6 +227,8 @@ class CartModel
         $addCart = CartData::addToCart($productSku, $buyNumber, $goodsType, $isEdit, $promotionId, $uid, $shoppingKey);
         if ($addCart && isset($addCart['code'])) {
             $result = $addCart;
+        }else{
+            UdpLog::info('【购物车】校验参数传递auth','productSku:'.$productSku.'buyNumber:'.$buyNumber.'goodsType:'.$goodsType,'isEdit:'.$isEdit.'promotionId:'.$promotionId.'uid:'.$uid.'shoppingKey:'.$shoppingKey);
         }
         return $result;
@@ -245,6 +249,7 @@ class CartModel
         do {
             if (empty($skuList)) {
+                UdpLog::info('【购物车】校验参数传递auth','skuList:'.$skuList);
                 break;
             }
@@ -252,6 +257,8 @@ class CartModel
             if ($select && isset($select['code'])) {
                 $result['code'] = $select['code'];
                 $result['message'] = $select['message'];
+            }else{
+                UdpLog::info('【购物车】校验参数传递auth','uid:'.$uid.'skuList:'.$skuList.'shoppingKey:'.$shoppingKey.'hasPromotion:'.$hasPromotion);
             }
         } while (false);
@@ -274,6 +281,7 @@ class CartModel
         do {
             if (empty($skuList)) {
+                UdpLog::info('【购物车】校验参数传递auth','skuList:'.$skuList);
                 break;
             }
@@ -284,6 +292,8 @@ class CartModel
                 if (isset($remove['data']['goods_count'])) {
                     $result['total_goods_num'] = $remove['data']['goods_count'];
                 }
+            }else{
+                UdpLog::info('【购物车】校验参数传递auth','uid:'.$uid.'skuList:'.$skuList.'shoppingKey:'.$shoppingKey.'hasPromotion:'.$hasPromotion);
             }
         } while (false);
@@ -307,11 +317,11 @@ class CartModel
                 $result['code'] = 403;
                 $result['message'] = '请先登录！';
                 $result['data']['url'] = Helpers::url('/signin.html', array('refer' => Helpers::url('/shopping/cart')));
-
                 break;
             }
             if (empty($skuList)) {
+                UdpLog::info('【购物车】校验参数传递auth','skuList:'.$skuList);
                 break;
             }
@@ -319,6 +329,8 @@ class CartModel
             if ($add && isset($add['code'])) {
                 $result['code'] = $add['code'];
                 $result['message'] = $add['message'];
+            }else{
+                UdpLog::info('【购物车】校验参数传递auth','uid:'.$uid.'skuList:'.$skuList.'hasPromotion:'.$hasPromotion);
             }
         } while (false);
@@ -341,6 +353,7 @@ class CartModel
         do {
             if (empty($sku)) {
+                UdpLog::info('【购物车】校验参数传递auth','sku:'.$sku);
                 break;
             }
@@ -348,6 +361,8 @@ class CartModel
             if ($modify && isset($modify['code'])) {
                 $result['code'] = $modify['code'];
                 $result['message'] = $modify['message'];
+            }else{
+                UdpLog::info('【购物车】校验参数传递auth','uid:'.$uid.'sku:'.$sku,'increaseNum:'.$increaseNum.'decreaseNum:'.$decreaseNum.'shoppingKey:'.$shoppingKey);
             }
         } while (false);
@@ -421,6 +436,7 @@ class CartModel
             $browse = CartData::browseRecord($uid, $udid, $page, 6);
             if (empty($browse['data']['product_list'])) {
+                UdpLog::info('【购物车】校验参数传递auth','uid:'.$uid.'udid'.$udid.'page'.$page);
                 break;
             }
@@ -885,16 +901,19 @@ class CartModel
         do {
             if (empty($addressId)) {
+                UdpLog::info('【结算信息】配送地址参数校验','addressId为空');
                 $result['code'] = 401;
                 $result['message'] = '配送地址不能为空';
                 break;
             }
             if (empty($deliveryTimeId)) {
+                UdpLog::info('【结算信息】配送时间参数校验','deliveryTime为空');
                 $result['code'] = 402;
                 $result['message'] = '请选择配送时间';
                 break;
             }
             if (empty($deliveryWayId)) {
+                UdpLog::info('【结算信息】配送方式参数校验','deliveryWay为空');
                 $result['code'] = 403;
                 $result['message'] = '请选择配送方式';
                 break;
--- a/yohobuy/www.yohobuy.com/application/models/Shopping/Pay.php
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/application/models/Shopping/Pay.php
View file @6fb76e6
@@ -169,9 +169,10 @@ class PayModel
             $orderCount = 0;
             $orders = PayData::getOrderCountByUid($uid);
-            if (isset($orders['data']) && !empty($orders['data'])) {
-                $orderCount = $orders['data']['total'];
+            if (!empty($orders['data']['count'])) {
+                $orderCount = $orders['data']['count'];
             }
+
             $result['isOldUser'] = (intval($orderCount) > self::OLD_USER_LIMIT) ? true : false;
             // 订单数（用于订单统计）
             $result['orderCount'] = $orderCount;
@@ -282,7 +283,10 @@ class PayModel
                 $paymentParameter = $alipayToken;
             }
-            $reqParams = new Reqparams($orderCode, $totalFee, '有货订单号:' . $orderCode, '', $orderDetail['data']['create_time'], $paymentParameter, $isTest, $uid, $userName);
+            $reqParams = new Reqparams(
+                $orderCode, $totalFee, '有货订单号:' . $orderCode, '', $orderDetail['data']['create_time'],
+                $paymentParameter, $isTest, $uid, $userName, $orderDetail['data']['pay_expire']
+            );
             $reqPars = $payService->getPayRequestPars($reqParams);
             if (empty($reqPars)) {
                 $result['error'] = true;
--- a/yohobuy/www.yohobuy.com/application/models/Shopping/Payment.php
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/application/models/Shopping/Payment.php
View file @6fb76e6
@@ -71,7 +71,7 @@ class PaymentModel
                     'price' => $val['goods_price'],
                     'number' => $val['buy_number']
                 );
-                $pinyouGoodsArr[] = $val['product_id'] . ',' . $val['buy_number'];
+                $pinyouGoodsArr[] = $val['product_skn'] . ',' . $val['buy_number'];
             }
             $result['goodsData'] = $goodsData;
             // skn列表
@@ -173,9 +173,10 @@ class PaymentModel
             //查询用户订单数接口
             $orders = PayData::getOrderCountByUid($uid);
-            if (isset($orders['data']) && !empty($orders['data'])) {
-                $orderCount = $orders['data']['total'];
+            if (!empty($orders['data']['count'])) {
+                $orderCount = $orders['data']['count'];
             }
+
             $result['isOldUser'] = (intval($orderCount) > self::OLD_USER_LIMIT) ? true : false;
             // 订单数（用于订单统计）
             $result['orderCount'] = $orderCount;
@@ -324,14 +325,28 @@ class PaymentModel
             $input->SetBody('有货订单号:' . $orderCode);
             $input->SetOut_trade_no('YOHOBuy_' . $orderCode); // 商户订单号
             $input->SetTotal_fee($totalFee);
-            $input->SetTime_start(date("YmdHis"));
-            $input->SetTime_expire(date("YmdHis", time() + 600));
+            //到期时间
+            if (!empty($orderDetail['data']['pay_expire'])  && ($payExpireTime = strtotime($orderDetail['data']['pay_expire']))) {
+                $payExpireTime = $payExpireTime;
+            } else {
+                $payExpireTime = time();
+            }
+
+            $input->SetTime_start(date("YmdHis", strtotime('-2 hours', $payExpireTime)));
+            //最短失效时间间隔必须大于5分钟 [https://pay.weixin.qq.com/wiki/doc/api/native.php?chapter=9_1]
+            $input->SetTime_expire(date("YmdHis", $payExpireTime + 300));
             $input->SetTrade_type("NATIVE");
             $input->SetProduct_id($orderCode);
             $notify = new WxPayNativePay();
             $payResult = $notify->GetPayUrl($input);
+            //错误信息，EQ:超时
+            if (!empty($payResult['return_code']) && $payResult['return_code'] === 'FAIL') {
+                self::$code['message'] = $payResult['return_msg'];
+                break;
+            }
-            if ($payResult['result_code'] === 'FAIL') {
+            //错误信息，EQ:多次涮新
+            if (!empty($payResult['result_code']) && $payResult['result_code'] === 'FAIL') {
                 self::$code['message'] = $payResult['err_code_des'];
                 break;
             }
@@ -521,7 +536,10 @@ class PaymentModel
                 $paymentParameter = $alipayToken;
             }
-            $reqParams = new Reqparams($orderCode, $totalFee, '有货订单号:' . $orderCode, '', $orderDetail['data']['create_time'], $paymentParameter, $isTest, $uid, $userName);
+            $reqParams = new Reqparams(
+                $orderCode, $totalFee, '有货订单号:' . $orderCode, '', $orderDetail['data']['create_time'],
+                $paymentParameter, $isTest, $uid, $userName, $orderDetail['data']['pay_expire']
+            );
             $reqPars = $payService->getPayRequestPars($reqParams);
             UdpLog::info(
                 "【支付-参数】,function:getPayData,orderCode:{$orderCode},接口返回",
--- a/yohobuy/www.yohobuy.com/application/modules/Cart/controllers/Index.php
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/application/modules/Cart/controllers/Index.php
View file @6fb76e6
@@ -3,10 +3,11 @@
 use Action\WebAction;
 use WebPlugin\Helpers;
 use Shopping\CartModel;
+use WebPlugin\UdpLog;
 /**
  * 购物车相关的控制器
- * 
+ *
  * @name IndexController
  * @package Cart
  * @copyright yoho.inc
@@ -23,13 +24,13 @@ class IndexController extends WebAction
     {
         $uid = $this->getUid(false);
         $shoppingKey = Helpers::getShoppingKeyByCookie();
-        
+
         // 显示一次并清除已删除的COOKIE记录
         $cartDelList = $this->getCookie('cart-del-list');
         if (!empty($cartDelList)) {
             $this->setCookie('cart-del-list', '');
         }
-        
+
         $this->setTitle('购物车', true, ' | ');
         $this->setSimpleHeader();
         $this->_view->display('cart', array(
@@ -38,10 +39,10 @@ class IndexController extends WebAction
             'uid' => $uid ? $uid : '',
         ));
     }
-    
+
     /**
      * 购物车商品选择与取消
-     * 
+     *
      * @param string skuList 商品sku列表,json格式,如{"744403":1,"777777":3}
      * @param bool hasPromotion 标识是不是有promotion_id参数, 后端会去调用不同的接口
      * @return json
@@ -60,10 +61,10 @@ class IndexController extends WebAction
         $this->echoJson($result);
     }
-    
+
     /**
      * 修改购物车商品数量
-     * 
+     *
      * @param int sku 商品到尺码的编吗
      * @param int increaseNum 增加1
      * @param int decreaseNum 减少1
@@ -75,12 +76,12 @@ class IndexController extends WebAction
         if ($this->isAjax()) {
             $shoppingKey = Helpers::getShoppingKeyByCookie();
-            
+
             $uid = $this->getUid(false);
             $sku = $this->post('sku', 0);
             $increaseNum = $this->post('increaseNum', null);
             $decreaseNum = $this->post('decreaseNum', null);
-            
+
             $result = CartModel::modifyProductNum($uid, $sku, $increaseNum, $decreaseNum, $shoppingKey);
             if (!empty($result['code']) && $result['code'] == 200) {
                 $this->setShoppingCookie($uid);
@@ -89,10 +90,10 @@ class IndexController extends WebAction
         $this->echoJson($result);
     }
-    
+
     /**
      * 移出购物车
-     * 
+     *
      * @param string skuList 商品sku列表,json格式,如[{"product_sku":1047193,"buy_number":1,"promotion_id":0}]
      * @param bool hasPromotion 标识是不是有promotion_id参数, 后端会去调用不同的接口
      * @return json
@@ -111,15 +112,15 @@ class IndexController extends WebAction
                 $this->setShoppingCookie($uid);
             }
         }
-        
+
         $this->echoJson($result);
     }
     /**
      * 移入收藏夹
-     * 
+     *
      * 支持批量移入收藏夹
-     * 
+     *
      * @param string 商品sku列表,json格式,如{"744403":1,"777777":3}
      * @param bool hasPromotion 标识是不是有promotion_id参数, 后端会去调用不同的接口
      * @return json
@@ -140,32 +141,32 @@ class IndexController extends WebAction
         $this->echoJson($result);
     }
-    
+
     /**
      * 检查是否收藏
-     * 
+     *
      * @param string sknList 商品productId列表，如["123123","123412"]
      */
     public function checkFavAction()
     {
         $result = array('code' => 200, 'message' => '是否收藏', 'data' => array());
-        
+
         if ($this->isAjax()) {
             $uid = $this->getUid(false);
             $pidList = $this->post('pidList', '');
             $result['data'] = CartModel::checkUserIsFav($uid, $pidList);
         }
- 
+
         $this->echoJson($result);
     }
-    
+
     /**
      * 凑单商品异步请求
      */
     public function getTogetherProductAction()
     {
-        $result = array('code' => 200, 'data' => array(), 'message' => '凑单商品');   
-        
+        $result = array('code' => 200, 'data' => array(), 'message' => '凑单商品');
+
         if ($this->isAjax()) {
             $page = $this->get('page', 1);
             $result = CartModel::getTogetherProduct($page);
@@ -180,15 +181,15 @@ class IndexController extends WebAction
     public function getHistroyProductAction()
     {
         $result = array('code' => 200, 'data' => array(), 'message' => '浏览记录');
-        
+
         // 按照产品把明扬的指示，去掉最近浏览记录
         $this->echoJson($result); exit();
-        
+
         do {
             if (!$this->isAjax()) {
                 break;
             }
-            
+
             $page = $this->get('page', 1);
 //            $uid = $this->getUid(false);
 //            if ($uid) {
@@ -196,7 +197,7 @@ class IndexController extends WebAction
 //                $result = CartModel::getBrowseProduct($uid, $udid, $page);
 //                break;
 //            }
-            
+
             $sknList = $this->getCookie('_browseskn');
             if (empty($sknList)) {
                 break;
@@ -208,7 +209,7 @@ class IndexController extends WebAction
         $this->echoJson($result);
     }
-    
+
     /**
      * 确认订单
      */
@@ -216,68 +217,67 @@ class IndexController extends WebAction
     {
         $type = $this->get('type', 1);
         $refer = Helpers::url('/cart/index/orderEnsure', array('type' => $type));
-                
+
         // 审判用户是否已登录
         $this->auditJumpLogin(false, $refer);
-        
+
         $this->setTitle('填写订单', true, ' | ');
         $this->setSimpleHeader();
-        
+
         $cartType = ($type == 2) ? 'advance' : 'ordinary';
         $isAdvanceCart = ($type == 2) ? true : false;
         $uid = $this->getUid(false);
-        
+
         $orderEnsure = CartModel::cartPay($uid, $cartType, $isAdvanceCart);
         if (empty($orderEnsure)) {
             $this->go(Helpers::url('/shopping/cart'));
         }
         $this->_view->display('order-ensure', array(
-            'orderEnsurePage' => true, 
+            'orderEnsurePage' => true,
             'orderEnsure' => $orderEnsure,
-            'packages'=> $orderEnsure['packages']
         ));
     }
-    
+
     /**
      * 异步获取地址信息
-     * 
+     *
      * @return json
      */
     public function getAddressAction()
     {
         $result = array('code' => 200, 'data' => array(), 'message' => '地址信息');
-        
+
         if ($this->isAjax()) {
             $uid = $this->getUid(false);
             $result['data'] = CartModel::userAddressList($uid);
         }
-        
+
         $this->echoJson($result);
     }
-    
+
     /**
      * 设置为默认的地址
-     * 
+     *
      * @param int id 地址ID
      * @return json
      */
     public function setDefaultAddressAction()
     {
         $result = array();
-        
+
         if ($this->isAjax()) {
             $uid = $this->getUid(false);
             $addressId = $this->post('id');
             $result = CartModel::setDefaultAddress($uid, $addressId);
         }
-        
+
         $this->echoJson($result);
     }
-    
+
     /**
      * 保存地址信息
-     * 
+     *
      * @param int $id 地址ID ,当修改操作的时候需要传，添加时候不需要传
      * @param string $address 地址信息
      * @param int $areaCode 城市码
@@ -292,7 +292,7 @@ class IndexController extends WebAction
     public function saveAddressAction()
     {
         $result = array();
-        
+
         if ($this->isAjax()) {
             $uid = $this->getUid(false);
             $id = $this->post('id', null);
@@ -312,38 +312,38 @@ class IndexController extends WebAction
                 }
             }
         }
-        
+
         $this->echoJson($result);
     }
-    
+
     /**
      * 删除地址
-     * 
+     *
      * @param int id 地址ID
      */
     public function delAddressAction()
     {
         $result = array();
-        
+
         if ($this->isAjax()) {
             $uid = $this->getUid(false);
             $addressId = $this->post('id');
             $result = CartModel::delAddress($uid, $addressId);
         }
-        
+
         $this->echoJson($result);
     }
-    
+
     /**
      * 获取省市区县信息列表
-     * 
+     *
      * @param int id
      * @return json
      */
     public function getAreaListAction()
     {
         $result = array('code' => 200, 'message' => '地区信息', 'data' => array());
-        
+
         if ($this->isAjax()) {
             $id = $this->get('id', 0);
             $result['data'] = CartModel::getAreaList($id);
@@ -351,16 +351,16 @@ class IndexController extends WebAction
         $this->echoJson($result);
     }
-    
+
     /**
      * 获取优惠券列表
-     * 
+     *
      * @return json
      */
     public function getCouponListAction()
     {
         $result = array('code' => 200, 'message' => '优惠券信息', 'data' => array());
-        
+
         if ($this->isAjax()) {
             $uid = $this->getUid(false);
             $result['data'] = CartModel::getCouponList($uid);
@@ -368,10 +368,10 @@ class IndexController extends WebAction
         $this->echoJson($result);
     }
-    
+
     /**
      * 购物车选择改变字段，重新运算订单数据
-     * 
+     *
      * @param string $cartType 购物车类型，ordinary表示普通, advance表示预售
      * @param int $deliveryWay 配送方式，1表示普通快递，2表示顺丰速运
      * @param int $paymentType 支付方式，1表示在线支付，2表示货到付款
@@ -389,21 +389,19 @@ class IndexController extends WebAction
             $deliveryWay = $this->post('deliveryWay', 1);
             $paymentType = $this->post('paymentType', 1);
             $couponCode = $this->post('couponCode', null);
-            $promotionCode = $this->post('promotionCode', null);
             $yohoCoin = $this->post('yohoCoin', null);
+            $promotionCode = $this->post('promotionCode', null);
             $redEnvelopes = $this->post('redEnvelopes', null);
             $uid = $this->getUid(false);
-            //优先取优惠码
-            $couponCode = $promotionCode ? null : $couponCode;
             $result = CartModel::orderCompute($uid, $cartType, $deliveryWay, $paymentType, $couponCode, $promotionCode, $yohoCoin, $redEnvelopes);
         }
         $this->echoJson($result);
     }
-    
+
     /**
      * 确认结算订单
-     * 
+     *
      * @param int $addressId 地址ID
      * @param int $cartType 购物车类型ID
      * @param int $deliveryTimeId 寄送时间ID
@@ -429,54 +427,53 @@ class IndexController extends WebAction
             if (!$this->isAjax()) {
                 break;
             }
-            
+
             // 判断用户是否登录
             $uid = $this->getUid(false);
             if (!$uid) {
                 $result['message'] = '请先登录';
                 break;
             }
-            
+
             $addressId = $this->post('addressId', null);
             $cartType = $this->post('cartType', 'ordinary'); // 默认普通购物车
             $deliveryTimeId = $this->post('deliveryTimeId', 1); // 默认只工作日配送
             $deliveryWayId = $this->post('deliveryWayId', 1); // 默认普通快递
             $invoiceTitle = $this->post('invoiceTitle', null); // 发票抬头
-            $invoiceId = $this->post('invoiceId', null); // 发票类型 
+            $invoiceId = $this->post('invoiceId', null); // 发票类型
             $paymentId = $this->post('paymentId', 15); // 支付ID
             $paymentType = $this->post('paymentType', 1); // 默认在线支付
             $remark = $this->post('remark', ''); // 备注信息
-            $couponCode = $this->post('couponCode', null); // 优惠券码
-            $promotionCode = $this->post('promotionCode', null);//优惠码
+            $couponCode = $this->post('couponCode', null); // 优惠券
+            $promotionCode = $this->post('promotionCode', null); // 优惠码
             $yohoCoin = $this->post('yohoCoin', 1); // YOHO币
             $isPreContact = $this->post('isPreContact', false); // 送货前是否联系
             $isPrintPrice = $this->post('isPrintPrice', true); // 是否打印价格
             $redEnvelopes = $this->post('redEnvelopes', null);
-            //优先优惠码
-            $couponCode = $promotionCode?null:$couponCode;
+
             // 调用下单接口
-            $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTimeId, $deliveryWayId, $invoiceTitle, $invoiceId, 
-                                          $paymentId, $paymentType, $remark, $couponCode,$promotionCode,$yohoCoin, $isPreContact, $isPrintPrice, $redEnvelopes);
-            
+            $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTimeId, $deliveryWayId, $invoiceTitle, $invoiceId,
+                                          $paymentId, $paymentType, $remark, $couponCode, $promotionCode, $yohoCoin, $isPreContact, $isPrintPrice, $redEnvelopes);
             // 判断是否下单成功
             if (empty($result['data']['order_code'])) {
+                UdpLog::info('【结算信息】判断是否下单成功','order_code'.$result['data']['order_code']);
                 break;
             }
-            
+
             // 跳转到支付的URL链接
             $result['data']['payUrl'] = Helpers::url('/shopping/pay', array('ordercode' => $result['data']['order_code']));
         }
         while (false);
-        
+
 //            $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTime, $deliveryWay, $invoiceTitle, $invoiceId, $paymentId, $paymentType, $remark, $couponCode, $yohoCoin);
 //
-//            // 记录下单异常的数据
-//            if (empty($result)) {
-//                $message = 'uid:' . $uid . ',addressId:' . $addressId . ',cartType:' . $cartType . ',deliveryTime:' . $deliveryTime
-//                              . ',deliveryWay:' . $deliveryWay . 'invoiceTitle:' . $invoiceTitle . ',invoiceId:' . $invoiceId  . ',yohoCoin:' . $yohoCoin
-//                              . ',paymentId:' . $paymentId . ',paymentType:' . $paymentType . ',remark:' . $remark . ',couponCode:' . $couponCode . "\n";
-//                error_log($message, 3, '/Data/logs/php/pc_error/order.' . date('Ym') . '.log');
-//            }
+            // 记录下单异常的数据
+            if (empty($result)) {
+                $message = 'uid:' . $uid . ',addressId:' . $addressId . ',cartType:' . $cartType . ',deliveryTime:' . $deliveryTime
+                              . ',deliveryWay:' . $deliveryWay . 'invoiceTitle:' . $invoiceTitle . ',invoiceId:' . $invoiceId  . ',yohoCoin:' . $yohoCoin
+                              . ',paymentId:' . $paymentId . ',paymentType:' . $paymentType . ',remark:' . $remark . ',couponCode:' . $couponCode . "\n";
+                UdpLog::info('【下单】下单异常数据','message:'.$message,'返回:'.json_encode($result));
+            }
 //            // 返回数据
 //            else {
 //                // 提交成功清除Cookie
@@ -492,10 +489,10 @@ class IndexController extends WebAction
 //                    // do nothing
 //                }
 //            }
-        
+
         $this->echoJson($result);
     }
-    
+
     /**
      * 加入购物车
      *
@@ -539,12 +536,12 @@ class IndexController extends WebAction
         $this->echoJson($result);
     }
-    
+
     /**
      * 获取商品信息
      */
     public function getProductInfoAction()
-    {   
+    {
         $productId = $this->get('productId');
         $uid = $this->getUid();
         $vipLevel = -1;
@@ -557,10 +554,10 @@ class IndexController extends WebAction
         }
         $this->_view->display('goods-detail', $data);
     }
-    
+
     /**
      * 获取购物车商品总数
-     * 
+     *
      * @return jsonp
      */
     public function countAction()
@@ -569,10 +566,10 @@ class IndexController extends WebAction
         $uid = $this->getUid(false);
         $shoppingKey = Helpers::getShoppingKeyByCookie();
         $result = CartModel::getCartCount($uid, $shoppingKey);
-        
+
         $this->helpJsonCallbackResult($callback, 200, '总数', $result);
     }
-    
+
     /**
      * 设置购物车COOKIE信息
      */
@@ -590,5 +587,5 @@ class IndexController extends WebAction
             )));
         }
     }
-    
-}
+
+}
--- a/yohobuy/www.yohobuy.com/application/modules/Passport/controllers/Login.php
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/application/modules/Passport/controllers/Login.php
View file @6fb76e6
@@ -7,6 +7,7 @@ use Passport\PassportModel;
 use Configs\ChannelConfig;
 use WebPlugin\Helpers;
 use WebPlugin\Cache;
+use WebPlugin\UdpLog;
 /**
  * 登录
@@ -113,6 +114,7 @@ class LoginController extends WebAction
             $verifyCode = trim($this->post('captcha'));
             $isRemember = $this->post('isRemember');
             if (!is_numeric($area) || empty($account) || empty($password)) {
+                UdpLog::info('【登录】校验参数传递auth','area:'.$area.'account:'.$account.'password:'.$password);
                 break;
             }
@@ -124,6 +126,7 @@ class LoginController extends WebAction
                 $verifyMobile = is_numeric($account);
             }
             if (!$verifyEmail && !$verifyMobile) {
+                UdpLog::info('【登录】校验账号是否有效auth','email:'.$verifyEmail.'mobile:'.$verifyMobile);
                 break;
             }
@@ -165,6 +168,7 @@ class LoginController extends WebAction
             if ($verifyCode) {
                 $picFlag = PassportModel::verifyCode($verifyCode);
                 if (!$picFlag) {
+                    UdpLog::info('【登录】登录验证码','area:'.$area.'account:'.$account.'verifyCode:'.$verifyCode);
                     $data = array('code' => 400, 'message' => '验证码不正确或验证码已过期', 'data' => array('needCaptcha' => true, 'errorType' => 'captcha'));
                     break;
                 }
--- a/yohobuy/www.yohobuy.com/application/modules/Passport/controllers/Register.php
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/application/modules/Passport/controllers/Register.php
View file @6fb76e6
@@ -6,6 +6,7 @@ use WebPlugin\Helpers;
 use WebPlugin\Cache;
 use Passport\PassportModel;
 use LibModels\Web\Passport\BindData;
+use WebPlugin\UdpLog;
 /**
  * 注册
@@ -265,6 +266,7 @@ class RegisterController extends WebAction
             $mobile = trim($this->post('mobile'));
             $area = trim($this->post('area'));
             if (!is_numeric($mobile) || !is_numeric($area)) {
+                UdpLog::info('【注册】参数校验', 'mobile:'.$mobile.'area:'.$area);
                 $data['message'] = '手机号码格式不正确';
                 break;
             }
@@ -272,6 +274,7 @@ class RegisterController extends WebAction
             /* 判断是否是有效的注册方式，防注册机刷 */
             $effectiveTime = $this->getSession('effective_time');
             if ($effectiveTime < time() || empty($effectiveTime)) {
+                UdpLog::info('【注册】超时', 'mobile:'.$mobile.'area:'.$area);
                 $data['message'] = '注册超时';
                 break;
             }
@@ -279,6 +282,7 @@ class RegisterController extends WebAction
             //检测验证码不正确
             $verifyCode = strtolower(trim($this->post('verifyCode'))); //图形验证码
             if (!PassportModel::verifyCode($verifyCode)) {
+                UdpLog::info('【注册】验证码不正确', 'mobile:'.$mobile.'area:'.$area.'verifyCode:'.$verifyCode);
                 $data['message'] = '验证码不正确';
                 break;
             }
@@ -287,6 +291,7 @@ class RegisterController extends WebAction
             $code = trim($this->post('code')); //手机验证码
             $password = $this->post('password');
             if (!Helpers::verifyPassword($password)) {
+                UdpLog::info('【注册】密码格式问题', 'mobile:'.$mobile.'area:'.$area.'password:'.$password);
                 $data['message'] = '密码不正确';
                 break;
             }
@@ -302,6 +307,7 @@ class RegisterController extends WebAction
                 $ipTimes = intval($ipTimes);
             }
             if ($ipTimes >= 500) {
+                UdpLog::info('【注册】ip限制', 'mobile:'.$mobile.'area:'.$area.'ip:'.$ip.'ipTimes:'.$ipTimes);
                 $data['message'] = '由于你IP受限无法注册';
                 break;
             }
@@ -309,6 +315,7 @@ class RegisterController extends WebAction
             /* 验证注册的标识码是否有效 */
             $data = RegData::validMobileCode($area, $mobile, $code);
             if (!isset($data['code']) || $data['code'] != 200) {
+                UdpLog::info('【注册】短信验证码校验', 'mobile:'.$mobile.'area:'.$area.'code:'.$code);
                 $data['message'] = '验证码错误';
                 break;
             }
--- a/yohobuy/www.yohobuy.com/application/modules/Pay/controllers/Notice.php
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/application/modules/Pay/controllers/Notice.php
View file @6fb76e6
@@ -5,7 +5,7 @@ use Shopping\PayModel;
 use WebPlugin\Pay\PayFactory;
 use WebPlugin\Pay\Rspparams;
 use WebPlugin\Pay\weixin\PayNotifyCallBack;
-
+use WebPlugin\UdpLog;
 /**
  * 支付Notice
  */
@@ -24,6 +24,7 @@ class NoticeController extends WebAction
     public function alipaynoticeAction()
     {
         $res = $this->getParseResponse($_POST, 2);
+        UdpLog::info("【支付宝异步】,function:alipaynoticeAction,参数", array('pars' => $_POST, 'res' => $res));
         if ($res->payResult != -1) {
             $this->payResultProc($res, 2);
             echo "success";
@@ -37,6 +38,7 @@ class NoticeController extends WebAction
     public function alipayreturnAction()
     {
         $res = $this->getParseResponse($_GET, 2);
+        UdpLog::info("【支付宝同步】,function:alipayreturnAction,参数", array('pars' => $_GET, 'res' => $res));
         $dealResult = $this->payResultProc($res, 2);
         $dealResult['payData'] = array('payWay' => '支付宝');
         $this->commonShowResult($dealResult);
@@ -48,6 +50,7 @@ class NoticeController extends WebAction
     public function alibarcodenoticeAction()
     {
         $res = $this->getParseResponse($_POST, 17);
+        UdpLog::info("【支付宝二维码支付异步】,function:alibarcodenoticeAction,参数", array('pars' => $_POST, 'res' => $res));
         if ($res->payResult != -1) {
             $this->payResultProc($res, 17);
             echo "success";
@@ -61,6 +64,7 @@ class NoticeController extends WebAction
     public function alibarcodereturnAction()
     {
         $res = $this->getParseResponse($_GET, 17);
+        UdpLog::info("【支付宝二维码支付同步】,function:alibarcodereturnAction,参数", array('pars' => $_GET, 'res' => $res));
         $dealResult = $this->payResultProc($res, 17);
         $dealResult['payData'] = array('payWay' => '支付宝');
         $this->commonShowResult($dealResult);
@@ -225,6 +229,7 @@ class NoticeController extends WebAction
             $uid = $this->getSession(self::SESSION_UID_KEY);
             $this->setSession(self::SESSION_UID_KEY, null);
         }
+        UdpLog::info("【微信扫码支付结果商户通知地址】,function:wechatqrcodenotifyAction");
         $notify = new PayNotifyCallBack($uid);
         $notify->handle(false);
     }
@@ -248,6 +253,7 @@ class NoticeController extends WebAction
             $payment = PayModel::getPaymentById(21);
             $payService = PayFactory::factory($payment);
             $res = $payService->parseResponse(array('orderCode' => $orderCode));
+            UdpLog::info("【微信扫码支付返回】,function:wechatqrcodereturnAction,参数", array('pars' => $_GET, 'res' => $res));
             $dealResult = $this->payResultProc($res, 21);
             $dealResult['payData'] = array('payWay' => '微信扫码支付');
         } while (false);
--- a/yohobuy/www.yohobuy.com/application/modules/Product/controllers/Index.php
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/application/modules/Product/controllers/Index.php
View file @6fb76e6
@@ -95,7 +95,7 @@ class IndexController extends WebAction
         //调用模型获得品牌页数据
         $data = BrandsModel::getBrandSearchData($condition, $options);
-
+        $data['signboard'] = isset($result['signboard']) ? $result['signboard'] : '';//水牌
         //统计前三个商品
         $skn=array();
         $arr=array();
@@ -315,7 +315,6 @@ class IndexController extends WebAction
      */
     public function shopHome($shopId)
     {
-        $domain = $this->param('named');
         // 设置头部数据
         $this->setWebNavHeader();
         $misort = $this->get('misort');
--- a/yohobuy/www.yohobuy.com/configs/application.developer.ini
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/configs/application.developer.ini
View file @6fb76e6
@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 ; 应用的版本号
-application.version = "0.0.24"
+application.version = "0.0.27"
 ; 网站SEO信息
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
--- a/yohobuy/www.yohobuy.com/configs/application.preview.ini
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/configs/application.preview.ini
View file @6fb76e6
@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 ; 应用的版本号
-application.version = "0.0.25"
+application.version = "0.0.27"
 ; 网站SEO信息
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
--- a/yohobuy/www.yohobuy.com/configs/application.production.ini
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/configs/application.production.ini
View file @6fb76e6
@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 ; 应用的版本号
-application.version = "0.0.25"
+application.version = "0.0.27"
 ; 网站SEO信息
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
--- a/yohobuy/www.yohobuy.com/configs/application.testing.ini
View file @6fb76e6
+++ b/yohobuy/www.yohobuy.com/configs/application.testing.ini
View file @6fb76e6
@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 ; 应用的版本号
-application.version = "0.0.25"
+application.version = "0.0.27"
 ; 网站SEO信息
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"