Merge branch 'master' into release/4.5

@@ -25,6 +25,7 @@ class PayData
     {
     {
         $param = Yohobuy::param();
         $param = Yohobuy::param();
         $param['client_type'] = 'web';
         $param['client_type'] = 'web';
+        $param['uid'] = intval($uid);
         $param['private_key'] = Yohobuy::$privateKeyList['web'];
         $param['private_key'] = Yohobuy::$privateKeyList['web'];
         $param['method'] = 'web.SpaceOrders.getOrderCountByUid';
         $param['method'] = 'web.SpaceOrders.getOrderCountByUid';
 
 

@@ -45,7 +45,7 @@
             </li>
             </li>
             <li>
             <li>
                 <i class="tell-icon iconfont">&#xe61c;</i>
                 <i class="tell-icon iconfont">&#xe61c;</i>
-                <span>400-9889-9646</span>
+                <span>400-8899-646</span>
             </li>
             </li>
             {{/ tool}}
             {{/ tool}}
         </ul>
         </ul>

 {
 {
   "name": "web-yohobuy",
   "name": "web-yohobuy",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "description": "web yohobuy static",
   "description": "web yohobuy static",
   "keywords": [],
   "keywords": [],
   "homepage": "",
   "homepage": "",

@@ -199,13 +199,19 @@ class ItemModel
 
 
         if (!empty($banner['brandId'])) {
         if (!empty($banner['brandId'])) {
             $domainBrand = BrandsModel::getBrandByDomain($banner['brandDomain']);
             $domainBrand = BrandsModel::getBrandByDomain($banner['brandDomain']);
-            if (empty($domainBrand['type']) || $domainBrand['type'] !== 2) {
+            if (!empty($domainBrand['type']) && !empty($domainBrand['shopId'])) {
+                switch (intval($domainBrand['type'])) {
+                    case 1: 
                         //多品店不显示
                         //多品店不显示
                         $banner = array();
                         $banner = array();
-            } else {
+                        break;
+                    case 2: 
+                        //单品店显示新版的店铺banner
                         $basisData = ShopModel::basisTemplate($domainBrand['shopId']);
                         $basisData = ShopModel::basisTemplate($domainBrand['shopId']);
                         $banner['bgImg'] = empty($basisData['shopTopBanner']['banner']) ?
                         $banner['bgImg'] = empty($basisData['shopTopBanner']['banner']) ?
                             $banner['bgImg'] : $basisData['shopTopBanner']['banner'];
                             $banner['bgImg'] : $basisData['shopTopBanner']['banner'];
+                        break;
+                }
             }
             }
         }
         }
 
 

@@ -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);
                     $list = self::$fun(self::getResourceData($list), $parameters);
                     switch ($fun) {
                     switch ($fun) {
                         case 'shopTopBanner':
                         case 'shopTopBanner':
-                            $data[$fun] = $list;
-                            break;
                         case 'signboard':
                         case 'signboard':
-                            $data[$fun] = array(
-                                'title' => isset($list[0]['title']) ? $list[0]['title'] : '',
-                                'list'=> $list
-                            );
+                            $data[$fun] = $list;
                             break;
                             break;
                     }
                     }
                 }
                 }

@@ -169,9 +169,10 @@ class PayModel
             $orderCount = 0;
             $orderCount = 0;
             $orders = PayData::getOrderCountByUid($uid);
             $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['isOldUser'] = (intval($orderCount) > self::OLD_USER_LIMIT) ? true : false;
             // 订单数（用于订单统计）
             // 订单数（用于订单统计）
             $result['orderCount'] = $orderCount;
             $result['orderCount'] = $orderCount;

@@ -173,9 +173,10 @@ class PaymentModel
             //查询用户订单数接口
             //查询用户订单数接口
             $orders = PayData::getOrderCountByUid($uid);
             $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['isOldUser'] = (intval($orderCount) > self::OLD_USER_LIMIT) ? true : false;
             // 订单数（用于订单统计）
             // 订单数（用于订单统计）
             $result['orderCount'] = $orderCount;
             $result['orderCount'] = $orderCount;

@@ -390,9 +390,10 @@ class IndexController extends WebAction
             $paymentType = $this->post('paymentType', 1);
             $paymentType = $this->post('paymentType', 1);
             $couponCode = $this->post('couponCode', null);
             $couponCode = $this->post('couponCode', null);
             $yohoCoin = $this->post('yohoCoin', null);
             $yohoCoin = $this->post('yohoCoin', null);
+            $promotionCode = $this->post('promotionCode', null);
             $redEnvelopes = $this->post('redEnvelopes', null);
             $redEnvelopes = $this->post('redEnvelopes', null);
             $uid = $this->getUid(false);
             $uid = $this->getUid(false);
-            $result = CartModel::orderCompute($uid, $cartType, $deliveryWay, $paymentType, $couponCode, $yohoCoin, $redEnvelopes);
+            $result = CartModel::orderCompute($uid, $cartType, $deliveryWay, $paymentType, $couponCode, $promotionCode, $yohoCoin, $redEnvelopes);
         }
         }
 
 
         $this->echoJson($result);
         $this->echoJson($result);
