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
48d81970
Commit
48d81970
authored
Dec 27, 2021
by
童得柱
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix资产加商品coin
parent
e922f0de
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
3 deletions
+10
-3
UserAsset.java
...java/com/fzm/mall/server/front/asset/model/UserAsset.java
+3
-0
UserAssetRecord.java
...om/fzm/mall/server/front/asset/model/UserAssetRecord.java
+3
-0
AssetTranDTO.java
...m/fzm/mall/server/front/asset/model/dto/AssetTranDTO.java
+2
-1
UserAssetServiceImpl.java
...server/front/asset/service/impl/UserAssetServiceImpl.java
+2
-2
No files found.
mall-server-front/src/main/java/com/fzm/mall/server/front/asset/model/UserAsset.java
View file @
48d81970
...
...
@@ -70,4 +70,7 @@ public class UserAsset implements Serializable {
@ApiModelProperty
(
value
=
"溯源hash"
)
@TableField
(
exist
=
false
)
private
String
hash
;
@ApiModelProperty
(
value
=
"商品coin"
)
private
String
goodsCoin
;
}
mall-server-front/src/main/java/com/fzm/mall/server/front/asset/model/UserAssetRecord.java
View file @
48d81970
...
...
@@ -72,6 +72,9 @@ public class UserAssetRecord implements Serializable {
@ApiModelProperty
(
value
=
"备注"
)
private
String
note
;
@ApiModelProperty
(
value
=
"商品coin"
)
private
String
goodsCoin
;
public
void
init
(
String
uid
,
String
coin
,
Integer
type
,
BigDecimal
amount
,
Integer
status
,
String
otherSide
,
String
hash
,
String
note
)
{
setFlowId
(
UUIdUtil
.
getUUID
());
setUid
(
uid
);
...
...
mall-server-front/src/main/java/com/fzm/mall/server/front/asset/model/dto/AssetTranDTO.java
View file @
48d81970
...
...
@@ -35,5 +35,6 @@ public class AssetTranDTO {
public
AssetTranDTO
()
{
}
@ApiModelProperty
(
value
=
"商品coin"
)
private
String
goodsCoin
;
}
mall-server-front/src/main/java/com/fzm/mall/server/front/asset/service/impl/UserAssetServiceImpl.java
View file @
48d81970
...
...
@@ -97,10 +97,10 @@ public class UserAssetServiceImpl extends ServiceImpl<UserAssetMapper, UserAsset
BigDecimal
amount
=
i
.
getAmount
();
i
.
setAmount
(
amount
.
setScale
(
2
,
BigDecimal
.
ROUND_DOWN
));
i
.
setFrozen
(
i
.
getFrozen
().
setScale
(
2
,
BigDecimal
.
ROUND_DOWN
));
if
(
StringUtil
.
isNullOrEmpty
(
i
.
getCoin
()))
{
if
(
StringUtil
.
isNullOrEmpty
(
i
.
get
Goods
Coin
()))
{
continue
;
}
SkuVo
skuVo
=
skuService
.
querySkuByCoin
(
i
.
getCoin
());
SkuVo
skuVo
=
skuService
.
querySkuByCoin
(
i
.
get
Goods
Coin
());
if
(
skuVo
!=
null
)
{
BigDecimal
totalPrice
=
amount
.
multiply
(
skuVo
.
getOriginalPrice
()).
setScale
(
2
,
BigDecimal
.
ROUND_DOWN
);
i
.
setTotalPrice
(
totalPrice
);
...
...
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