记得上下班打卡 | 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
3644e5ee
Commit
3644e5ee
authored
May 27, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
+下单页面添加实名、生日信息;
parent
5d1e3043
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
4 deletions
+11
-4
AdamMemberOrderParam.java
.../com/liquidnet/service/adam/dto/AdamMemberOrderParam.java
+1
-1
AdamMemberOrderPreviewVo.java
...quidnet/service/adam/dto/vo/AdamMemberOrderPreviewVo.java
+3
-1
AdamMemberOrderController.java
...et/service/adam/controller/AdamMemberOrderController.java
+6
-1
AdamMemberOrderServiceImpl.java
...service/adam/service/impl/AdamMemberOrderServiceImpl.java
+1
-1
No files found.
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderParam.java
View file @
3644e5ee
...
...
@@ -23,7 +23,7 @@ public class AdamMemberOrderParam implements Serializable {
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"会员价格ID"
,
example
=
"0"
)
private
String
memberPriceId
;
@ApiModelProperty
(
position
=
15
,
required
=
true
,
value
=
"用户生日"
,
example
=
"0"
)
private
LocalDateTime
birthday
;
private
String
birthday
;
@ApiModelProperty
(
position
=
16
,
required
=
true
,
value
=
"支付方式:ALIPAY,WEPAY,WAPALIPAY,WAPWEPAY,JSWEPAY,APPLETWEPAY,APPIAP"
)
private
String
payChannel
;
@ApiModelProperty
(
position
=
17
,
required
=
true
,
value
=
"支付用的AuthCode"
)
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberOrderPreviewVo.java
View file @
3644e5ee
...
...
@@ -17,7 +17,9 @@ public class AdamMemberOrderPreviewVo implements Serializable {
@ApiModelProperty
(
position
=
12
,
value
=
"价格详情"
)
private
AdamMemberPriceVo
priceVo
;
@ApiModelProperty
(
position
=
13
,
value
=
"是否实名[true-是]"
)
private
Boolean
realNamed
;
private
AdamRealInfoVo
realInfoVo
;
@ApiModelProperty
(
position
=
14
,
value
=
"生日"
)
private
String
birthday
;
private
static
final
AdamMemberOrderPreviewVo
obj
=
new
AdamMemberOrderPreviewVo
();
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java
View file @
3644e5ee
...
...
@@ -11,6 +11,7 @@ import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
import
com.liquidnet.service.adam.dto.vo.AdamMemberOrderPreviewVo
;
import
com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo
;
import
com.liquidnet.service.adam.dto.vo.AdamRealInfoVo
;
import
com.liquidnet.service.adam.dto.vo.AdamUserInfoVo
;
import
com.liquidnet.service.adam.entity.AdamMemberOrder
;
import
com.liquidnet.service.adam.service.IAdamMemberOrderService
;
import
com.liquidnet.service.adam.service.IAdamRealNameService
;
...
...
@@ -50,8 +51,12 @@ public class AdamMemberOrderController {
AdamMemberOrderPreviewVo
previewVo
=
AdamMemberOrderPreviewVo
.
getNew
();
previewVo
.
setMemberId
(
mno
);
previewVo
.
setMemberTitle
(
"摩登天空会员"
);
previewVo
.
setRealNamed
(
null
!=
adamRealNameService
.
queryByUid
(
CurrentUtil
.
getCurrentUid
()));
AdamRealInfoVo
realInfoVo
=
adamRealNameService
.
queryByUid
(
CurrentUtil
.
getCurrentUid
());
previewVo
.
setRealInfoVo
(
realInfoVo
);
previewVo
.
setPriceVo
(
adamMemberPriceService
.
query
(
mno
,
id
));
AdamUserInfoVo
userInfoVo
=
adamUserService
.
queryByUid
(
CurrentUtil
.
getCurrentUid
());
previewVo
.
setBirthday
(
null
==
userInfoVo
?
null
:
userInfoVo
.
getBirthday
());
return
ResponseDto
.
success
(
previewVo
);
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @
3644e5ee
...
...
@@ -136,7 +136,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
String
orderNo
=
IDGenerator
.
nextSnowId
().
toString
().
concat
(
"V"
);
orderVo
.
setOrderNo
(
orderNo
);
orderVo
.
setMemberId
(
memberId
);
orderVo
.
setBirthday
(
DateUtil
.
format
(
param
.
getBirthday
(),
DateUtil
.
Formatter
.
yyyyMMddHHmmss
));
orderVo
.
setBirthday
(
param
.
getBirthday
(
));
orderVo
.
setDays
(
memberPrice
.
getDays
());
orderVo
.
setMemberPriceId
(
memberPriceId
);
orderVo
.
setCreatedAt
(
createdAt
);
...
...
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