@@ -443,7 +444,8 @@ class IndexController extends WebAction
             $paymentId = $this->post('paymentId', 15); // 支付ID
             $paymentId = $this->post('paymentId', 15); // 支付ID
             $paymentType = $this->post('paymentType', 1); // 默认在线支付
             $paymentType = $this->post('paymentType', 1); // 默认在线支付
             $remark = $this->post('remark', ''); // 备注信息
             $remark = $this->post('remark', ''); // 备注信息
-            $couponCode = $this->post('couponCode', null); // 优惠码
+            $couponCode = $this->post('couponCode', null); // 优惠券
+            $promotionCode = $this->post('promotionCode', null); // 优惠码
             $yohoCoin = $this->post('yohoCoin', 1); // YOHO币
             $yohoCoin = $this->post('yohoCoin', 1); // YOHO币
             $isPreContact = $this->post('isPreContact', false); // 送货前是否联系
             $isPreContact = $this->post('isPreContact', false); // 送货前是否联系
             $isPrintPrice = $this->post('isPrintPrice', true); // 是否打印价格
             $isPrintPrice = $this->post('isPrintPrice', true); // 是否打印价格
@@ -451,7 +453,7 @@ class IndexController extends WebAction
 
 
             // 调用下单接口
             // 调用下单接口
             $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTimeId, $deliveryWayId, $invoiceTitle, $invoiceId,
             $result = CartModel::orderSub($uid, $addressId, $cartType, $deliveryTimeId, $deliveryWayId, $invoiceTitle, $invoiceId,
-                                          $paymentId, $paymentType, $remark, $couponCode, $yohoCoin, $isPreContact, $isPrintPrice, $redEnvelopes);
+                                          $paymentId, $paymentType, $remark, $couponCode, $promotionCode, $yohoCoin, $isPreContact, $isPrintPrice, $redEnvelopes);
             // 判断是否下单成功
             // 判断是否下单成功
             if (empty($result['data']['order_code'])) {
             if (empty($result['data']['order_code'])) {
                 UdpLog::info('【结算信息】判断是否下单成功','order_code'.$result['data']['order_code']);
                 UdpLog::info('【结算信息】判断是否下单成功','order_code'.$result['data']['order_code']);

@@ -5,7 +5,7 @@ use Shopping\PayModel;
 use WebPlugin\Pay\PayFactory;
 use WebPlugin\Pay\PayFactory;
 use WebPlugin\Pay\Rspparams;
 use WebPlugin\Pay\Rspparams;
 use WebPlugin\Pay\weixin\PayNotifyCallBack;
 use WebPlugin\Pay\weixin\PayNotifyCallBack;
-
+use WebPlugin\UdpLog;
 /**
 /**
  * 支付Notice
  * 支付Notice
  */
  */
@@ -24,6 +24,7 @@ class NoticeController extends WebAction
     public function alipaynoticeAction()
     public function alipaynoticeAction()
     {
     {
         $res = $this->getParseResponse($_POST, 2);
         $res = $this->getParseResponse($_POST, 2);
+        UdpLog::info("【支付宝异步】,function:alipaynoticeAction,参数", array('pars' => $_POST, 'res' => $res));
         if ($res->payResult != -1) {
         if ($res->payResult != -1) {
             $this->payResultProc($res, 2);
             $this->payResultProc($res, 2);
             echo "success";
             echo "success";
@@ -37,6 +38,7 @@ class NoticeController extends WebAction
     public function alipayreturnAction()
     public function alipayreturnAction()
     {
     {
         $res = $this->getParseResponse($_GET, 2);
         $res = $this->getParseResponse($_GET, 2);
+        UdpLog::info("【支付宝同步】,function:alipayreturnAction,参数", array('pars' => $_GET, 'res' => $res));
         $dealResult = $this->payResultProc($res, 2);
         $dealResult = $this->payResultProc($res, 2);
         $dealResult['payData'] = array('payWay' => '支付宝');
         $dealResult['payData'] = array('payWay' => '支付宝');
         $this->commonShowResult($dealResult);
         $this->commonShowResult($dealResult);
@@ -48,6 +50,7 @@ class NoticeController extends WebAction
     public function alibarcodenoticeAction()
     public function alibarcodenoticeAction()
     {
     {
         $res = $this->getParseResponse($_POST, 17);
         $res = $this->getParseResponse($_POST, 17);
+        UdpLog::info("【支付宝二维码支付异步】,function:alibarcodenoticeAction,参数", array('pars' => $_POST, 'res' => $res));
         if ($res->payResult != -1) {
         if ($res->payResult != -1) {
             $this->payResultProc($res, 17);
             $this->payResultProc($res, 17);
             echo "success";
             echo "success";
@@ -61,6 +64,7 @@ class NoticeController extends WebAction
     public function alibarcodereturnAction()
     public function alibarcodereturnAction()
     {
     {
         $res = $this->getParseResponse($_GET, 17);
         $res = $this->getParseResponse($_GET, 17);
+        UdpLog::info("【支付宝二维码支付同步】,function:alibarcodereturnAction,参数", array('pars' => $_GET, 'res' => $res));
         $dealResult = $this->payResultProc($res, 17);
         $dealResult = $this->payResultProc($res, 17);
         $dealResult['payData'] = array('payWay' => '支付宝');
         $dealResult['payData'] = array('payWay' => '支付宝');
         $this->commonShowResult($dealResult);
         $this->commonShowResult($dealResult);
@@ -225,6 +229,7 @@ class NoticeController extends WebAction
             $uid = $this->getSession(self::SESSION_UID_KEY);
             $uid = $this->getSession(self::SESSION_UID_KEY);
             $this->setSession(self::SESSION_UID_KEY, null);
             $this->setSession(self::SESSION_UID_KEY, null);
         }
         }
+        UdpLog::info("【微信扫码支付结果商户通知地址】,function:wechatqrcodenotifyAction");
         $notify = new PayNotifyCallBack($uid);
         $notify = new PayNotifyCallBack($uid);
         $notify->handle(false);
         $notify->handle(false);
     }
     }
@@ -248,6 +253,7 @@ class NoticeController extends WebAction
             $payment = PayModel::getPaymentById(21);
             $payment = PayModel::getPaymentById(21);
             $payService = PayFactory::factory($payment);
             $payService = PayFactory::factory($payment);
             $res = $payService->parseResponse(array('orderCode' => $orderCode));
             $res = $payService->parseResponse(array('orderCode' => $orderCode));
+            UdpLog::info("【微信扫码支付返回】,function:wechatqrcodereturnAction,参数", array('pars' => $_GET, 'res' => $res));
             $dealResult = $this->payResultProc($res, 21);
             $dealResult = $this->payResultProc($res, 21);
             $dealResult['payData'] = array('payWay' => '微信扫码支付');
             $dealResult['payData'] = array('payWay' => '微信扫码支付');
         } while (false);
         } while (false);

@@ -95,7 +95,7 @@ class IndexController extends WebAction
 
 
         //调用模型获得品牌页数据
         //调用模型获得品牌页数据
         $data = BrandsModel::getBrandSearchData($condition, $options);
         $data = BrandsModel::getBrandSearchData($condition, $options);
-
+        $data['signboard'] = isset($result['signboard']) ? $result['signboard'] : '';//水牌
         //统计前三个商品
         //统计前三个商品
         $skn=array();
         $skn=array();
         $arr=array();
         $arr=array();
@@ -315,7 +315,6 @@ class IndexController extends WebAction
      */
      */
     public function shopHome($shopId)
     public function shopHome($shopId)
     {
     {
-        $domain = $this->param('named');
         // 设置头部数据
         // 设置头部数据
         $this->setWebNavHeader();
         $this->setWebNavHeader();
         $misort = $this->get('misort');
         $misort = $this->get('misort');

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 application.assets.path = ROOT_PATH "/assets/web"
 
 
 ; 应用的版本号
 ; 应用的版本号
-application.version = "0.0.26"
+application.version = "0.0.27"
 
 
 ; 网站SEO信息
 ; 网站SEO信息
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 application.assets.path = ROOT_PATH "/assets/web"
 
 
 ; 应用的版本号
 ; 应用的版本号
-application.version = "0.0.26"
+application.version = "0.0.27"
 
 
 ; 网站SEO信息
 ; 网站SEO信息
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 application.assets.path = ROOT_PATH "/assets/web"
 
 
 ; 应用的版本号
 ; 应用的版本号
-application.version = "0.0.26"
+application.version = "0.0.27"
 
 
 ; 网站SEO信息
 ; 网站SEO信息
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 application.assets.path = ROOT_PATH "/assets/web"
 
 
 ; 应用的版本号
 ; 应用的版本号
-application.version = "0.0.26"
+application.version = "0.0.27"
 
 
 ; 网站SEO信息
 ; 网站SEO信息
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"