记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
5db1f669
Commit
5db1f669
authored
Apr 27, 2022
by
GaoHu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
exit 助力失败文案提示
parent
a3017d75
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
15 deletions
+28
-15
GoblinGoodsAnticipateController.java
...ce/goblin/controller/GoblinGoodsAnticipateController.java
+8
-5
GoblinGoodsAnticipateServiceImpl.java
...goblin/service/impl/GoblinGoodsAnticipateServiceImpl.java
+10
-9
errors.properties
...-service-goblin-impl/src/main/resources/errors.properties
+10
-1
No files found.
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinGoodsAnticipateController.java
View file @
5db1f669
...
...
@@ -3,12 +3,8 @@ package com.liquidnet.service.goblin.controller;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.goblin.dto.manage.vo.HelpValueVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinGoodsAnticipateHelpVo
;
import
com.liquidnet.service.goblin.service.IGoblinGoodsAnticipateService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.*
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -64,6 +60,13 @@ public class GoblinGoodsAnticipateController {
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"query"
,
dataType
=
"String"
,
name
=
"sid"
,
value
=
"创建分享生成的sid"
),
})
@ApiResponses
({
@ApiResponse
(
code
=
0
,
message
=
"助力成功"
),
@ApiResponse
(
code
=
150001
,
message
=
"本人为本人助力"
),
@ApiResponse
(
code
=
150002
,
message
=
"重复助力"
),
@ApiResponse
(
code
=
150003
,
message
=
"分享不存在"
),
@ApiResponse
(
code
=
150004
,
message
=
"助力已结束"
)
})
public
ResponseDto
<
String
>
help
(
@RequestParam
(
name
=
"sid"
)
String
sid
)
{
return
goblinGoodsAnticipateService
.
help
(
sid
);
}
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinGoodsAnticipateServiceImpl.java
View file @
5db1f669
...
...
@@ -4,6 +4,7 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
import
com.liquidnet.commons.lang.util.CurrentUtil
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.service.adam.dto.vo.AdamUserInfoVo
;
import
com.liquidnet.service.base.ErrorMapping
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.SqlMapping
;
import
com.liquidnet.service.base.constant.MQConst
;
...
...
@@ -57,13 +58,13 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
if
(
anticipateValueVo
!=
null
)
{
anticipateValueVo
.
setState
(
GoblinAnticipateUtils
.
setState
(
anticipateValueVo
.
getAboutStartDate
(),
anticipateValueVo
.
getAboutEndDate
()));
if
(!
anticipateValueVo
.
getState
().
equals
(
1
))
{
return
ResponseDto
.
failure
(
"该商品预约尚未开始或已经结束,不可预约!"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
150007
)
);
}
//查询该用户是否预
String
uid
=
CurrentUtil
.
getCurrentUid
();
return
getBooleanResponseDto
(
skuId
,
uid
,
anticipateValueVo
);
}
return
ResponseDto
.
failure
(
"该预约不存在!"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
150005
)
);
}
private
ResponseDto
<
Boolean
>
getBooleanResponseDto
(
String
skuId
,
String
uid
,
GoblinGoodsAnticipateValueVo
anticipateValueVo
)
{
...
...
@@ -134,11 +135,11 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
//查询是否可以预约
GoblinGoodsAnticipateValueVo
valueBySkuId
=
goblinRedisUtils
.
getValueBySkuId
(
skuId
);
if
(
valueBySkuId
==
null
)
{
return
ResponseDto
.
failure
(
"商品不存在!"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
150005
)
);
}
Integer
integer
=
GoblinAnticipateUtils
.
setState
(
valueBySkuId
.
getAboutStartDate
(),
valueBySkuId
.
getAboutEndDate
());
if
(
integer
!=
null
&&
!
integer
.
equals
(
1
))
{
return
ResponseDto
.
failure
(
"预约未开始或已结束!"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
150006
)
);
}
//获取用户uid
...
...
@@ -200,18 +201,18 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
//查询是否可以预约
GoblinGoodsAnticipateShareVo
shareVo
=
goblinRedisUtils
.
getShareVo
(
sid
);
if
(
shareVo
==
null
)
{
return
ResponseDto
.
failure
(
"203"
,
"分享不存在!"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
150001
)
);
}
Integer
integer
=
GoblinAnticipateUtils
.
setState
(
shareVo
.
getAboutStartDate
(),
shareVo
.
getAboutEndDate
());
if
(
integer
!=
null
&&
!
integer
.
equals
(
1
))
{
return
ResponseDto
.
failure
(
"204"
,
"助力已结束!"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
150002
)
);
}
//获取uid
String
uid
=
CurrentUtil
.
getCurrentUid
();
if
(
shareVo
.
getUid
().
equals
(
uid
)){
return
ResponseDto
.
failure
(
"201"
,
"助力失败,本人不能为本人助力!"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
150003
)
);
}
//查询mongodb 是否助力过该分享
// GoblinGoodsAnticipateHelpVo goodsAnticipateHelpVo = goblinMongoUtils.getHelpVo(sid, uid);
...
...
@@ -260,7 +261,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
return
ResponseDto
.
success
();
}
else
{
log
.
debug
(
"help() false ------> sid:{}"
,
sid
);
return
ResponseDto
.
failure
(
"202"
,
"重复助力!"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
150004
)
);
}
}
...
...
@@ -273,7 +274,7 @@ public class GoblinGoodsAnticipateServiceImpl implements IGoblinGoodsAnticipateS
helpValueVo
.
copy
(
shareVo
);
return
ResponseDto
.
success
(
helpValueVo
);
}
return
ResponseDto
.
failure
(
"该助力不存在!"
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
150001
)
);
}
@Override
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/errors.properties
View file @
5db1f669
...
...
@@ -70,4 +70,13 @@
148001
=
\u
6B63
\u5728\u
4E0B
\u5355\u
5E93
\u
5B58
\u
4E0D
\u
8DB3
20003
=
\u
65E0
\u6743\u
67E5
\u
770B
20018
=
\u
4E0B
\u5355\u5931\u
8D25
\ No newline at end of file
20018
=
\u
4E0B
\u5355\u5931\u
8D25
#\u9884\u7EA6\u76F8\u5173
150001
=
\u5206\u
4EAB
\u
4E0D
\u
5B58
\u5728
150002
=
\u
52A9
\u
529B
\u
5DF2
\u
7ED3
\u
675F
150003
=
\u
672C
\u
4EBA
\u
4E0D
\u
80FD
\u
4E3A
\u
672C
\u
4EBA
\u
52A9
\u
529B
150004
=
\u
5DF2
\u
52A9
\u
529B
\u
8BE5
\u5206\u
4EAB
150005
=
SKU
\u
4E0D
\u
5B58
\u5728
150006
=
\u9884\u
7EA6
\u
672A
\u
5F00
\u
59CB
\u6216\u
5DF2
\u
7ED3
\u
675F
150007
=
\u
8BE5
\u5546\u
54C1
\u9884\u
7EA6
\u
5C1A
\u
672A
\u
5F00
\u
59CB
\u6216\u
5DF2
\u
7ECF
\u
7ED3
\u
675F
\u
FF0C
\u
4E0D
\u
53EF
\u9884\u
7EA6
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment