Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mall-server
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
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
yimu
mall-server
Commits
f6cd48bb
Commit
f6cd48bb
authored
Dec 29, 2021
by
童得柱
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
f48bc076
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
UserAssetController.java
...ll/server/front/asset/controller/UserAssetController.java
+0
-2
UserAssetServiceImpl.java
...server/front/asset/service/impl/UserAssetServiceImpl.java
+3
-1
No files found.
mall-server-front/src/main/java/com/fzm/mall/server/front/asset/controller/UserAssetController.java
View file @
f6cd48bb
...
@@ -86,9 +86,7 @@ public class UserAssetController {
...
@@ -86,9 +86,7 @@ public class UserAssetController {
public
ResponseVO
<
UserAssetVo
>
getOwnAsset
(
@ApiParam
(
name
=
"coin"
,
value
=
"币名称"
)
@RequestBody
JSONObject
obj
,
@ApiIgnore
@RequestAttribute
Header
header
)
{
public
ResponseVO
<
UserAssetVo
>
getOwnAsset
(
@ApiParam
(
name
=
"coin"
,
value
=
"币名称"
)
@RequestBody
JSONObject
obj
,
@ApiIgnore
@RequestAttribute
Header
header
)
{
String
uid
=
header
.
getUid
();
String
uid
=
header
.
getUid
();
String
coin
=
obj
.
getString
(
"coin"
);
String
coin
=
obj
.
getString
(
"coin"
);
SkuVo
skuVo
=
skuService
.
querySkuByCoin
(
coin
);
UserAssetVo
userAssetVo
=
userAssetService
.
getOwnAsset
(
uid
,
coin
);
UserAssetVo
userAssetVo
=
userAssetService
.
getOwnAsset
(
uid
,
coin
);
userAssetVo
.
setSkuVo
(
skuVo
);
User
user
=
userService
.
getByUid
(
uid
);
User
user
=
userService
.
getByUid
(
uid
);
userAssetVo
.
setAddress
(
user
.
getAddress
());
userAssetVo
.
setAddress
(
user
.
getAddress
());
return
new
ResponseVO
<>(
MallResponseEnum
.
SUCCESS
,
userAssetVo
);
return
new
ResponseVO
<>(
MallResponseEnum
.
SUCCESS
,
userAssetVo
);
...
...
mall-server-front/src/main/java/com/fzm/mall/server/front/asset/service/impl/UserAssetServiceImpl.java
View file @
f6cd48bb
...
@@ -131,7 +131,8 @@ public class UserAssetServiceImpl extends ServiceImpl<UserAssetMapper, UserAsset
...
@@ -131,7 +131,8 @@ public class UserAssetServiceImpl extends ServiceImpl<UserAssetMapper, UserAsset
asset
.
setAmount
(
asset
.
getAmount
().
setScale
(
2
,
BigDecimal
.
ROUND_DOWN
));
asset
.
setAmount
(
asset
.
getAmount
().
setScale
(
2
,
BigDecimal
.
ROUND_DOWN
));
asset
.
setFrozen
(
asset
.
getFrozen
().
setScale
(
2
,
BigDecimal
.
ROUND_DOWN
));
asset
.
setFrozen
(
asset
.
getFrozen
().
setScale
(
2
,
BigDecimal
.
ROUND_DOWN
));
BeanUtils
.
copyProperties
(
asset
,
userAssetVo
);
BeanUtils
.
copyProperties
(
asset
,
userAssetVo
);
SkuVo
skuVo
=
skuService
.
querySkuByCoin
(
asset
.
getGoodsCoin
());
String
goodsCoin
=
asset
.
getGoodsCoin
();
SkuVo
skuVo
=
skuService
.
querySkuByCoin
(
goodsCoin
);
if
(
skuVo
!=
null
)
{
if
(
skuVo
!=
null
)
{
String
goodsId
=
skuVo
.
getGoodsId
();
String
goodsId
=
skuVo
.
getGoodsId
();
GoodSpu
goodSpu
=
goodSpuService
.
goodSpu
(
goodsId
);
GoodSpu
goodSpu
=
goodSpuService
.
goodSpu
(
goodsId
);
...
@@ -143,6 +144,7 @@ public class UserAssetServiceImpl extends ServiceImpl<UserAssetMapper, UserAsset
...
@@ -143,6 +144,7 @@ public class UserAssetServiceImpl extends ServiceImpl<UserAssetMapper, UserAsset
if
(
sysConfig
!=
null
)
{
if
(
sysConfig
!=
null
)
{
userAssetVo
.
setLogo
(
sysConfig
.
getDictValue
());
userAssetVo
.
setLogo
(
sysConfig
.
getDictValue
());
}
}
userAssetVo
.
setSkuVo
(
skuVo
);
}
}
return
userAssetVo
;
return
userAssetVo
;
}
}
...
...
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