Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
纵之格
ShopXO
提交
3912a4f9
ShopXO
项目概览
纵之格
/
ShopXO
通知
394
Star
16
Fork
11
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
3912a4f9
编写于
5月 15, 2023
作者:
G
gongfuxiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
细节优化,用户添加增加前钩子
上级
af7e8c14
变更
21
隐藏空白更改
内联
并排
Showing
21 changed file
with
114 addition
and
87 deletion
+114
-87
app/admin/controller/Common.php
app/admin/controller/Common.php
+2
-1
app/api/controller/Answer.php
app/api/controller/Answer.php
+3
-3
app/api/controller/Article.php
app/api/controller/Article.php
+2
-2
app/api/controller/Base.php
app/api/controller/Base.php
+1
-1
app/api/controller/Buy.php
app/api/controller/Buy.php
+2
-2
app/api/controller/Cart.php
app/api/controller/Cart.php
+3
-3
app/api/controller/Goods.php
app/api/controller/Goods.php
+9
-9
app/api/controller/Message.php
app/api/controller/Message.php
+2
-2
app/api/controller/Order.php
app/api/controller/Order.php
+10
-10
app/api/controller/Orderaftersale.php
app/api/controller/Orderaftersale.php
+7
-7
app/api/controller/Personal.php
app/api/controller/Personal.php
+2
-2
app/api/controller/Region.php
app/api/controller/Region.php
+1
-1
app/api/controller/Safety.php
app/api/controller/Safety.php
+1
-1
app/api/controller/Search.php
app/api/controller/Search.php
+6
-6
app/api/controller/User.php
app/api/controller/User.php
+11
-11
app/api/controller/Useraddress.php
app/api/controller/Useraddress.php
+6
-6
app/api/controller/Usergoodsbrowse.php
app/api/controller/Usergoodsbrowse.php
+3
-3
app/api/controller/Usergoodsfavor.php
app/api/controller/Usergoodsfavor.php
+2
-2
app/api/controller/Userintegral.php
app/api/controller/Userintegral.php
+2
-2
app/service/OrderService.php
app/service/OrderService.php
+7
-5
app/service/UserService.php
app/service/UserService.php
+32
-8
未找到文件。
app/admin/controller/Common.php
浏览文件 @
3912a4f9
...
...
@@ -113,7 +113,8 @@ class Common extends BaseController
$this
->
admin
=
AdminService
::
LoginInfo
();
// 权限菜单
$menu
=
AdminPowerService
::
PowerMenuInit
(
$this
->
admin
);
$is_refresh
=
!
empty
(
$this
->
data_request
[
'lang'
]);
$menu
=
AdminPowerService
::
PowerMenuInit
(
$this
->
admin
,
$is_refresh
);
$this
->
left_menu
=
$menu
[
'admin_left_menu'
];
// 视图初始化
...
...
app/api/controller/Answer.php
浏览文件 @
3912a4f9
...
...
@@ -55,7 +55,7 @@ class Answer extends Common
// 分页
$number
=
10
;
$page
=
max
(
1
,
isset
(
$this
->
data_
post
[
'page'
])
?
intval
(
$this
->
data_po
st
[
'page'
])
:
1
);
$page
=
max
(
1
,
isset
(
$this
->
data_
request
[
'page'
])
?
intval
(
$this
->
data_reque
st
[
'page'
])
:
1
);
// 条件
$where
=
AnswerService
::
AnswerListWhere
(
$params
);
...
...
@@ -95,7 +95,7 @@ class Answer extends Common
// 登录校验
$this
->
IsLogin
();
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
AnswerService
::
AnswerSave
(
$params
));
}
...
...
@@ -117,7 +117,7 @@ class Answer extends Common
// 分页
$number
=
10
;
$page
=
max
(
1
,
isset
(
$this
->
data_
post
[
'page'
])
?
intval
(
$this
->
data_po
st
[
'page'
])
:
1
);
$page
=
max
(
1
,
isset
(
$this
->
data_
request
[
'page'
])
?
intval
(
$this
->
data_reque
st
[
'page'
])
:
1
);
// 条件
$where
=
AnswerService
::
AnswerListWhere
(
$params
);
...
...
app/api/controller/Article.php
浏览文件 @
3912a4f9
...
...
@@ -71,11 +71,11 @@ class Article extends Common
public
function
DataList
()
{
// 参数
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
// 分页
$number
=
10
;
$page
=
max
(
1
,
isset
(
$this
->
data_
post
[
'page'
])
?
intval
(
$this
->
data_po
st
[
'page'
])
:
1
);
$page
=
max
(
1
,
isset
(
$this
->
data_
request
[
'page'
])
?
intval
(
$this
->
data_reque
st
[
'page'
])
:
1
);
// 条件
$where
=
ArticleService
::
ArticleWhere
(
$params
);
...
...
app/api/controller/Base.php
浏览文件 @
3912a4f9
...
...
@@ -34,7 +34,7 @@ class Base extends Common
public
function
Common
()
{
// 参数
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
SystemBaseService
::
Common
(
$params
));
}
...
...
app/api/controller/Buy.php
浏览文件 @
3912a4f9
...
...
@@ -52,7 +52,7 @@ class Buy extends Common
public
function
Index
()
{
// 获取商品列表
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
// 默认支付方式
...
...
@@ -98,7 +98,7 @@ class Buy extends Common
*/
public
function
Add
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
BuyService
::
OrderInsert
(
$params
));
}
...
...
app/api/controller/Cart.php
浏览文件 @
3912a4f9
...
...
@@ -67,7 +67,7 @@ class Cart extends Common
*/
public
function
Save
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
GoodsCartService
::
GoodsCartSave
(
$params
));
}
...
...
@@ -82,7 +82,7 @@ class Cart extends Common
*/
public
function
Delete
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
GoodsCartService
::
GoodsCartDelete
(
$params
));
}
...
...
@@ -97,7 +97,7 @@ class Cart extends Common
*/
public
function
Stock
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
GoodsCartService
::
GoodsCartStock
(
$params
));
}
...
...
app/api/controller/Goods.php
浏览文件 @
3912a4f9
...
...
@@ -55,7 +55,7 @@ class Goods extends Common
public
function
Detail
()
{
// 参数
$goods_id
=
empty
(
$this
->
data_
post
[
'id'
])
?
(
empty
(
$this
->
data_post
[
'goods_id'
])
?
0
:
intval
(
$this
->
data_post
[
'goods_id'
]))
:
intval
(
$this
->
data_po
st
[
'id'
]);
$goods_id
=
empty
(
$this
->
data_
request
[
'id'
])
?
(
empty
(
$this
->
data_request
[
'goods_id'
])
?
0
:
intval
(
$this
->
data_request
[
'goods_id'
]))
:
intval
(
$this
->
data_reque
st
[
'id'
]);
if
(
empty
(
$goods_id
))
{
$ret
=
DataReturn
(
MyLang
(
'params_error_tips'
),
-
1
);
...
...
@@ -149,7 +149,7 @@ class Goods extends Common
$this
->
IsLogin
();
// 开始操作
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
GoodsFavorService
::
GoodsFavorCancel
(
$params
));
}
...
...
@@ -165,7 +165,7 @@ class Goods extends Common
public
function
SpecType
()
{
// 开始处理
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$ret
=
GoodsService
::
GoodsSpecType
(
$params
);
return
ApiService
::
ApiDataReturn
(
$ret
);
}
...
...
@@ -181,7 +181,7 @@ class Goods extends Common
public
function
SpecDetail
()
{
// 开始处理
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$ret
=
GoodsService
::
GoodsSpecDetail
(
$params
);
return
ApiService
::
ApiDataReturn
(
$ret
);
}
...
...
@@ -197,7 +197,7 @@ class Goods extends Common
public
function
Stock
()
{
// 开始处理
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$ret
=
GoodsService
::
GoodsStock
(
$params
);
return
ApiService
::
ApiDataReturn
(
$ret
);
}
...
...
@@ -213,7 +213,7 @@ class Goods extends Common
public
function
Category
()
{
$result
=
[
'category'
=>
GoodsCategoryService
::
GoodsCategoryAll
(
$this
->
data_
po
st
),
'category'
=>
GoodsCategoryService
::
GoodsCategoryAll
(
$this
->
data_
reque
st
),
];
return
ApiService
::
ApiDataReturn
(
SystemBaseService
::
DataReturn
(
$result
));
}
...
...
@@ -228,12 +228,12 @@ class Goods extends Common
*/
public
function
GoodsScore
()
{
if
(
empty
(
$this
->
data_
po
st
[
'goods_id'
]))
if
(
empty
(
$this
->
data_
reque
st
[
'goods_id'
]))
{
$ret
=
DataReturn
(
MyLang
(
'params_error_tips'
),
-
1
);
}
else
{
// 获取商品评分
$data
=
GoodsCommentsService
::
GoodsCommentsScore
(
$this
->
data_
po
st
[
'goods_id'
]);
$data
=
GoodsCommentsService
::
GoodsCommentsScore
(
$this
->
data_
reque
st
[
'goods_id'
]);
$ret
=
DataReturn
(
'success'
,
0
,
$data
);
}
return
ApiService
::
ApiDataReturn
(
$ret
);
...
...
@@ -249,7 +249,7 @@ class Goods extends Common
public
function
Comments
()
{
// 参数
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
// 分页
$number
=
10
;
...
...
app/api/controller/Message.php
浏览文件 @
3912a4f9
...
...
@@ -49,7 +49,7 @@ class Message extends Common
public
function
Index
()
{
// 参数
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
// 消息更新未已读
...
...
@@ -57,7 +57,7 @@ class Message extends Common
// 分页
$number
=
10
;
$page
=
max
(
1
,
isset
(
$this
->
data_
post
[
'page'
])
?
intval
(
$this
->
data_po
st
[
'page'
])
:
1
);
$page
=
max
(
1
,
isset
(
$this
->
data_
request
[
'page'
])
?
intval
(
$this
->
data_reque
st
[
'page'
])
:
1
);
// 条件
$where
=
MessageService
::
MessageListWhere
(
$params
);
...
...
app/api/controller/Order.php
浏览文件 @
3912a4f9
...
...
@@ -53,13 +53,13 @@ class Order extends Common
public
function
Index
()
{
// 参数
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
$params
[
'user_type'
]
=
'user'
;
// 分页
$number
=
10
;
$page
=
max
(
1
,
isset
(
$this
->
data_
post
[
'page'
])
?
intval
(
$this
->
data_po
st
[
'page'
])
:
1
);
$page
=
max
(
1
,
isset
(
$this
->
data_
request
[
'page'
])
?
intval
(
$this
->
data_reque
st
[
'page'
])
:
1
);
// 条件
$where
=
OrderService
::
OrderListWhere
(
$params
);
...
...
@@ -102,7 +102,7 @@ class Order extends Common
public
function
Detail
()
{
// 参数
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
$params
[
'user_type'
]
=
'user'
;
if
(
!
empty
(
$params
[
'id'
]))
...
...
@@ -154,7 +154,7 @@ class Order extends Common
public
function
Comments
()
{
// 参数
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
$params
[
'user_type'
]
=
'user'
;
if
(
empty
(
$params
[
'id'
]))
...
...
@@ -200,7 +200,7 @@ class Order extends Common
*/
public
function
CommentsSave
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
$params
[
'business_type'
]
=
'order'
;
return
ApiService
::
ApiDataReturn
(
GoodsCommentsService
::
Comments
(
$params
));
...
...
@@ -216,7 +216,7 @@ class Order extends Common
*/
public
function
Pay
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
OrderService
::
Pay
(
$params
));
}
...
...
@@ -231,7 +231,7 @@ class Order extends Common
*/
public
function
Cancel
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user_id'
]
=
$this
->
user
[
'id'
];
$params
[
'creator'
]
=
$this
->
user
[
'id'
];
$params
[
'creator_name'
]
=
$this
->
user
[
'user_name_view'
];
...
...
@@ -247,7 +247,7 @@ class Order extends Common
*/
public
function
Collect
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user_id'
]
=
$this
->
user
[
'id'
];
$params
[
'creator'
]
=
$this
->
user
[
'id'
];
$params
[
'creator_name'
]
=
$this
->
user
[
'user_name_view'
];
...
...
@@ -264,7 +264,7 @@ class Order extends Common
*/
public
function
Delete
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user_id'
]
=
$this
->
user
[
'id'
];
$params
[
'creator'
]
=
$this
->
user
[
'id'
];
$params
[
'creator_name'
]
=
$this
->
user
[
'user_name_view'
];
...
...
@@ -282,7 +282,7 @@ class Order extends Common
*/
public
function
PayCheck
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
OrderService
::
OrderPayCheck
(
$params
));
}
...
...
app/api/controller/Orderaftersale.php
浏览文件 @
3912a4f9
...
...
@@ -51,13 +51,13 @@ class Orderaftersale extends Common
public
function
Index
()
{
// 参数
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
$params
[
'user_type'
]
=
'user'
;
// 分页
$number
=
10
;
$page
=
max
(
1
,
isset
(
$this
->
data_
post
[
'page'
])
?
intval
(
$this
->
data_po
st
[
'page'
])
:
1
);
$page
=
max
(
1
,
isset
(
$this
->
data_
request
[
'page'
])
?
intval
(
$this
->
data_reque
st
[
'page'
])
:
1
);
// 条件
$where
=
OrderAftersaleService
::
OrderAftersaleListWhere
(
$params
);
...
...
@@ -95,8 +95,8 @@ class Orderaftersale extends Common
*/
public
function
Aftersale
()
{
$order_id
=
isset
(
$this
->
data_
post
[
'oid'
])
?
intval
(
$this
->
data_po
st
[
'oid'
])
:
0
;
$order_detail_id
=
isset
(
$this
->
data_
post
[
'did'
])
?
intval
(
$this
->
data_po
st
[
'did'
])
:
0
;
$order_id
=
isset
(
$this
->
data_
request
[
'oid'
])
?
intval
(
$this
->
data_reque
st
[
'oid'
])
:
0
;
$order_detail_id
=
isset
(
$this
->
data_
request
[
'did'
])
?
intval
(
$this
->
data_reque
st
[
'did'
])
:
0
;
$ret
=
OrderAftersaleService
::
OrdferGoodsRow
(
$order_id
,
$order_detail_id
,
$this
->
user
[
'id'
]);
if
(
$ret
[
'code'
]
==
0
)
{
...
...
@@ -162,7 +162,7 @@ class Orderaftersale extends Common
*/
public
function
Create
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
OrderAftersaleService
::
AftersaleCreate
(
$params
));
}
...
...
@@ -177,7 +177,7 @@ class Orderaftersale extends Common
*/
public
function
Delivery
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
OrderAftersaleService
::
AftersaleDelivery
(
$params
));
}
...
...
@@ -192,7 +192,7 @@ class Orderaftersale extends Common
*/
public
function
Cancel
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
OrderAftersaleService
::
AftersaleCancel
(
$params
));
}
...
...
app/api/controller/Personal.php
浏览文件 @
3912a4f9
...
...
@@ -67,7 +67,7 @@ class Personal extends Common
*/
public
function
Save
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
UserService
::
PersonalSave
(
$params
));
}
...
...
@@ -82,7 +82,7 @@ class Personal extends Common
*/
public
function
UserAvatarUpload
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
$params
[
'img_field'
]
=
'file'
;
return
ApiService
::
ApiDataReturn
(
UserService
::
UserAvatarUpload
(
$params
));
...
...
app/api/controller/Region.php
浏览文件 @
3912a4f9
...
...
@@ -80,7 +80,7 @@ class Region extends Common
*/
public
function
CodeData
()
{
return
ApiService
::
ApiDataReturn
(
RegionService
::
RegionCodeData
(
$this
->
data_
po
st
));
return
ApiService
::
ApiDataReturn
(
RegionService
::
RegionCodeData
(
$this
->
data_
reque
st
));
}
}
?>
\ No newline at end of file
app/api/controller/Safety.php
浏览文件 @
3912a4f9
...
...
@@ -47,7 +47,7 @@ class Safety extends Common
*/
public
function
Logout
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
SafetyService
::
AccountsLogout
(
$params
));
}
...
...
app/api/controller/Search.php
浏览文件 @
3912a4f9
...
...
@@ -47,7 +47,7 @@ class Search extends Common
public
function
Index
()
{
// 搜素条件
$map
=
SearchService
::
SearchWhereHandle
(
$this
->
data_
po
st
);
$map
=
SearchService
::
SearchWhereHandle
(
$this
->
data_
reque
st
);
// 返回数据
$result
=
[
...
...
@@ -78,15 +78,15 @@ class Search extends Common
public
function
DataList
()
{
// 搜素条件
$map
=
SearchService
::
SearchWhereHandle
(
$this
->
data_
po
st
);
$map
=
SearchService
::
SearchWhereHandle
(
$this
->
data_
reque
st
);
// 获取数据
$ret
=
SearchService
::
GoodsList
(
$map
,
$this
->
data_
po
st
);
$ret
=
SearchService
::
GoodsList
(
$map
,
$this
->
data_
reque
st
);
// 搜索记录
$this
->
data_
po
st
[
'user_id'
]
=
isset
(
$this
->
user
[
'id'
])
?
$this
->
user
[
'id'
]
:
0
;
$this
->
data_
po
st
[
'search_result_data'
]
=
$ret
[
'data'
];
SearchService
::
SearchAdd
(
$this
->
data_
po
st
);
$this
->
data_
reque
st
[
'user_id'
]
=
isset
(
$this
->
user
[
'id'
])
?
$this
->
user
[
'id'
]
:
0
;
$this
->
data_
reque
st
[
'search_result_data'
]
=
$ret
[
'data'
];
SearchService
::
SearchAdd
(
$this
->
data_
reque
st
);
// 返回数据
return
ApiService
::
ApiDataReturn
(
SystemBaseService
::
DataReturn
(
$ret
[
'data'
]));
...
...
app/api/controller/User.php
浏览文件 @
3912a4f9
...
...
@@ -56,7 +56,7 @@ class User extends Common
*/
public
function
Login
()
{
return
ApiService
::
ApiDataReturn
(
UserService
::
Login
(
$this
->
data_
po
st
));
return
ApiService
::
ApiDataReturn
(
UserService
::
Login
(
$this
->
data_
reque
st
));
}
/**
...
...
@@ -69,7 +69,7 @@ class User extends Common
*/
public
function
LoginVerifySend
()
{
return
ApiService
::
ApiDataReturn
(
UserService
::
LoginVerifySend
(
$this
->
data_
po
st
));
return
ApiService
::
ApiDataReturn
(
UserService
::
LoginVerifySend
(
$this
->
data_
reque
st
));
}
/**
...
...
@@ -82,7 +82,7 @@ class User extends Common
*/
public
function
Reg
()
{
return
ApiService
::
ApiDataReturn
(
UserService
::
Reg
(
$this
->
data_
po
st
));
return
ApiService
::
ApiDataReturn
(
UserService
::
Reg
(
$this
->
data_
reque
st
));
}
/**
...
...
@@ -95,7 +95,7 @@ class User extends Common
*/
public
function
RegVerifySend
()
{
return
ApiService
::
ApiDataReturn
(
UserService
::
RegVerifySend
(
$this
->
data_
po
st
));
return
ApiService
::
ApiDataReturn
(
UserService
::
RegVerifySend
(
$this
->
data_
reque
st
));
}
/**
...
...
@@ -108,7 +108,7 @@ class User extends Common
*/
public
function
ForgetPwd
()
{
return
ApiService
::
ApiDataReturn
(
UserService
::
ForgetPwd
(
$this
->
data_
po
st
));
return
ApiService
::
ApiDataReturn
(
UserService
::
ForgetPwd
(
$this
->
data_
reque
st
));
}
/**
...
...
@@ -121,7 +121,7 @@ class User extends Common
*/
public
function
ForgetPwdVerifySend
()
{
return
ApiService
::
ApiDataReturn
(
UserService
::
ForgetPwdVerifySend
(
$this
->
data_
po
st
));
return
ApiService
::
ApiDataReturn
(
UserService
::
ForgetPwdVerifySend
(
$this
->
data_
reque
st
));
}
/**
...
...
@@ -134,7 +134,7 @@ class User extends Common
*/
public
function
AppMobileBind
()
{
return
ApiService
::
ApiDataReturn
(
UserService
::
AppMobileBind
(
$this
->
data_
po
st
));
return
ApiService
::
ApiDataReturn
(
UserService
::
AppMobileBind
(
$this
->
data_
reque
st
));
}
/**
...
...
@@ -147,7 +147,7 @@ class User extends Common
*/
public
function
AppMobileBindVerifySend
()
{
return
ApiService
::
ApiDataReturn
(
UserService
::
AppMobileBindVerifySend
(
$this
->
data_
po
st
));
return
ApiService
::
ApiDataReturn
(
UserService
::
AppMobileBindVerifySend
(
$this
->
data_
reque
st
));
}
/**
...
...
@@ -196,7 +196,7 @@ class User extends Common
$action
=
ucfirst
(
APPLICATION_CLIENT_TYPE
)
.
'UserAuth'
;
if
(
method_exists
(
$module
,
$action
))
{
$ret
=
AppMiniUserService
::
$action
(
$this
->
data_
po
st
);
$ret
=
AppMiniUserService
::
$action
(
$this
->
data_
reque
st
);
}
else
{
$ret
=
DataReturn
(
'方法未定义['
.
$action
.
']'
,
-
1
);
}
...
...
@@ -217,7 +217,7 @@ class User extends Common
$action
=
ucfirst
(
APPLICATION_CLIENT_TYPE
)
.
'UserInfo'
;
if
(
method_exists
(
$module
,
$action
))
{
$ret
=
AppMiniUserService
::
$action
(
$this
->
data_
po
st
);
$ret
=
AppMiniUserService
::
$action
(
$this
->
data_
reque
st
);
}
else
{
$ret
=
DataReturn
(
'方法未定义['
.
$action
.
']'
,
-
1
);
}
...
...
@@ -297,7 +297,7 @@ class User extends Common
*/
public
function
OnekeyUserMobileBind
()
{
return
ApiService
::
ApiDataReturn
(
AppMiniUserService
::
AppMiniOnekeyUserMobileBind
(
$this
->
data_
po
st
));
return
ApiService
::
ApiDataReturn
(
AppMiniUserService
::
AppMiniOnekeyUserMobileBind
(
$this
->
data_
reque
st
));
}
}
?>
\ No newline at end of file
app/api/controller/Useraddress.php
浏览文件 @
3912a4f9
...
...
@@ -68,7 +68,7 @@ class UserAddress extends Common
*/
public
function
Detail
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
$data
=
empty
(
$params
[
'id'
])
?
[]
:
UserAddressService
::
UserAddressRow
(
$params
);
...
...
@@ -90,7 +90,7 @@ class UserAddress extends Common
*/
public
function
Save
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
UserAddressService
::
UserAddressSave
(
$params
));
}
...
...
@@ -105,7 +105,7 @@ class UserAddress extends Common
*/
public
function
Delete
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
UserAddressService
::
UserAddressDelete
(
$params
));
}
...
...
@@ -120,7 +120,7 @@ class UserAddress extends Common
*/
public
function
SetDefault
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
UserAddressService
::
UserAddressDefault
(
$params
));
}
...
...
@@ -135,7 +135,7 @@ class UserAddress extends Common
*/
public
function
Extraction
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
ConfigService
::
SiteTypeExtractionAddressList
(
null
,
$params
));
}
...
...
@@ -150,7 +150,7 @@ class UserAddress extends Common
*/
public
function
OutSystemAdd
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
UserAddressService
::
OutSystemUserAddressAdd
(
$params
));
}
...
...
app/api/controller/Usergoodsbrowse.php
浏览文件 @
3912a4f9
...
...
@@ -50,12 +50,12 @@ class UserGoodsBrowse extends Common
public
function
Index
()
{
// 参数
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
// 分页
$number
=
10
;
$page
=
max
(
1
,
isset
(
$this
->
data_
post
[
'page'
])
?
intval
(
$this
->
data_po
st
[
'page'
])
:
1
);
$page
=
max
(
1
,
isset
(
$this
->
data_
request
[
'page'
])
?
intval
(
$this
->
data_reque
st
[
'page'
])
:
1
);
// 条件
$where
=
GoodsBrowseService
::
UserGoodsBrowseListWhere
(
$params
);
...
...
@@ -92,7 +92,7 @@ class UserGoodsBrowse extends Common
*/
public
function
Delete
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
GoodsBrowseService
::
GoodsBrowseDelete
(
$params
));
}
...
...
app/api/controller/Usergoodsfavor.php
浏览文件 @
3912a4f9
...
...
@@ -54,7 +54,7 @@ class UserGoodsFavor extends Common
// 分页
$number
=
10
;
$page
=
max
(
1
,
isset
(
$this
->
data_
post
[
'page'
])
?
intval
(
$this
->
data_po
st
[
'page'
])
:
1
);
$page
=
max
(
1
,
isset
(
$this
->
data_
request
[
'page'
])
?
intval
(
$this
->
data_reque
st
[
'page'
])
:
1
);
// 条件
$where
=
GoodsFavorService
::
UserGoodsFavorListWhere
(
$params
);
...
...
@@ -91,7 +91,7 @@ class UserGoodsFavor extends Common
*/
public
function
Cancel
()
{
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
return
ApiService
::
ApiDataReturn
(
GoodsFavorService
::
GoodsFavorCancel
(
$params
));
}
...
...
app/api/controller/Userintegral.php
浏览文件 @
3912a4f9
...
...
@@ -50,12 +50,12 @@ class UserIntegral extends Common
public
function
Index
()
{
// 参数
$params
=
$this
->
data_
po
st
;
$params
=
$this
->
data_
reque
st
;
$params
[
'user'
]
=
$this
->
user
;
// 分页
$number
=
10
;
$page
=
max
(
1
,
isset
(
$this
->
data_
post
[
'page'
])
?
intval
(
$this
->
data_po
st
[
'page'
])
:
1
);
$page
=
max
(
1
,
isset
(
$this
->
data_
request
[
'page'
])
?
intval
(
$this
->
data_reque
st
[
'page'
])
:
1
);
// 条件
$where
=
IntegralService
::
UserIntegralLogListWhere
(
$params
);
...
...
app/service/OrderService.php
浏览文件 @
3912a4f9
...
...
@@ -294,11 +294,13 @@ class OrderService
// 发起支付处理钩子
$hook_name
=
'plugins_service_order_pay_launch_handle'
;
$ret
=
EventReturnHandle
(
MyEventTrigger
(
$hook_name
,
[
'hook_name'
=>
$hook_name
,
'is_backend'
=>
true
,
'order_ids'
=>
$order_ids
,
'params'
=>
&
$params
,
'pay_data'
=>
&
$pay_data
,
'hook_name'
=>
$hook_name
,
'is_backend'
=>
true
,
'pay_log_id'
=>
$pay_log
[
'data'
][
'id'
],
'pay_log_no'
=>
$pay_log
[
'data'
][
'log_no'
],
'order_ids'
=>
$order_ids
,
'params'
=>
&
$params
,
'pay_data'
=>
&
$pay_data
,
]));
if
(
isset
(
$ret
[
'code'
])
&&
$ret
[
'code'
]
!=
0
)
{
...
...
app/service/UserService.php
浏览文件 @
3912a4f9
...
...
@@ -2573,6 +2573,16 @@ class UserService
}
}
// 注册添加之前钩子
$hook_name
=
'plugins_service_user_register_begin'
;
MyEventTrigger
(
$hook_name
,
[
'hook_name'
=>
$hook_name
,
'is_backend'
=>
true
,
'params'
=>
&
$params
,
'user_base'
=>
&
$user_base
,
'user_platform'
=>
&
$user_platform
,
]);
// 用户信息以手机或邮箱、不存在则添加
$user_base
[
'add_time'
]
=
time
();
$user_id
=
Db
::
name
(
'User'
)
->
insertGetId
(
$user_base
);
...
...
@@ -2592,7 +2602,11 @@ class UserService
self
::
UserNumberCodeCreatedHandle
(
$user_id
);
// 清除推荐id
MySession
(
'share_referrer_id'
,
null
);
if
(
!
empty
(
$user_base
[
'referrer'
]))
{
MySession
(
'share_referrer_id'
,
null
);
MyCookie
(
'share_referrer_id'
,
null
);
}
// 返回前端html代码
$body_html
=
[];
...
...
@@ -3169,15 +3183,25 @@ class UserService
public
static
function
UserReferrerDecrypt
(
$params
=
[])
{
// 推荐人
$referrer
=
empty
(
$params
[
'referrer'
])
?
MySession
(
'share_referrer_id'
)
:
$params
[
'referrer'
];
// 查看用户id是否已加密
if
(
preg_match
(
'/[a-zA-Z]/'
,
$referrer
))
if
(
empty
(
$params
[
'referrer'
]))
{
$referrer
=
MySession
(
'share_referrer_id'
);
if
(
empty
(
$referrer
))
{
$referrer
=
MyCookie
(
'share_referrer_id'
);
}
}
else
{
$referrer
=
$params
[
'referrer'
];
}
if
(
!
empty
(
$referrer
))
{
$referrer
=
base64_decode
(
AsciiToStr
(
$referrer
));
// 查看用户id是否已加密
if
(
preg_match
(
'/[a-zA-Z]/'
,
$referrer
))
{
return
intval
(
base64_decode
(
AsciiToStr
(
$referrer
)));
}
}
return
intval
(
$referrer
);
return
0
;
}
}
?>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录