wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by yangyang
Commit 7dccfda7c50d023de57573a8d6086ccd3969b7d5 1 parent 3e8d9b73

为了更新代码而commit下

Inline Side-by-side
Showing 7 changed files with 114 additions and 81 deletions
framework @ 75bbc3b0
Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
... ...
... ... @@ -18,14 +18,15 @@ class Yohobuy
{
/* 正式环境 */
// const API_URL = 'http://api2.open.yohobuy.com/';
// const SERVICE_URL = 'http://service.api.yohobuy.com/';
// const YOHOBUY_URL = 'http://www.yohobuy.com/';
const API_URL = 'http://api2.open.yohobuy.com/';
const API_URL2 = 'http://api.open.yohobuy.com/';
const SERVICE_URL = 'http://service.api.yohobuy.com/';
const YOHOBUY_URL = 'http://www.yohobuy.com/';
/* 测试环境 */
const API_URL = 'http://test2.open.yohobuy.com/';
const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
const YOHOBUY_URL = 'http://www.yohobuy.com/';
// const API_URL = 'http://test2.open.yohobuy.com/';
// const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
// const YOHOBUY_URL = 'http://www.yohobuy.com/';
/**
* 私钥列表
... ...
... ... @@ -19,7 +19,7 @@ class GradeData
* @param string $uid 用户id
* @return array 接口返回的会员等级数据
*/
public function getGradeData($gender,$channel, $uid) {
public function getGradeData($gender, $channel, $uid) {
$urlList = array();
//获取会员等级数据
$param = Yohobuy::param();
... ... @@ -27,7 +27,7 @@ class GradeData
$param['uid'] = $uid;
$param['method'] = 'app.Passport.vip';
$param['client_secret'] = Sign::getSign($param);
$urlList['grade'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
$urlList['grade'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL, $param);
//获取用户基本信息数据（用来得到username）
$param = Yohobuy::param();
... ... @@ -36,7 +36,7 @@ class GradeData
$param['yh_channel'] = $channel;
$param['method'] = 'app.passport.profile';
$param['client_secret'] = Sign::getSign($param);
$urlList['userProfile'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL,$param);
$urlList['userProfile'] = Yohobuy::httpBuildQuery(Yohobuy::API_URL, $param);
return Yohobuy::getMulti($urlList);
}
... ...
... ... @@ -4,6 +4,7 @@ namespace LibModels\Wap\Home;
use Api\Yohobuy;
use Api\Sign;
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
... ... @@ -22,7 +23,8 @@ class OrderData
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
public function getOrderData($type,$page,$limit,$gender,$yh_channel,$uid){
public function getOrderData($type, $page, $limit, $gender, $yh_channel, $uid) {
$param = Yohobuy::param();
$param['gender'] = $gender;
$param['limit'] = $limit;
... ... @@ -32,7 +34,8 @@ class OrderData
$param['uid'] = $uid;
$param['yh_channel'] = $yh_channel;
$param['client_secret'] = Sign::getSign($param);
print_r($param);
return Yohobuy::get(Yohobuy::API_URL,$param);
//print_r($param);
return Yohobuy::get(Yohobuy::API_URL2, $param);
}
}
... ...
... ... @@ -16,11 +16,11 @@ use Plugin\Helpers;
*/
class HomeController extends AbstractAction
{
/**
* 个人中心入口
*/
public function indexAction()
{
public function indexAction() {
// 设置网站标题
$this->setTitle('个人中心');
$this->setNavHeader('个人中心', true, SITE_MAIN);
... ... @@ -44,11 +44,9 @@ class HomeController extends AbstractAction
/**
* 用户订单
*/
public function ordersAction()
{
public function ordersAction() {
// $uid = $this->getUid();
// $type = $this->get('type', 1);
// $orders = \Index\UserModel::getUserOrderData(967016, $type);
$order = array(
... ... @@ -91,8 +89,7 @@ class HomeController extends AbstractAction
/**
* 用户收藏的商品
*/
public function favoriteAction()
{
public function favoriteAction() {
$uid = $this->getUid();
$favProducts = \Index\UserModel::getFavProductData($uid);
... ... @@ -116,8 +113,7 @@ class HomeController extends AbstractAction
/**
* 用户收藏的品牌
*/
public function favoritebrandAction()
{
public function favoritebrandAction() {
$uid = $this->getUid();
$gender = Helpers::getGenderByCookie();
... ... @@ -129,8 +125,7 @@ class HomeController extends AbstractAction
/**
* 个人信息
*/
public function personalDetailsAction()
{
public function personalDetailsAction() {
$this->setTitle('个人信息');
$this->setNavHeader('个人信息', true, SITE_MAIN);
... ... @@ -139,15 +134,12 @@ class HomeController extends AbstractAction
$data = \Index\UserModel::getUserProfileData($uid);
$data['pageFooter'] = true;
$this->_view->display('personal-details', $data);
}
/**
* YOHO币
*/
public function currencyAction()
{
public function currencyAction() {
// $uid = $this->getUid();
$this->setNavHeader('YOHO币', true, false);
... ... @@ -160,8 +152,7 @@ class HomeController extends AbstractAction
/**
* 优惠券
*/
public function couponsAction()
{
public function couponsAction() {
$this->setTitle('优惠券');
$this->setNavHeader('优惠券', true, SITE_MAIN);
... ... @@ -173,14 +164,12 @@ class HomeController extends AbstractAction
'couponsPage' => true
);
$this->_view->display('coupons', $coupons);
}
/**
* 我的消息
*/
public function messageAction()
{
public function messageAction() {
// $uid = $this->getUid();
$page = $this->get('page', 0);
$size = $this->get('size', 10);
... ... @@ -189,14 +178,12 @@ class HomeController extends AbstractAction
$messages = \Index\UserModel::getMessageData($uid, $page, $size);
print_r($messages);
}
/**
* 地址管理
*/
public function addressAction()
{
public function addressAction() {
// 设置网站标题
$this->setTitle('地址管理');
$this->setNavHeader('地址管理', true, SITE_MAIN);
... ... @@ -218,8 +205,7 @@ class HomeController extends AbstractAction
/**
* 修改地址
*/
public function editAddressAction()
{
public function editAddressAction() {
// 设置网站标题
$this->setTitle('修改地址');
$this->setNavHeader('修改地址', true, SITE_MAIN);
... ... @@ -241,8 +227,7 @@ class HomeController extends AbstractAction
/**
* 在线客服
*/
public function onlineServiceAction()
{
public function onlineServiceAction() {
$service = \Index\UserModel::getOnlineServiceData();
print_r($service);
... ... @@ -251,16 +236,14 @@ class HomeController extends AbstractAction
/**
* 我的逛
*/
public function myGuangAction()
{
public function myGuangAction() {
echo 'My Guang';
}
/**
* 意见反馈
*/
public function suggestAction()
{
public function suggestAction() {
$udid = $this->getUdid();
$page = $this->get('page', 1);
$limit = $this->get('limit', 30);
... ... @@ -297,15 +280,13 @@ class HomeController extends AbstractAction
'bad' => false)
)
));
}
/**
* 异步保存意见反馈数据
*/
public function savesuggestAction()
{
if($this->isAjax()) {
public function savesuggestAction() {
if ($this->isAjax()) {
$uid = $this->getUid();
$content = $this->post('content', '');
$suggest_type = $this->get('suggest_type', 2);
... ... @@ -314,13 +295,12 @@ class HomeController extends AbstractAction
$this->echoJson($result);
}
}
/**
* 会员等级展示页
*/
public function gradeAction(){
public function gradeAction() {
//设置网站seo信息
$this->setTitle('会员等级');
//显示网站导航头部信息
... ... @@ -328,53 +308,57 @@ class HomeController extends AbstractAction
$gender = Helpers::getGenderByCookie();
$channel = Helpers::getChannelByCookie();
$uid = $this -> getUid();
$uid = '7566245';//临时测试用
$data = GradeModel::getGrade($gender,$channel,$uid);
$uid = $this->getUid();
$uid = '7566245'; //临时测试用
$data = GradeModel::getGrade($gender, $channel, $uid);
$data['pageFooter'] = true;
$this -> _view -> display('vip-grade',$data);
$this->_view->display('vip-grade', $data);
}
/*
*会员特权查看页
* 会员特权查看页
*/
public function preferentialAction(){
public function preferentialAction() {
//设置网站seo信息
$this->setTitle('会员等级');
//显示网站导航头部信息
$this->setNavHeader('会员特权详情');
$channel = Helpers::getChannelByCookie();
$uid = $this -> getUid();
$data = GradeModel::getPreferential($channel,$uid);
$uid = $this->getUid();
$data = GradeModel::getPreferential($channel, $uid);
$data['pageFooter'] = true;
$this -> _view -> display('privilege',$data);
$this->_view->display('privilege', $data);
}
/*
*我的订单页面
* 我的订单页面
*/
public function orderAction(){
do{
//判断是不是ajax请求
public function orderAction() {
// do {
// //判断是不是ajax请求
// if(!$this -> isAjax()){
// break;
// }
//判断参数是否有效
$type = $this -> get('type',1);
$page = $this -> get('page',1);
$limit = $this -> get('limit',10);
$type = $this->get('type', 1);
$page = $this->get('page', 1);
$limit = $this->get('limit', 10);
$gender = Helpers::getGenderByCookie();
$yh_channel = $this -> get('yh_channel',1);
$uid = $this -> getUid();
if(!empty($type) && !is_numeric($type)){
$yh_channel = $this->get('yh_channel', 1);
//$uid = $this->getUid();
$uid = '7566245';
if (!empty($type) && !is_numeric($type)) {
break;
}
//$data = OrderModel::getOrder();
$data = OrderModel::getOrder($type,$page,$limit,$gender,$yh_channel,$uid);
//print_r($data);
}
while(false);
$data = OrderModel::getOrder($type, $page, $limit, $gender, $yh_channel, $uid);
print_r($data);
//} while (false);
//$this -> _view -> display('order',$data);
}
}
... ...
... ... @@ -26,7 +26,7 @@ class GradeModel
}
}
//调用接口获取数据
$data = GradeData::getGradeData($gender,$channel, $uid);
$data = GradeData::getGradeData($gender, $channel, $uid);
switch (intval($data['grade']['current_vip_level'])) {
case 0://普通会员
$result['vipGrade']['vip0'] = true;
... ... @@ -45,7 +45,7 @@ class GradeModel
//今年总消费
$result['vipGrade']['costOfThisYear'] = $data['grade']['current_year_cost'];
//升级下一等级会员的进度;
$result['vipGrade']['percent'] = 100*(round($data['grade']['current_total_cost'] / $data['grade']['next_need_cost'], 2));
$result['vipGrade']['percent'] = 100 * (round($data['grade']['current_total_cost'] / $data['grade']['next_need_cost'], 2));
//距离升级所需消费金额
if ($data['grade']['current_vip_level'] != 3) {
... ... @@ -57,7 +57,7 @@ class GradeModel
//$userProfile = GradeData::getUserProfileData($gender,$uid,$channel);
$result['vipGrade']['name'] = $data['userProfile']['username'];
//跳转url(会员特权详情)
$result['vipGrade']['allUrl'] = Helpers::url('/Home/preferential',null);
$result['vipGrade']['allUrl'] = Helpers::url('/Home/preferential', null);
//当前vip等级享受的特权
$result['vipGrade']['privilege'] = $data['grade']['enjoy_preferential'];
... ...
<?php
namespace home;
namespace home;
use LibModels\Wap\Home\OrderData;
use LibModels\Wap\Home\OrderData;
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
... ... @@ -19,10 +20,54 @@ class OrderModel
/**
* 订单相关数据处理
*/
public function getOrder($type = 1,$page = 1,$limit,$gender,$yh_channel,$uid){
$data = OrderData::getOrderData($type,$page,$limit,$gender,$yh_channel,$uid);
public function getOrder($type = 1, $page = 1, $limit, $gender, $yh_channel, $uid) {
$data = OrderData::getOrderData($type, $page, $limit, $gender, $yh_channel, $uid);
$result = array();
if($data['code'] == 200 && isset($data['data'])){
foreach($data['data']['order_list'] as $key => $vo){
$result[$key]['orderNum'] = $vo['order_code'];
$result[$key]['tradingStatus'] = $vo['status_str'];
$result[$key]['count'] = count($vo['order_goods']);
$result[$key]['sumCost'] = $vo['amount'] + $vo['shipping_cost'];
if($vo['payment_type'] != 2){
switch ($vo['status']) {
case 0:
$result[$key]['unpaid'] = true;
break;
case 1 || 2 || 3:
$result[$key]['unshipped'] = true;
break;
case 4 || 5:
$result[$key]['unreceived'] = true;
break;
case 6:
$result[$key]['completed'] = true;
break;
default:
break;
}
}else{
// switch ($vo['status']) {
// case 0:
// $result[$key]['unpaid'] = true;
// break;
// case 1 || 2 || 3:
// $result[$key]['unshipped'] = true;
// break;
// case 4 || 5:
// $result[$key]['unreceived'] = true;
// break;
// case 6:
// $result[$key]['completed'] = true;
// break;
// default:
// break;
// }
}
}
}
//return $result;
return $data;
}
... ...