api 统一返回处理
parent
698b57fb40
commit
b88841d902
|
|
@ -16,3 +16,4 @@ return [
|
|||
// URL伪静态后缀
|
||||
'url_html_suffix' => MyFileConfig('home_seo_url_html_suffix', '', 'html', true),
|
||||
];
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
|
||||
/**
|
||||
|
|
@ -44,7 +45,7 @@ class Agreement extends Common
|
|||
*/
|
||||
public function Index()
|
||||
{
|
||||
return SystemBaseService::AgreementData($this->data_request);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::AgreementData($this->data_request));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\AnswerService;
|
||||
|
||||
|
|
@ -77,7 +78,7 @@ class Answer extends Common
|
|||
'page_total' => $page_total,
|
||||
'data' => $data['data'],
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -95,7 +96,7 @@ class Answer extends Common
|
|||
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return AnswerService::AnswerSave($params);
|
||||
return ApiService::ApiDataReturn(AnswerService::AnswerSave($params));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\BannerService;
|
||||
|
||||
|
|
@ -46,7 +47,7 @@ class Banner extends Common
|
|||
{
|
||||
// 获取轮播
|
||||
$result = BannerService::Banner();
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
|
||||
/**
|
||||
|
|
@ -35,7 +36,7 @@ class Base extends Common
|
|||
// 参数
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return SystemBaseService::Common($params);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::Common($params));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\GoodsService;
|
||||
use app\service\UserService;
|
||||
|
|
@ -53,14 +54,14 @@ class Buy extends Common
|
|||
// 获取商品列表
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
$buy_ret = BuyService::BuyTypeGoodsList($params);
|
||||
$ret = BuyService::BuyTypeGoodsList($params);
|
||||
|
||||
// 商品校验
|
||||
if(isset($buy_ret['code']) && $buy_ret['code'] == 0)
|
||||
if(isset($ret['code']) && $ret['code'] == 0)
|
||||
{
|
||||
// 基础信息
|
||||
$buy_base = $buy_ret['data']['base'];
|
||||
$buy_goods = $buy_ret['data']['goods'];
|
||||
$buy_base = $ret['data']['base'];
|
||||
$buy_goods = $ret['data']['goods'];
|
||||
|
||||
// 支付方式
|
||||
$payment_list = PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1]);
|
||||
|
|
@ -72,10 +73,9 @@ class Buy extends Common
|
|||
'base' => $buy_base,
|
||||
'common_site_type' => (int) $buy_base['common_site_type'],
|
||||
];
|
||||
|
||||
return SystemBaseService::DataReturn($result);
|
||||
$ret = SystemBaseService::DataReturn($result);
|
||||
}
|
||||
return $buy_ret;
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -90,7 +90,7 @@ class Buy extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return BuyService::OrderInsert($params);
|
||||
return ApiService::ApiDataReturn(BuyService::OrderInsert($params));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\BuyService;
|
||||
|
||||
|
|
@ -53,7 +54,7 @@ class Cart extends Common
|
|||
'common_cart_total' => BuyService::UserCartTotal(['user'=>$this->user]),
|
||||
];
|
||||
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -68,7 +69,7 @@ class Cart extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return BuyService::CartSave($params);
|
||||
return ApiService::ApiDataReturn(BuyService::CartSave($params));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -83,7 +84,7 @@ class Cart extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return BuyService::CartDelete($params);
|
||||
return ApiService::ApiDataReturn(BuyService::CartDelete($params));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -98,7 +99,7 @@ class Cart extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return BuyService::CartStock($params);
|
||||
return ApiService::ApiDataReturn(BuyService::CartStock($params));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -11,6 +11,7 @@
|
|||
namespace app\api\controller;
|
||||
|
||||
use app\BaseController;
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemService;
|
||||
use app\service\ConfigService;
|
||||
use app\service\UserService;
|
||||
|
|
@ -208,7 +209,7 @@ class Common extends BaseController
|
|||
*/
|
||||
public function __call($method, $args)
|
||||
{
|
||||
return DataReturn($method.' 非法访问', -1000);
|
||||
return ApiService::ApiDataReturn(DataReturn($method.' 非法访问', -1000));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\DesignService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\layout\service\BaseLayout;
|
||||
|
|
@ -68,7 +69,7 @@ class Design extends Common
|
|||
'data' => $data,
|
||||
'layout_data' => $layout_data,
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,8 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
|
||||
/**
|
||||
* 空控制器响应
|
||||
* @author Devil
|
||||
|
|
@ -32,13 +34,7 @@ class Error extends Common
|
|||
*/
|
||||
public function __call($method, $args)
|
||||
{
|
||||
if(IS_AJAX)
|
||||
{
|
||||
return DataReturn(RequestController().' 控制器不存在', -1000);
|
||||
} else {
|
||||
MyViewAssign('msg', RequestController().' 控制器不存在');
|
||||
return MyView('public/tips_error');
|
||||
}
|
||||
return ApiService::ApiDataReturn(DataReturn(RequestController().' 控制器不存在', -1000));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\GoodsService;
|
||||
use app\service\BuyService;
|
||||
|
|
@ -53,73 +54,74 @@ class Goods extends Common
|
|||
// 参数
|
||||
if(empty($this->data_post['goods_id']))
|
||||
{
|
||||
return DataReturn('参数有误', -1);
|
||||
}
|
||||
|
||||
// 商品详情方式
|
||||
$is_use_mobile_detail = intval(MyC('common_app_is_use_mobile_detail'));
|
||||
|
||||
// 获取商品
|
||||
$goods_id = intval($this->data_post['goods_id']);
|
||||
$params = [
|
||||
'where' => [
|
||||
'id' => $goods_id,
|
||||
'is_delete_time' => 0,
|
||||
],
|
||||
'is_photo' => true,
|
||||
'is_spec' => true,
|
||||
'is_params' => true,
|
||||
'is_content_app' => ($is_use_mobile_detail == 1),
|
||||
];
|
||||
$ret = GoodsService::GoodsList($params);
|
||||
if(empty($ret['data'][0]) || $ret['data'][0]['is_delete_time'] != 0)
|
||||
{
|
||||
return DataReturn('商品不存在或已删除', -1);
|
||||
}
|
||||
|
||||
// 商品信息
|
||||
$goods = $ret['data'][0];
|
||||
|
||||
// 商品详情处理
|
||||
if($is_use_mobile_detail == 1)
|
||||
{
|
||||
unset($goods['content_web']);
|
||||
$ret = DataReturn('参数有误', -1);
|
||||
} else {
|
||||
// 标签处理,兼容小程序rich-text
|
||||
$goods['content_web'] = ResourcesService::ApMiniRichTextContentHandle($goods['content_web']);
|
||||
// 商品详情方式
|
||||
$is_use_mobile_detail = intval(MyC('common_app_is_use_mobile_detail'));
|
||||
|
||||
// 获取商品
|
||||
$goods_id = intval($this->data_post['goods_id']);
|
||||
$params = [
|
||||
'where' => [
|
||||
'id' => $goods_id,
|
||||
'is_delete_time' => 0,
|
||||
],
|
||||
'is_photo' => true,
|
||||
'is_spec' => true,
|
||||
'is_params' => true,
|
||||
'is_content_app' => ($is_use_mobile_detail == 1),
|
||||
];
|
||||
$ret = GoodsService::GoodsList($params);
|
||||
if(empty($ret['data'][0]) || $ret['data'][0]['is_delete_time'] != 0)
|
||||
{
|
||||
$ret = DataReturn('商品不存在或已删除', -1);
|
||||
} else {
|
||||
// 商品信息
|
||||
$goods = $ret['data'][0];
|
||||
|
||||
// 商品详情处理
|
||||
if($is_use_mobile_detail == 1)
|
||||
{
|
||||
unset($goods['content_web']);
|
||||
} else {
|
||||
// 标签处理,兼容小程序rich-text
|
||||
$goods['content_web'] = ResourcesService::ApMiniRichTextContentHandle($goods['content_web']);
|
||||
}
|
||||
|
||||
// 当前登录用户是否已收藏
|
||||
$ret_favor = GoodsFavorService::IsUserGoodsFavor(['goods_id'=>$goods_id, 'user'=>$this->user]);
|
||||
$goods['is_favor'] = ($ret_favor['code'] == 0) ? $ret_favor['data'] : 0;
|
||||
|
||||
// 商品评价总数
|
||||
$goods['comments_count'] = GoodsCommentsService::GoodsCommentsTotal(['goods_id'=>$goods_id, 'is_show'=>1]);
|
||||
|
||||
// 商品访问统计
|
||||
GoodsService::GoodsAccessCountInc(['goods_id'=>$goods_id]);
|
||||
|
||||
// 用户商品浏览
|
||||
GoodsBrowseService::GoodsBrowseSave(['goods_id'=>$goods_id, 'user'=>$this->user]);
|
||||
|
||||
// 商品所属分类名称
|
||||
$category = GoodsService::GoodsCategoryNames($goods_id);
|
||||
$goods['category_names'] = $category['data'];
|
||||
|
||||
// 中间tabs导航
|
||||
$middle_tabs_nav = GoodsService::GoodsDetailMiddleTabsNavList($goods);
|
||||
|
||||
// 商品购买按钮列表
|
||||
$buy_button = GoodsService::GoodsBuyButtonList($goods);
|
||||
|
||||
// 数据返回
|
||||
$result = [
|
||||
'goods' => $goods,
|
||||
'common_cart_total' => BuyService::UserCartTotal(['user'=>$this->user]),
|
||||
'buy_button' => $buy_button,
|
||||
'middle_tabs_nav' => $middle_tabs_nav,
|
||||
];
|
||||
$ret = SystemBaseService::DataReturn($result);
|
||||
}
|
||||
}
|
||||
|
||||
// 当前登录用户是否已收藏
|
||||
$ret_favor = GoodsFavorService::IsUserGoodsFavor(['goods_id'=>$goods_id, 'user'=>$this->user]);
|
||||
$goods['is_favor'] = ($ret_favor['code'] == 0) ? $ret_favor['data'] : 0;
|
||||
|
||||
// 商品评价总数
|
||||
$goods['comments_count'] = GoodsCommentsService::GoodsCommentsTotal(['goods_id'=>$goods_id, 'is_show'=>1]);
|
||||
|
||||
// 商品访问统计
|
||||
GoodsService::GoodsAccessCountInc(['goods_id'=>$goods_id]);
|
||||
|
||||
// 用户商品浏览
|
||||
GoodsBrowseService::GoodsBrowseSave(['goods_id'=>$goods_id, 'user'=>$this->user]);
|
||||
|
||||
// 商品所属分类名称
|
||||
$category = GoodsService::GoodsCategoryNames($goods_id);
|
||||
$goods['category_names'] = $category['data'];
|
||||
|
||||
// 中间tabs导航
|
||||
$middle_tabs_nav = GoodsService::GoodsDetailMiddleTabsNavList($goods);
|
||||
|
||||
// 商品购买按钮列表
|
||||
$buy_button = GoodsService::GoodsBuyButtonList($goods);
|
||||
|
||||
// 数据返回
|
||||
$result = [
|
||||
'goods' => $goods,
|
||||
'common_cart_total' => BuyService::UserCartTotal(['user'=>$this->user]),
|
||||
'buy_button' => $buy_button,
|
||||
'middle_tabs_nav' => $middle_tabs_nav,
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -138,7 +140,7 @@ class Goods extends Common
|
|||
// 开始操作
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return GoodsFavorService::GoodsFavorCancel($params);
|
||||
return ApiService::ApiDataReturn(GoodsFavorService::GoodsFavorCancel($params));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -158,7 +160,7 @@ class Goods extends Common
|
|||
{
|
||||
$ret['data'] = $ret['data']['spec_type'];
|
||||
}
|
||||
return $ret;
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -178,7 +180,7 @@ class Goods extends Common
|
|||
{
|
||||
$ret['data'] = $ret['data']['spec_base'];
|
||||
}
|
||||
return $ret;
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -194,7 +196,7 @@ class Goods extends Common
|
|||
$result = [
|
||||
'category' => GoodsService::GoodsCategoryAll($this->data_post),
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -204,17 +206,17 @@ class Goods extends Common
|
|||
* @version 1.0.0
|
||||
* @date 2019-07-11
|
||||
* @desc description
|
||||
* @return [type] [description]
|
||||
*/
|
||||
public function GoodsScore()
|
||||
{
|
||||
if(empty($this->data_post['goods_id']))
|
||||
{
|
||||
return DataReturn('参数有误', -1);
|
||||
$ret = DataReturn('参数有误', -1);
|
||||
} else {
|
||||
// 获取商品评分
|
||||
$ret = GoodsCommentsService::GoodsCommentsScore($this->data_post['goods_id']);
|
||||
}
|
||||
|
||||
// 获取商品评分
|
||||
return GoodsCommentsService::GoodsCommentsScore($this->data_post['goods_id']);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -260,7 +262,7 @@ class Goods extends Common
|
|||
'page_total' => $page_total,
|
||||
'data' => $ret['data'],
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\GoodsService;
|
||||
use app\service\BannerService;
|
||||
|
|
@ -63,7 +64,7 @@ class Index extends Common
|
|||
'data_list' => $data_list,
|
||||
'common_cart_total' => BuyService::UserCartTotal(['user'=>$this->user]),
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\MessageService;
|
||||
|
||||
|
|
@ -80,7 +81,7 @@ class Message extends Common
|
|||
'page_total' => $page_total,
|
||||
'data' => $data['data'],
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\AppHomeNavService;
|
||||
|
||||
|
|
@ -46,7 +47,7 @@ class Navigation extends Common
|
|||
{
|
||||
// 获取轮播
|
||||
$result = AppHomeNavService::AppHomeNav();
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\PaymentService;
|
||||
use app\service\OrderService;
|
||||
|
|
@ -87,7 +88,7 @@ class Order extends Common
|
|||
'data' => $data['data'],
|
||||
'payment_list' => $payment_list,
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -103,39 +104,41 @@ class Order extends Common
|
|||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
$params['user_type'] = 'user';
|
||||
if(empty($params['id']))
|
||||
if(!empty($params['id']))
|
||||
{
|
||||
return DataReturn('参数有误', -1);
|
||||
}
|
||||
// 条件
|
||||
$where = OrderService::OrderListWhere($params);
|
||||
|
||||
// 条件
|
||||
$where = OrderService::OrderListWhere($params);
|
||||
|
||||
// 获取列表
|
||||
$data_params = array(
|
||||
'm' => 0,
|
||||
'n' => 1,
|
||||
'where' => $where,
|
||||
'is_orderaftersale' => 1,
|
||||
);
|
||||
$data = OrderService::OrderList($data_params);
|
||||
if(!empty($data['data'][0]))
|
||||
{
|
||||
// 返回信息
|
||||
$result = [
|
||||
'data' => $data['data'][0],
|
||||
'site_fictitious' => null,
|
||||
];
|
||||
|
||||
// 虚拟销售配置
|
||||
if($result['data']['order_model'] == 3 && $result['data']['pay_status'] == 1 && in_array($result['data']['status'], [3,4]))
|
||||
// 获取列表
|
||||
$data_params = array(
|
||||
'm' => 0,
|
||||
'n' => 1,
|
||||
'where' => $where,
|
||||
'is_orderaftersale' => 1,
|
||||
);
|
||||
$data = OrderService::OrderList($data_params);
|
||||
if(!empty($data['data'][0]))
|
||||
{
|
||||
$site_fictitious = ConfigService::SiteFictitiousConfig();
|
||||
$result['site_fictitious'] = $site_fictitious['data'];
|
||||
// 返回信息
|
||||
$result = [
|
||||
'data' => $data['data'][0],
|
||||
'site_fictitious' => null,
|
||||
];
|
||||
|
||||
// 虚拟销售配置
|
||||
if($result['data']['order_model'] == 3 && $result['data']['pay_status'] == 1 && in_array($result['data']['status'], [3,4]))
|
||||
{
|
||||
$site_fictitious = ConfigService::SiteFictitiousConfig();
|
||||
$result['site_fictitious'] = $site_fictitious['data'];
|
||||
}
|
||||
$ret = SystemBaseService::DataReturn($result);
|
||||
} else {
|
||||
$ret = DataReturn('数据不存在或已删除', -100);
|
||||
}
|
||||
return SystemBaseService::DataReturn($result);
|
||||
} else {
|
||||
$ret = DataReturn('参数有误', -1);
|
||||
}
|
||||
return DataReturn('数据不存在或已删除', -100);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -154,35 +157,37 @@ class Order extends Common
|
|||
$params['user_type'] = 'user';
|
||||
if(empty($params['id']))
|
||||
{
|
||||
return DataReturn('参数有误', -1);
|
||||
}
|
||||
$ret = DataReturn('参数有误', -1);
|
||||
} else {
|
||||
// 条件
|
||||
$where = OrderService::OrderListWhere($params);
|
||||
|
||||
// 条件
|
||||
$where = OrderService::OrderListWhere($params);
|
||||
|
||||
// 获取列表
|
||||
$data_params = array(
|
||||
'm' => 0,
|
||||
'n' => 1,
|
||||
'where' => $where,
|
||||
);
|
||||
$data = OrderService::OrderList($data_params);
|
||||
if(!empty($data['data'][0]))
|
||||
{
|
||||
// 是否已评论
|
||||
if($data['data'][0]['user_is_comments'] > 0)
|
||||
{
|
||||
return DataReturn('你已进行过评论', -100);
|
||||
}
|
||||
|
||||
// 返回数据
|
||||
$result = [
|
||||
'data' => $data['data'][0],
|
||||
'editor_path_type' => ResourcesService::EditorPathTypeValue('order_comments-'.$this->user['id'].'-'.$data['data'][0]['id']),
|
||||
// 获取列表
|
||||
$data_params = [
|
||||
'm' => 0,
|
||||
'n' => 1,
|
||||
'where' => $where,
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
$data = OrderService::OrderList($data_params);
|
||||
if(!empty($data['data'][0]))
|
||||
{
|
||||
// 是否已评论
|
||||
if($data['data'][0]['user_is_comments'] > 0)
|
||||
{
|
||||
$ret = ApiService::ApiDataReturn(DataReturn('你已进行过评论', -100));
|
||||
} else {
|
||||
// 返回数据
|
||||
$result = [
|
||||
'data' => $data['data'][0],
|
||||
'editor_path_type' => ResourcesService::EditorPathTypeValue('order_comments-'.$this->user['id'].'-'.$data['data'][0]['id']),
|
||||
];
|
||||
$ret = SystemBaseService::DataReturn($result);
|
||||
}
|
||||
} else {
|
||||
$ret = DataReturn('没有相关数据', -100);
|
||||
}
|
||||
}
|
||||
return DataReturn('没有相关数据', -100);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -198,7 +203,7 @@ class Order extends Common
|
|||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
$params['business_type'] = 'order';
|
||||
return GoodsCommentsService::Comments($params);
|
||||
return ApiService::ApiDataReturn(GoodsCommentsService::Comments($params));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -213,7 +218,7 @@ class Order extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return OrderService::Pay($params);
|
||||
return ApiService::ApiDataReturn(OrderService::Pay($params));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -230,7 +235,7 @@ class Order extends Common
|
|||
$params['user_id'] = $this->user['id'];
|
||||
$params['creator'] = $this->user['id'];
|
||||
$params['creator_name'] = $this->user['user_name_view'];
|
||||
return OrderService::OrderCancel($params);
|
||||
return ApiService::ApiDataReturn(OrderService::OrderCancel($params));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -246,7 +251,7 @@ class Order extends Common
|
|||
$params['user_id'] = $this->user['id'];
|
||||
$params['creator'] = $this->user['id'];
|
||||
$params['creator_name'] = $this->user['user_name_view'];
|
||||
return OrderService::OrderCollect($params);
|
||||
return ApiService::ApiDataReturn(OrderService::OrderCollect($params));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -264,7 +269,7 @@ class Order extends Common
|
|||
$params['creator'] = $this->user['id'];
|
||||
$params['creator_name'] = $this->user['user_name_view'];
|
||||
$params['user_type'] = 'user';
|
||||
return OrderService::OrderDelete($params);
|
||||
return ApiService::ApiDataReturn(OrderService::OrderDelete($params));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\OrderAftersaleService;
|
||||
use app\service\ResourcesService;
|
||||
|
|
@ -81,7 +82,7 @@ class Orderaftersale extends Common
|
|||
'page_total' => $page_total,
|
||||
'data' => $data['data'],
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -144,9 +145,11 @@ class Orderaftersale extends Common
|
|||
'return_goods_address' => $return_goods_address,
|
||||
'editor_path_type' => ResourcesService::EditorPathTypeValue(OrderAftersaleService::EditorAttachmentPathType($this->user['id'], $order_id, $order_detail_id)),
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
$ret = SystemBaseService::DataReturn($result);
|
||||
} else {
|
||||
$ret = DataReturn($ret['msg'], -1);
|
||||
}
|
||||
return DataReturn($ret['msg'], -1);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -161,7 +164,7 @@ class Orderaftersale extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return OrderAftersaleService::AftersaleCreate($params);
|
||||
return ApiService::ApiDataReturn(OrderAftersaleService::AftersaleCreate($params));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -176,7 +179,7 @@ class Orderaftersale extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return OrderAftersaleService::AftersaleDelivery($params);
|
||||
return ApiService::ApiDataReturn(OrderAftersaleService::AftersaleDelivery($params));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -191,7 +194,7 @@ class Orderaftersale extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return OrderAftersaleService::AftersaleCancel($params);
|
||||
return ApiService::ApiDataReturn(OrderAftersaleService::AftersaleCancel($params));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\PluginsService;
|
||||
|
||||
/**
|
||||
|
|
@ -66,25 +67,23 @@ class Plugins extends Common
|
|||
],
|
||||
];
|
||||
$ret = ParamsChecked($params['data_request'], $p);
|
||||
if($ret !== true)
|
||||
if($ret === true)
|
||||
{
|
||||
return DataReturn($ret, -5000);
|
||||
// 应用名称/控制器/方法
|
||||
$pluginsname = $params['data_request']['pluginsname'];
|
||||
$pluginscontrol = strtolower($params['data_request']['pluginscontrol']);
|
||||
$pluginsaction = strtolower($params['data_request']['pluginsaction']);
|
||||
|
||||
// 调用
|
||||
$ret = PluginsService::PluginsControlCall($pluginsname, $pluginscontrol, $pluginsaction, 'api', $params);
|
||||
if($ret['code'] == 0)
|
||||
{
|
||||
$ret = $ret['data'];
|
||||
}
|
||||
} else {
|
||||
$ret = DataReturn($ret, -5000);
|
||||
}
|
||||
|
||||
// 应用名称/控制器/方法
|
||||
$pluginsname = $params['data_request']['pluginsname'];
|
||||
$pluginscontrol = strtolower($params['data_request']['pluginscontrol']);
|
||||
$pluginsaction = strtolower($params['data_request']['pluginsaction']);
|
||||
|
||||
// 调用
|
||||
$ret = PluginsService::PluginsControlCall($pluginsname, $pluginscontrol, $pluginsaction, 'api', $params);
|
||||
if($ret['code'] == 0)
|
||||
{
|
||||
return $ret['data'];
|
||||
}
|
||||
|
||||
// 调用失败
|
||||
return $ret;
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\RegionService;
|
||||
|
||||
|
|
@ -52,7 +53,7 @@ class Region extends Common
|
|||
],
|
||||
];
|
||||
$result = RegionService::RegionNode($params);
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -65,7 +66,7 @@ class Region extends Common
|
|||
*/
|
||||
public function All()
|
||||
{
|
||||
return RegionService::RegionAll();
|
||||
return ApiService::ApiDataReturn(RegionService::RegionAll());
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\SearchService;
|
||||
|
||||
|
|
@ -71,7 +72,7 @@ class Search extends Common
|
|||
// 商品规格
|
||||
$result['goods_spec_list'] = SearchService::SearchGoodsSpecValueList($this->data_request);
|
||||
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\UeditorService;
|
||||
|
||||
/**
|
||||
|
|
@ -47,7 +48,7 @@ class Ueditor extends Common
|
|||
*/
|
||||
public function Index()
|
||||
{
|
||||
return UeditorService::Run($this->data_request);
|
||||
return ApiService::ApiDataReturn(UeditorService::Run($this->data_request));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\UserService;
|
||||
use app\service\OrderService;
|
||||
|
|
@ -53,7 +54,7 @@ class User extends Common
|
|||
*/
|
||||
public function Login()
|
||||
{
|
||||
return UserService::Login($this->data_post);
|
||||
return ApiService::ApiDataReturn(UserService::Login($this->data_post));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -66,7 +67,7 @@ class User extends Common
|
|||
*/
|
||||
public function LoginVerifySend()
|
||||
{
|
||||
return UserService::LoginVerifySend($this->data_post);
|
||||
return ApiService::ApiDataReturn(UserService::LoginVerifySend($this->data_post));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -79,7 +80,7 @@ class User extends Common
|
|||
*/
|
||||
public function Reg()
|
||||
{
|
||||
return UserService::Reg($this->data_post);
|
||||
return ApiService::ApiDataReturn(UserService::Reg($this->data_post));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -92,7 +93,7 @@ class User extends Common
|
|||
*/
|
||||
public function RegVerifySend()
|
||||
{
|
||||
return UserService::RegVerifySend($this->data_post);
|
||||
return ApiService::ApiDataReturn(UserService::RegVerifySend($this->data_post));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -105,7 +106,7 @@ class User extends Common
|
|||
*/
|
||||
public function ForgetPwd()
|
||||
{
|
||||
return UserService::ForgetPwd($this->data_post);
|
||||
return ApiService::ApiDataReturn(UserService::ForgetPwd($this->data_post));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -118,7 +119,7 @@ class User extends Common
|
|||
*/
|
||||
public function ForgetPwdVerifySend()
|
||||
{
|
||||
return UserService::ForgetPwdVerifySend($this->data_post);
|
||||
return ApiService::ApiDataReturn(UserService::ForgetPwdVerifySend($this->data_post));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -150,7 +151,7 @@ class User extends Common
|
|||
*/
|
||||
public function AppMobileBind()
|
||||
{
|
||||
return UserService::AppMobileBind($this->data_post);
|
||||
return ApiService::ApiDataReturn(UserService::AppMobileBind($this->data_post));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -163,7 +164,7 @@ class User extends Common
|
|||
*/
|
||||
public function AppMobileBindVerifySend()
|
||||
{
|
||||
return UserService::AppMobileBindVerifySend($this->data_post);
|
||||
return ApiService::ApiDataReturn(UserService::AppMobileBindVerifySend($this->data_post));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -177,34 +178,34 @@ class User extends Common
|
|||
public function AlipayUserAuth()
|
||||
{
|
||||
// 参数
|
||||
if(empty($this->data_post['authcode']))
|
||||
if(!empty($this->data_post['authcode']))
|
||||
{
|
||||
return DataReturn('授权码为空', -1);
|
||||
}
|
||||
|
||||
// 授权
|
||||
$result = (new \base\Alipay())->GetAuthSessionKey(MyC('common_app_mini_alipay_appid'), $this->data_post['authcode']);
|
||||
if($result['status'] == 0)
|
||||
{
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'alipay_openid', $result['data']['user_id']);
|
||||
if(empty($user))
|
||||
// 授权
|
||||
$result = (new \base\Alipay())->GetAuthSessionKey(MyC('common_app_mini_alipay_appid'), $this->data_post['authcode']);
|
||||
if($result['status'] == 0)
|
||||
{
|
||||
return DataReturn('授权登录成功', 0, ['is_user_exist'=>0, 'openid'=>$result['data']['user_id']]);
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'alipay_openid', $result['data']['user_id']);
|
||||
if(empty($user))
|
||||
{
|
||||
$ret = DataReturn('授权登录成功', 0, ['is_user_exist'=>0, 'openid'=>$result['data']['user_id']]);
|
||||
} else {
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] == 0)
|
||||
{
|
||||
// 标记用户存在
|
||||
$user['is_user_exist'] = 1;
|
||||
$ret = DataReturn('授权登录成功', 0, $user);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$ret = DataReturn($result['msg'], -100);
|
||||
}
|
||||
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] != 0)
|
||||
{
|
||||
return $ret;
|
||||
}
|
||||
|
||||
// 标记用户存在
|
||||
$user['is_user_exist'] = 1;
|
||||
return DataReturn('授权登录成功', 0, $user);
|
||||
} else {
|
||||
$ret = DataReturn('授权码为空', -1);
|
||||
}
|
||||
return DataReturn($result['msg'], -100);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -226,28 +227,27 @@ class User extends Common
|
|||
],
|
||||
];
|
||||
$ret = ParamsChecked($this->data_post, $p);
|
||||
if($ret !== true)
|
||||
if($ret === true)
|
||||
{
|
||||
return DataReturn($ret, -1);
|
||||
}
|
||||
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'alipay_openid', $this->data_post['openid']);
|
||||
if(empty($user))
|
||||
{
|
||||
$this->data_post['nickname'] = isset($this->data_post['nickName']) ? $this->data_post['nickName'] : '';
|
||||
$this->data_post['gender'] = empty($this->data_post['gender']) ? 0 : (($this->data_post['gender'] == 'f') ? 1 : 2);
|
||||
return UserService::AuthUserProgram($this->data_post, 'alipay_openid');
|
||||
} else {
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] != 0)
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'alipay_openid', $this->data_post['openid']);
|
||||
if(empty($user))
|
||||
{
|
||||
return $ret;
|
||||
$this->data_post['nickname'] = isset($this->data_post['nickName']) ? $this->data_post['nickName'] : '';
|
||||
$this->data_post['gender'] = empty($this->data_post['gender']) ? 0 : (($this->data_post['gender'] == 'f') ? 1 : 2);
|
||||
$ret = UserService::AuthUserProgram($this->data_post, 'alipay_openid');
|
||||
} else {
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] == 0)
|
||||
{
|
||||
$ret = DataReturn('授权成功', 0, $user);
|
||||
}
|
||||
}
|
||||
return DataReturn('授权成功', 0, $user);
|
||||
} else {
|
||||
$ret = DataReturn($ret, -1);
|
||||
}
|
||||
return DataReturn('获取用户信息失败', -100);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -276,7 +276,7 @@ class User extends Common
|
|||
}
|
||||
if(empty($user))
|
||||
{
|
||||
return DataReturn('授权登录成功', 0, ['is_user_exist'=>0, 'openid'=>$result['data']['openid'], 'unionid'=>$unionid]);
|
||||
$ret = DataReturn('授权登录成功', 0, ['is_user_exist'=>0, 'openid'=>$result['data']['openid'], 'unionid'=>$unionid]);
|
||||
} else {
|
||||
// 如果用户openid为空则绑定到用户下面
|
||||
if(empty($user['weixin_openid']))
|
||||
|
|
@ -290,17 +290,20 @@ class User extends Common
|
|||
}
|
||||
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] != 0)
|
||||
if(!empty($user))
|
||||
{
|
||||
return $ret;
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] == 0)
|
||||
{
|
||||
// 标记用户存在
|
||||
$user['is_user_exist'] = 1;
|
||||
$ret = DataReturn('授权登录成功', 0, $user);
|
||||
}
|
||||
}
|
||||
|
||||
// 标记用户存在
|
||||
$user['is_user_exist'] = 1;
|
||||
return DataReturn('授权登录成功', 0, $user);
|
||||
} else {
|
||||
$ret = DataReturn($result['msg'], -10);
|
||||
}
|
||||
return DataReturn($result['msg'], -10);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -327,36 +330,35 @@ class User extends Common
|
|||
],
|
||||
];
|
||||
$ret = ParamsChecked($this->data_post, $p);
|
||||
if($ret !== true)
|
||||
if($ret === true)
|
||||
{
|
||||
return DataReturn($ret, -1);
|
||||
}
|
||||
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'weixin_openid', $this->data_post['openid']);
|
||||
if(empty($user))
|
||||
{
|
||||
// 字段名称不一样参数处理
|
||||
$auth_data = is_array($this->data_post['auth_data']) ? $this->data_post['auth_data'] : json_decode(htmlspecialchars_decode($this->data_post['auth_data']), true);
|
||||
$auth_data['nickname'] = isset($auth_data['nickName']) ? $auth_data['nickName'] : '';
|
||||
$auth_data['avatar'] = isset($auth_data['avatarUrl']) ? $auth_data['avatarUrl'] : '';
|
||||
$auth_data['gender'] = empty($auth_data['gender']) ? 0 : (($auth_data['gender'] == 2) ? 1 : 2);
|
||||
|
||||
// 公共参数处理
|
||||
$auth_data['weixin_unionid'] = isset($this->data_post['unionid']) ? $this->data_post['unionid'] : '';
|
||||
$auth_data['openid'] = $this->data_post['openid'];
|
||||
$auth_data['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0;
|
||||
return UserService::AuthUserProgram($auth_data, 'weixin_openid');
|
||||
} else {
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] != 0)
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'weixin_openid', $this->data_post['openid']);
|
||||
if(empty($user))
|
||||
{
|
||||
return $ret;
|
||||
}
|
||||
return DataReturn('授权成功', 0, $user);
|
||||
// 字段名称不一样参数处理
|
||||
$auth_data = is_array($this->data_post['auth_data']) ? $this->data_post['auth_data'] : json_decode(htmlspecialchars_decode($this->data_post['auth_data']), true);
|
||||
$auth_data['nickname'] = isset($auth_data['nickName']) ? $auth_data['nickName'] : '';
|
||||
$auth_data['avatar'] = isset($auth_data['avatarUrl']) ? $auth_data['avatarUrl'] : '';
|
||||
$auth_data['gender'] = empty($auth_data['gender']) ? 0 : (($auth_data['gender'] == 2) ? 1 : 2);
|
||||
|
||||
// 公共参数处理
|
||||
$auth_data['weixin_unionid'] = isset($this->data_post['unionid']) ? $this->data_post['unionid'] : '';
|
||||
$auth_data['openid'] = $this->data_post['openid'];
|
||||
$auth_data['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0;
|
||||
$ret = UserService::AuthUserProgram($auth_data, 'weixin_openid');
|
||||
} else {
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] == 0)
|
||||
{
|
||||
$ret = DataReturn('授权成功', 0, $user);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$ret = DataReturn($ret, -1);
|
||||
}
|
||||
return DataReturn(empty($result['msg']) ? '获取用户信息失败' : $result['msg'], -100);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -379,23 +381,23 @@ class User extends Common
|
|||
{
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'baidu_openid', $result);
|
||||
if(empty($user))
|
||||
if(!empty($user))
|
||||
{
|
||||
return DataReturn('授权登录成功', 0, ['is_user_exist'=>0, 'openid'=>$result['data']]);
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] == 0)
|
||||
{
|
||||
// 标记用户存在
|
||||
$user['is_user_exist'] = 1;
|
||||
$ret = DataReturn('授权登录成功', 0, $user);
|
||||
}
|
||||
} else {
|
||||
$ret = DataReturn('授权登录成功', 0, ['is_user_exist'=>0, 'openid'=>$result['data']]);
|
||||
}
|
||||
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] != 0)
|
||||
{
|
||||
return $ret;
|
||||
}
|
||||
|
||||
// 标记用户存在
|
||||
$user['is_user_exist'] = 1;
|
||||
return DataReturn('授权登录成功', 0, $user);
|
||||
} else {
|
||||
$ret = DataReturn($result['msg'], -10);
|
||||
}
|
||||
return DataReturn($result['msg'], -10);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -427,43 +429,42 @@ class User extends Common
|
|||
]
|
||||
];
|
||||
$ret = ParamsChecked($this->data_post, $p);
|
||||
if($ret !== true)
|
||||
if($ret === true)
|
||||
{
|
||||
return DataReturn($ret, -1);
|
||||
}
|
||||
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'baidu_openid', $this->data_post['openid']);
|
||||
if(empty($user))
|
||||
{
|
||||
$config = [
|
||||
'appid' => MyC('common_app_mini_baidu_appid'),
|
||||
'key' => MyC('common_app_mini_baidu_appkey'),
|
||||
'secret' => MyC('common_app_mini_baidu_appsecret'),
|
||||
];
|
||||
$result = (new \base\Baidu($config))->DecryptData($this->data_post['encrypted_data'], $this->data_post['iv'], $this->data_post['openid']);
|
||||
|
||||
if($result['status'] == 0 && !empty($result['data']))
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'baidu_openid', $this->data_post['openid']);
|
||||
if(empty($user))
|
||||
{
|
||||
$result['nickname'] = isset($result['data']['nickname']) ? $result['data']['nickname'] : '';
|
||||
$result['avatar'] = isset($result['data']['headimgurl']) ? $result['data']['headimgurl'] : '';
|
||||
$result['gender'] = empty($result['data']['sex']) ? 0 : (($result['data']['sex'] == 2) ? 1 : 2);
|
||||
$result['openid'] = $result['data']['openid'];
|
||||
$result['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0;
|
||||
return UserService::AuthUserProgram($result, 'baidu_openid');
|
||||
$config = [
|
||||
'appid' => MyC('common_app_mini_baidu_appid'),
|
||||
'key' => MyC('common_app_mini_baidu_appkey'),
|
||||
'secret' => MyC('common_app_mini_baidu_appsecret'),
|
||||
];
|
||||
$result = (new \base\Baidu($config))->DecryptData($this->data_post['encrypted_data'], $this->data_post['iv'], $this->data_post['openid']);
|
||||
|
||||
if($result['status'] == 0 && !empty($result['data']))
|
||||
{
|
||||
$result['nickname'] = isset($result['data']['nickname']) ? $result['data']['nickname'] : '';
|
||||
$result['avatar'] = isset($result['data']['headimgurl']) ? $result['data']['headimgurl'] : '';
|
||||
$result['gender'] = empty($result['data']['sex']) ? 0 : (($result['data']['sex'] == 2) ? 1 : 2);
|
||||
$result['openid'] = $result['data']['openid'];
|
||||
$result['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0;
|
||||
$ret = UserService::AuthUserProgram($result, 'baidu_openid');
|
||||
} else {
|
||||
$ret = DataReturn($result['msg'], -1);
|
||||
}
|
||||
} else {
|
||||
return DataReturn($result['msg'], -1);
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] == 0)
|
||||
{
|
||||
$ret = DataReturn('授权成功', 0, $user);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] != 0)
|
||||
{
|
||||
return $ret;
|
||||
}
|
||||
return DataReturn('授权成功', 0, $user);
|
||||
$ret = DataReturn($ret, -1);
|
||||
}
|
||||
return DataReturn(empty($result['msg']) ? '获取用户信息失败' : $result['msg'], -100);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -487,21 +488,21 @@ class User extends Common
|
|||
$user = UserService::AppUserInfoHandle(null, 'toutiao_openid', $result);
|
||||
if(empty($user))
|
||||
{
|
||||
return DataReturn('授权登录成功', 0, ['is_user_exist'=>0, 'openid'=>$result['data']]);
|
||||
$ret = DataReturn('授权登录成功', 0, ['is_user_exist'=>0, 'openid'=>$result['data']]);
|
||||
} else {
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] == 0)
|
||||
{
|
||||
// 标记用户存在
|
||||
$user['is_user_exist'] = 1;
|
||||
$ret = DataReturn('授权登录成功', 0, $user);
|
||||
}
|
||||
}
|
||||
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] != 0)
|
||||
{
|
||||
return $ret;
|
||||
}
|
||||
|
||||
// 标记用户存在
|
||||
$user['is_user_exist'] = 1;
|
||||
return DataReturn('授权登录成功', 0, $user);
|
||||
} else {
|
||||
$ret = DataReturn($result['msg'], -10);
|
||||
}
|
||||
return DataReturn($result['msg'], -10);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -528,35 +529,36 @@ class User extends Common
|
|||
],
|
||||
];
|
||||
$ret = ParamsChecked($this->data_post, $p);
|
||||
if($ret !== true)
|
||||
if($ret === true)
|
||||
{
|
||||
return DataReturn($ret, -1);
|
||||
}
|
||||
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'toutiao_openid', $this->data_post['openid']);
|
||||
if(empty($user))
|
||||
{
|
||||
$result = json_decode(htmlspecialchars_decode($this->data_post['userinfo']), true);
|
||||
if(is_array($result))
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'toutiao_openid', $this->data_post['openid']);
|
||||
if(empty($user))
|
||||
{
|
||||
$result['nickname'] = isset($result['nickName']) ? $result['nickName'] : '';
|
||||
$result['avatar'] = isset($result['avatarUrl']) ? $result['avatarUrl'] : '';
|
||||
$result['gender'] = empty($result['gender']) ? 0 : (($result['gender'] == 2) ? 1 : 2);
|
||||
$result['openid'] = $this->data_post['openid'];
|
||||
$result['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0;
|
||||
return UserService::AuthUserProgram($result, 'toutiao_openid');
|
||||
$result = json_decode(htmlspecialchars_decode($this->data_post['userinfo']), true);
|
||||
if(is_array($result))
|
||||
{
|
||||
$result['nickname'] = isset($result['nickName']) ? $result['nickName'] : '';
|
||||
$result['avatar'] = isset($result['avatarUrl']) ? $result['avatarUrl'] : '';
|
||||
$result['gender'] = empty($result['gender']) ? 0 : (($result['gender'] == 2) ? 1 : 2);
|
||||
$result['openid'] = $this->data_post['openid'];
|
||||
$result['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0;
|
||||
$ret = UserService::AuthUserProgram($result, 'toutiao_openid');
|
||||
} else {
|
||||
$ret = DataReturn(empty($result) ? '获取用户信息失败' : $result, -1);
|
||||
}
|
||||
} else {
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] == 0)
|
||||
{
|
||||
$ret = DataReturn('授权成功', 0, $user);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] != 0)
|
||||
{
|
||||
return $ret;
|
||||
}
|
||||
return DataReturn('授权成功', 0, $user);
|
||||
$ret = DataReturn($ret, -1);
|
||||
}
|
||||
return DataReturn(empty($result) ? '获取用户信息失败' : $result, -100);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -570,34 +572,34 @@ class User extends Common
|
|||
public function QQUserAuth()
|
||||
{
|
||||
// 参数
|
||||
if(empty($this->data_post['authcode']))
|
||||
if(!empty($this->data_post['authcode']))
|
||||
{
|
||||
return DataReturn('授权码为空', -1);
|
||||
}
|
||||
|
||||
// 授权
|
||||
$result = (new \base\QQ(MyC('common_app_mini_qq_appid'), MyC('common_app_mini_qq_appsecret')))->GetAuthSessionKey($this->data_post['authcode']);
|
||||
if($result !== false)
|
||||
{
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'qq_openid', $result);
|
||||
if(empty($user))
|
||||
// 授权
|
||||
$result = (new \base\QQ(MyC('common_app_mini_qq_appid'), MyC('common_app_mini_qq_appsecret')))->GetAuthSessionKey($this->data_post['authcode']);
|
||||
if($result !== false)
|
||||
{
|
||||
return DataReturn('授权登录成功', 0, ['is_user_exist'=>0, 'openid'=>$result]);
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'qq_openid', $result);
|
||||
if(empty($user))
|
||||
{
|
||||
$ret = DataReturn('授权登录成功', 0, ['is_user_exist'=>0, 'openid'=>$result]);
|
||||
} else {
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] == 0)
|
||||
{
|
||||
// 标记用户存在
|
||||
$user['is_user_exist'] = 1;
|
||||
$ret = DataReturn('授权登录成功', 0, $user);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$ret = DataReturn('授权登录失败', -100);
|
||||
}
|
||||
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] != 0)
|
||||
{
|
||||
return $ret;
|
||||
}
|
||||
|
||||
// 标记用户存在
|
||||
$user['is_user_exist'] = 1;
|
||||
return DataReturn('授权登录成功', 0, $user);
|
||||
} else {
|
||||
$ret = DataReturn('授权码为空', -1);
|
||||
}
|
||||
return DataReturn('授权登录失败', -100);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -629,36 +631,37 @@ class User extends Common
|
|||
]
|
||||
];
|
||||
$ret = ParamsChecked($this->data_post, $p);
|
||||
if($ret !== true)
|
||||
if($ret === true)
|
||||
{
|
||||
return DataReturn($ret, -1);
|
||||
}
|
||||
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'qq_openid', $this->data_post['openid']);
|
||||
if(empty($user))
|
||||
{
|
||||
$result = (new \base\QQ(MyC('common_app_mini_qq_appid'), MyC('common_app_mini_qq_appsecret')))->DecryptData($this->data_post['encrypted_data'], $this->data_post['iv'], $this->data_post['openid']);
|
||||
if(is_array($result))
|
||||
// 先从数据库获取用户信息
|
||||
$user = UserService::AppUserInfoHandle(null, 'qq_openid', $this->data_post['openid']);
|
||||
if(empty($user))
|
||||
{
|
||||
$result['nickname'] = isset($result['nickName']) ? $result['nickName'] : '';
|
||||
$result['avatar'] = isset($result['avatarUrl']) ? $result['avatarUrl'] : '';
|
||||
$result['gender'] = empty($result['gender']) ? 0 : (($result['gender'] == 2) ? 1 : 2);
|
||||
$result['qq_unionid'] = isset($result['unionId']) ? $result['unionId'] : '';
|
||||
$result['openid'] = $result['openId'];
|
||||
$result['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0;
|
||||
return UserService::AuthUserProgram($result, 'qq_openid');
|
||||
}
|
||||
$result = (new \base\QQ(MyC('common_app_mini_qq_appid'), MyC('common_app_mini_qq_appsecret')))->DecryptData($this->data_post['encrypted_data'], $this->data_post['iv'], $this->data_post['openid']);
|
||||
if(is_array($result))
|
||||
{
|
||||
$result['nickname'] = isset($result['nickName']) ? $result['nickName'] : '';
|
||||
$result['avatar'] = isset($result['avatarUrl']) ? $result['avatarUrl'] : '';
|
||||
$result['gender'] = empty($result['gender']) ? 0 : (($result['gender'] == 2) ? 1 : 2);
|
||||
$result['qq_unionid'] = isset($result['unionId']) ? $result['unionId'] : '';
|
||||
$result['openid'] = $result['openId'];
|
||||
$result['referrer']= isset($this->data_post['referrer']) ? $this->data_post['referrer'] : 0;
|
||||
$ret = UserService::AuthUserProgram($result, 'qq_openid');
|
||||
} else {
|
||||
$ret = DataReturn(empty($result) ? '获取用户信息失败' : $result, -1);
|
||||
}
|
||||
} else {
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] == 0)
|
||||
{
|
||||
$ret = DataReturn('授权成功', 0, $user);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// 用户状态
|
||||
$ret = UserService::UserStatusCheck('id', $user['id']);
|
||||
if($ret['code'] != 0)
|
||||
{
|
||||
return $ret;
|
||||
}
|
||||
return DataReturn('授权成功', 0, $user);
|
||||
$ret = DataReturn($ret, -1);
|
||||
}
|
||||
return DataReturn(empty($result) ? '获取用户信息失败' : $result, -100);
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -713,7 +716,7 @@ class User extends Common
|
|||
);
|
||||
|
||||
// 返回数据
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -745,56 +748,57 @@ class User extends Common
|
|||
]
|
||||
];
|
||||
$ret = ParamsChecked($this->data_post, $p);
|
||||
if($ret !== true)
|
||||
if($ret === true)
|
||||
{
|
||||
return DataReturn($ret, -1);
|
||||
// 根据不同平台处理数据解密逻辑
|
||||
$mobile = '';
|
||||
$error_msg = '';
|
||||
switch(APPLICATION_CLIENT_TYPE)
|
||||
{
|
||||
// 微信
|
||||
case 'weixin' :
|
||||
$result = (new \base\Wechat(MyC('common_app_mini_weixin_appid'), MyC('common_app_mini_weixin_appsecret')))->DecryptData($this->data_post['encrypted_data'], $this->data_post['iv'], $this->data_post['openid']);
|
||||
if($result['status'] == 0 && !empty($result['data']) && !empty($result['data']['purePhoneNumber']))
|
||||
{
|
||||
$mobile = $result['data']['purePhoneNumber'];
|
||||
} else {
|
||||
$error_msg = $result['msg'];
|
||||
}
|
||||
break;
|
||||
|
||||
// 百度
|
||||
case 'baidu' :
|
||||
$config = [
|
||||
'appid' => MyC('common_app_mini_baidu_appid'),
|
||||
'key' => MyC('common_app_mini_baidu_appkey'),
|
||||
'secret' => MyC('common_app_mini_baidu_appsecret'),
|
||||
];
|
||||
$result = (new \base\Baidu($config))->DecryptData($this->data_post['encrypted_data'], $this->data_post['iv'], $this->data_post['openid'], 'mobile_bind');
|
||||
if($result['status'] == 0 && !empty($result['data']) && !empty($result['data']['mobile']))
|
||||
{
|
||||
$mobile = $result['data']['mobile'];
|
||||
} else {
|
||||
$error_msg = $result['msg'];
|
||||
}
|
||||
break;
|
||||
|
||||
// 默认
|
||||
default :
|
||||
$error_msg = APPLICATION_CLIENT_TYPE.'平台还未开发手机一键登录';
|
||||
}
|
||||
if(empty($mobile) || !empty($error_msg))
|
||||
{
|
||||
$ret = DataReturn(empty($error_msg) ? '数据解密失败' : $error_msg, -1);
|
||||
} else {
|
||||
// 用户信息处理
|
||||
$this->data_post['mobile'] = $mobile;
|
||||
$this->data_post['is_onekey_mobile_bind'] = 1;
|
||||
$ret = UserService::AuthUserProgram($this->data_post, APPLICATION_CLIENT_TYPE.'_openid');
|
||||
}
|
||||
} else {
|
||||
$ret = DataReturn($ret, -1);
|
||||
}
|
||||
|
||||
// 根据不同平台处理数据解密逻辑
|
||||
$mobile = '';
|
||||
$error_msg = '';
|
||||
switch(APPLICATION_CLIENT_TYPE)
|
||||
{
|
||||
// 微信
|
||||
case 'weixin' :
|
||||
$result = (new \base\Wechat(MyC('common_app_mini_weixin_appid'), MyC('common_app_mini_weixin_appsecret')))->DecryptData($this->data_post['encrypted_data'], $this->data_post['iv'], $this->data_post['openid']);
|
||||
if($result['status'] == 0 && !empty($result['data']) && !empty($result['data']['purePhoneNumber']))
|
||||
{
|
||||
$mobile = $result['data']['purePhoneNumber'];
|
||||
} else {
|
||||
$error_msg = $result['msg'];
|
||||
}
|
||||
break;
|
||||
|
||||
// 百度
|
||||
case 'baidu' :
|
||||
$config = [
|
||||
'appid' => MyC('common_app_mini_baidu_appid'),
|
||||
'key' => MyC('common_app_mini_baidu_appkey'),
|
||||
'secret' => MyC('common_app_mini_baidu_appsecret'),
|
||||
];
|
||||
$result = (new \base\Baidu($config))->DecryptData($this->data_post['encrypted_data'], $this->data_post['iv'], $this->data_post['openid'], 'mobile_bind');
|
||||
if($result['status'] == 0 && !empty($result['data']) && !empty($result['data']['mobile']))
|
||||
{
|
||||
$mobile = $result['data']['mobile'];
|
||||
} else {
|
||||
$error_msg = $result['msg'];
|
||||
}
|
||||
break;
|
||||
|
||||
// 默认
|
||||
default :
|
||||
return DataReturn(APPLICATION_CLIENT_TYPE.'平台还未开发手机一键登录', -1);
|
||||
}
|
||||
if(empty($mobile))
|
||||
{
|
||||
return DataReturn(empty($error_msg) ? '数据解密失败' : $error_msg, -1);
|
||||
}
|
||||
|
||||
// 用户信息处理
|
||||
$this->data_post['mobile'] = $mobile;
|
||||
$this->data_post['is_onekey_mobile_bind'] = 1;
|
||||
return UserService::AuthUserProgram($this->data_post, APPLICATION_CLIENT_TYPE.'_openid');
|
||||
return ApiService::ApiDataReturn($ret);
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\ConfigService;
|
||||
use app\service\UserAddressService;
|
||||
|
|
@ -54,7 +55,7 @@ class UserAddress extends Common
|
|||
$result = [
|
||||
'data' => $ret['data'],
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -76,7 +77,7 @@ class UserAddress extends Common
|
|||
'data' => empty($data['data']) ? null : $data['data'],
|
||||
'editor_path_type' => ResourcesService::EditorPathTypeValue(UserAddressService::EditorAttachmentPathType($this->user['id'])),
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -91,7 +92,7 @@ class UserAddress extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return UserAddressService::UserAddressSave($params);
|
||||
return ApiService::ApiDataReturn(UserAddressService::UserAddressSave($params));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -106,7 +107,7 @@ class UserAddress extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return UserAddressService::UserAddressDelete($params);
|
||||
return ApiService::ApiDataReturn(UserAddressService::UserAddressDelete($params));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -121,7 +122,7 @@ class UserAddress extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return UserAddressService::UserAddressDefault($params);
|
||||
return ApiService::ApiDataReturn(UserAddressService::UserAddressDefault($params));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -136,7 +137,7 @@ class UserAddress extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return ConfigService::SiteTypeExtractionAddressList(null, $params);
|
||||
return ApiService::ApiDataReturn(ConfigService::SiteTypeExtractionAddressList(null, $params));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -151,7 +152,7 @@ class UserAddress extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return UserAddressService::OutSystemUserAddressAdd($params);
|
||||
return ApiService::ApiDataReturn(UserAddressService::OutSystemUserAddressAdd($params));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\GoodsBrowseService;
|
||||
|
||||
|
|
@ -78,7 +79,7 @@ class UserGoodsBrowse extends Common
|
|||
'page_total' => $page_total,
|
||||
'data' => $data['data'],
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -93,7 +94,7 @@ class UserGoodsBrowse extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return GoodsBrowseService::GoodsBrowseDelete($params);
|
||||
return ApiService::ApiDataReturn(GoodsBrowseService::GoodsBrowseDelete($params));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\GoodsFavorService;
|
||||
|
||||
|
|
@ -77,7 +78,7 @@ class UserGoodsFavor extends Common
|
|||
'page_total' => $page_total,
|
||||
'data' => $data['data'],
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -92,7 +93,7 @@ class UserGoodsFavor extends Common
|
|||
{
|
||||
$params = $this->data_post;
|
||||
$params['user'] = $this->user;
|
||||
return GoodsFavorService::GoodsFavorCancel($params);
|
||||
return ApiService::ApiDataReturn(GoodsFavorService::GoodsFavorCancel($params));
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -10,6 +10,7 @@
|
|||
// +----------------------------------------------------------------------
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\service\ApiService;
|
||||
use app\service\SystemBaseService;
|
||||
use app\service\IntegralService;
|
||||
|
||||
|
|
@ -78,7 +79,7 @@ class UserIntegral extends Common
|
|||
'page_total' => $page_total,
|
||||
'data' => $data['data'],
|
||||
];
|
||||
return SystemBaseService::DataReturn($result);
|
||||
return ApiService::ApiDataReturn(SystemBaseService::DataReturn($result));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,23 +8,30 @@
|
|||
// +----------------------------------------------------------------------
|
||||
// | Author: Devil
|
||||
// +----------------------------------------------------------------------
|
||||
namespace app\service;
|
||||
|
||||
/**
|
||||
* 模块配置信息
|
||||
* @author Devil
|
||||
* @blog http://gong.gg/
|
||||
* @version 0.0.1
|
||||
* @datetime 2016-12-01T21:51:08+0800
|
||||
* api服务层
|
||||
* @author Devil
|
||||
* @blog http://gong.gg/
|
||||
* @version 1.0.0
|
||||
* @date 2021-06-22
|
||||
* @desc description
|
||||
*/
|
||||
|
||||
return [
|
||||
// 默认输出类型
|
||||
'default_return_type' => 'json',
|
||||
|
||||
// 默认AJAX 数据返回格式,可选json xml ...
|
||||
'default_ajax_return' => 'json',
|
||||
|
||||
// 默认JSONP格式返回的处理方法
|
||||
'default_jsonp_handler' => 'jsonpReturn',
|
||||
];
|
||||
class ApiService
|
||||
{
|
||||
/**
|
||||
* api数据统一返回
|
||||
* @author Devil
|
||||
* @blog http://gong.gg/
|
||||
* @version 1.0.0
|
||||
* @date 2021-07-20
|
||||
* @desc description
|
||||
* @param [array] $data [api统一返回]
|
||||
*/
|
||||
public static function ApiDataReturn($data)
|
||||
{
|
||||
return json($data);
|
||||
}
|
||||
}
|
||||
?>
|
||||
Loading…
Reference in New Issue