Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
A
Afrishop refactored project
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Whispa
Afrishop refactored project
Commits
d8df6716
提交
d8df6716
authored
10月 18, 2020
作者:
Whispa
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
commit
上级
4f855b05
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
12 行增加
和
10 行删除
+12
-10
AddressController.java
...om/example/afrishop_v3/controllers/AddressController.java
+4
-2
ItemController.java
...a/com/example/afrishop_v3/controllers/ItemController.java
+6
-6
ShopifyController.java
...om/example/afrishop_v3/controllers/ShopifyController.java
+1
-1
TbCfHomePageEntityController.java
...afrishop_v3/controllers/TbCfHomePageEntityController.java
+1
-1
没有找到文件。
src/main/java/com/example/afrishop_v3/controllers/AddressController.java
浏览文件 @
d8df6716
...
...
@@ -43,10 +43,11 @@ public class AddressController extends Controller{
return
new
Result
(
e
.
getCode
(),
"Delivery name is required"
);
if
(
address
.
getPhone
()
==
null
||
address
.
getPhone
().
trim
().
isEmpty
())
return
new
Result
(
e
.
getCode
(),
"Phone is required"
);
if
(
repository
.
existsByAddressDetailAndUserId
(
address
.
getAddressDetail
(),
userId
))
if
(
repository
.
existsByAddressDetailAndUserId
(
address
.
getAddressDetail
()
.
trim
()
,
userId
))
return
new
Result
(
e
.
getCode
(),
"Address already existed"
);
address
.
setAddressDetail
(
address
.
getAddressDetail
().
trim
());
address
.
setUserId
(
userId
);
address
.
setAddressId
(
uid
());
return
new
Result
<>(
repository
.
save
(
address
));
...
...
@@ -69,9 +70,10 @@ public class AddressController extends Controller{
if
(
address
.
getPhone
()
==
null
||
address
.
getPhone
().
trim
().
isEmpty
())
return
new
Result
(
e
.
getCode
(),
"Phone is required"
);
if
(
repository
.
existsByAddressDetailAndUserIdAndAddressIdIsNot
(
address
.
getAddressDetail
(),
userId
,
addressId
))
if
(
repository
.
existsByAddressDetailAndUserIdAndAddressIdIsNot
(
address
.
getAddressDetail
()
.
trim
()
,
userId
,
addressId
))
return
new
Result
(
e
.
getCode
(),
"Address already existed"
);
address
.
setAddressDetail
(
address
.
getAddressDetail
().
trim
());
address
.
setAddressId
(
addressId
);
address
.
setUserId
(
userId
);
return
new
Result
<>(
repository
.
save
(
address
));
...
...
src/main/java/com/example/afrishop_v3/controllers/ItemController.java
浏览文件 @
d8df6716
...
...
@@ -42,7 +42,7 @@ public class ItemController {
}
@GetMapping
(
"/queryAll"
)
public
Result
queryAll
(
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
1
"
)
Integer
pageNum
,
public
Result
queryAll
(
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
0
"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"6"
)
Integer
pageSize
)
{
return
new
Result
<>(
repository
.
findAll
(
PageRequest
.
of
(
pageNum
,
pageSize
)));
...
...
@@ -51,7 +51,7 @@ public class ItemController {
@GetMapping
(
"/queryItemsByTypeTwo"
)
public
Result
queryItemsByTypeTwo
(
@RequestParam
(
"typeTwoId"
)
String
typeTwoId
,
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
1
"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
0
"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"6"
)
Integer
pageSize
,
@RequestParam
(
value
=
"order"
,
required
=
false
)
String
order
)
{
...
...
@@ -83,7 +83,7 @@ public class ItemController {
@GetMapping
(
"/searchItems"
)
public
Result
searchItems
(
@RequestParam
(
value
=
"name"
)
String
name
,
@RequestParam
(
value
=
"order"
,
required
=
false
)
String
order
,
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
1
"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
0
"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"6"
)
Integer
pageSize
)
{
Page
<
TbCfStationItem
>
list
=
repository
.
findAllByItemNameContainingOrItemTagsContaining
(
name
,
name
,
PageRequest
.
of
(
pageNum
,
pageSize
,
sort
(
order
)));
...
...
@@ -99,7 +99,7 @@ public class ItemController {
@GetMapping
(
"/getRecommendItems"
)
public
Result
getRecommendItems
(
@RequestParam
(
"itemId"
)
String
itemId
,
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
1
"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
0
"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"12"
)
Integer
pageSize
)
{
Optional
<
TbCfStationItem
>
byId
=
repository
.
findById
(
itemId
);
...
...
@@ -121,7 +121,7 @@ public class ItemController {
@GetMapping
(
"/queryItemsByTypeThree"
)
public
Result
queryItemsByTypeThree
(
@RequestParam
(
"typeThreeId"
)
String
typeThreeId
,
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
1
"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
0
"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"6"
)
Integer
pageSize
,
@RequestParam
(
value
=
"order"
,
required
=
false
)
String
order
)
{
return
new
Result
<>(
repository
.
findAllByItemDescritionId
(
typeThreeId
,
PageRequest
.
of
(
pageNum
,
pageSize
,
sort
(
order
))));
...
...
@@ -134,7 +134,7 @@ public class ItemController {
@GetMapping
(
"/queryItemsByLabel"
)
public
Result
queryItemsByLabel
(
@RequestParam
(
"label"
)
String
label
,
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
1
"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
0
"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"6"
)
Integer
pageSize
,
@RequestParam
(
value
=
"order"
,
required
=
false
)
String
order
)
{
return
new
Result
<>(
repository
.
findAllByItemLabelContaining
(
label
,
PageRequest
.
of
(
pageNum
,
pageSize
,
sort
(
order
))));
...
...
src/main/java/com/example/afrishop_v3/controllers/ShopifyController.java
浏览文件 @
d8df6716
...
...
@@ -24,7 +24,7 @@ public class ShopifyController {
@GetMapping
(
"/querycomments"
)
public
Result
queryComments
(
@RequestParam
(
value
=
"itemId"
)
String
itemId
,
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
1
"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageNum"
,
defaultValue
=
"
0
"
)
Integer
pageNum
,
@RequestParam
(
value
=
"pageSize"
,
defaultValue
=
"10"
)
Integer
pageSize
,
@RequestParam
(
value
=
"userId"
,
required
=
false
)
String
userId
)
{
Page
<
TbCfItemComment
>
list
=
repository
.
findAllByItemId
(
itemId
,
PageRequest
.
of
(
pageNum
,
pageSize
));
...
...
src/main/java/com/example/afrishop_v3/controllers/TbCfHomePageEntityController.java
浏览文件 @
d8df6716
...
...
@@ -45,7 +45,7 @@ public class TbCfHomePageEntityController extends Controller {
}
@GetMapping
(
"/store"
)
public
Result
getStores
(
@RequestParam
(
required
=
false
,
defaultValue
=
"
1
"
)
Integer
pageNum
,
@RequestParam
(
defaultValue
=
"10"
,
required
=
false
)
Integer
pageSize
)
{
public
Result
getStores
(
@RequestParam
(
required
=
false
,
defaultValue
=
"
0
"
)
Integer
pageNum
,
@RequestParam
(
defaultValue
=
"10"
,
required
=
false
)
Integer
pageSize
)
{
return
new
Result
<>(
storeRepository
.
findAll
(
PageRequest
.
of
(
pageNum
,
pageSize
)));
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论