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
bad9bb7f
Commit
bad9bb7f
authored
Jan 26, 2022
by
秦兴亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nft拷贝加锁
parent
d2cbb35d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
9 deletions
+15
-9
orderCloseCousumer.java
...fzm/mall/server/front/mq/consumer/orderCloseCousumer.java
+1
-0
OrderServiceImpl.java
...all/server/front/order/service/impl/OrderServiceImpl.java
+12
-6
ChainUtil.java
...c/main/java/com/fzm/mall/server/front/util/ChainUtil.java
+0
-0
mall_create.sql
mall-sql/mall_create.sql
+2
-3
No files found.
mall-server-front/src/main/java/com/fzm/mall/server/front/mq/consumer/orderCloseCousumer.java
View file @
bad9bb7f
...
...
@@ -49,4 +49,5 @@ public class orderCloseCousumer {
pay
.
setState
(
2
);
payService
.
updateById
(
pay
);
}
}
mall-server-front/src/main/java/com/fzm/mall/server/front/order/service/impl/OrderServiceImpl.java
View file @
bad9bb7f
...
...
@@ -38,6 +38,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.fzm.mall.server.front.redis.OrderRedis
;
import
com.fzm.mall.server.front.repository.RedisRepository
;
import
com.fzm.mall.server.front.user.model.User
;
import
com.fzm.mall.server.front.user.service.IRedisService
;
import
com.fzm.mall.server.front.user.service.IUserService
;
import
com.fzm.mall.server.front.util.ChainUtil
;
import
com.fzm.mall.server.front.util.OrderUtil
;
...
...
@@ -96,6 +97,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
private
final
IUserService
userService
;
private
final
INftService
nftService
;
private
final
ISpuService
ispuService
;
private
final
IRedisService
redisService
;
@Autowired
private
ChainUtil
chainUtil
;
...
...
@@ -331,6 +333,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
if
(
commodity
==
3
){
int
saleType
=
spuService
.
getNftSalesType
(
orderSkuVo
.
getSkuId
());
if
(
saleType
==
2
){
while
(!
redisService
.
setNx
(
"select"
+
skuVo
.
getCommodityPassId
())){
}
String
serialNo
=
skuService
.
getSerialNo
(
skuVo
.
getCommodityPassId
());
List
<
Long
>
array
=
JSON
.
parseArray
(
serialNo
,
Long
.
class
);
if
(
array
.
size
()<
orderSkuVo
.
getNum
()){
...
...
@@ -348,6 +353,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
}
boolean
remove
=
array
.
removeAll
(
list
);
skuService
.
updateSerialNo
(
JSON
.
toJSONString
(
array
),
skuVo
.
getCommodityPassId
());
redisService
.
del
(
"select"
+
skuVo
.
getCommodityPassId
());
orderDetail
.
setSerialNo
(
JSON
.
toJSONString
(
list
));
}
}
...
...
@@ -827,7 +833,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
if
(
coin
==
null
)
{
coin
=
new
UserAsset
();
coin
.
setCoin
(
o
.
toString
());
coin
.
setAmount
(
new
BigDecimal
(
orderDetail
.
getNumber
()
));
coin
.
setAmount
(
new
BigDecimal
(
1
));
coin
.
setUid
(
order
.
getUid
());
coin
.
setType
(
1
);
coin
.
setGoodsCoin
(
orderDetail
.
getCoin
());
...
...
@@ -846,8 +852,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
userAssetRecord
.
setNote
(
order
.
getOid
());
userAssetRecordService
.
save
(
userAssetRecord
);
//加销量
countService
.
addSale
(
orderDetail
.
getGoodsId
(),
orderDetail
.
getNumber
()
);
goodSkuService
.
addSales
(
orderDetail
.
getSkuId
(),
orderDetail
.
getNumber
()
);
countService
.
addSale
(
orderDetail
.
getGoodsId
(),
1
);
goodSkuService
.
addSales
(
orderDetail
.
getSkuId
(),
1
);
//转币
TranDto
tranDto
=
new
TranDto
();
tranDto
.
setId
(
userAssetRecord
.
getId
());
...
...
@@ -1086,7 +1092,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
if
(
coin
==
null
)
{
coin
=
new
UserAsset
();
coin
.
setCoin
(
o
.
toString
());
coin
.
setAmount
(
new
BigDecimal
(
orderDetail
.
getNumber
()
));
coin
.
setAmount
(
new
BigDecimal
(
1
));
coin
.
setUid
(
order
.
getUid
());
coin
.
setType
(
1
);
coin
.
setGoodsCoin
(
orderDetail
.
getCoin
());
...
...
@@ -1105,8 +1111,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
userAssetRecord
.
setNote
(
order
.
getOid
());
userAssetRecordService
.
save
(
userAssetRecord
);
//加销量
countService
.
addSale
(
orderDetail
.
getGoodsId
(),
orderDetail
.
getNumber
()
);
goodSkuService
.
addSales
(
orderDetail
.
getSkuId
(),
orderDetail
.
getNumber
()
);
countService
.
addSale
(
orderDetail
.
getGoodsId
(),
1
);
goodSkuService
.
addSales
(
orderDetail
.
getSkuId
(),
1
);
//转币
TranDto
tranDto
=
new
TranDto
();
tranDto
.
setId
(
userAssetRecord
.
getId
());
...
...
mall-server-front/src/main/java/com/fzm/mall/server/front/util/ChainUtil.java
View file @
bad9bb7f
This source diff could not be displayed because it is too large. You can
view the blob
instead.
mall-sql/mall_create.sql
View file @
bad9bb7f
...
...
@@ -2514,7 +2514,8 @@ CREATE TABLE `goods_sku_usufruct` (
PRIMARY
KEY
(
`id`
)
USING
BTREE
)
ENGINE
=
InnoDB
AUTO_INCREMENT
=
1
DEFAULT
CHARSET
=
utf8mb4
COLLATE
=
utf8mb4_unicode_ci
ROW_FORMAT
=
DYNAMIC
COMMENT
=
'使用权'
;
ADD
COLUMN
`param`
varchar
(
500
)
NOT
NULL
DEFAULT
''
COMMENT
'功能区跳转参数'
;
ALTER
TABLE
`order_detail`
ADD
COLUMN
`serial_no`
JSON
NULL
DEFAULT
NULL
COMMENT
'序列号'
;
...
...
@@ -2522,5 +2523,4 @@ ALTER TABLE `order_detail`
ADD
COLUMN
`goods_coin`
VARCHAR
(
32
)
NOT
NULL
DEFAULT
'0'
COMMENT
'商品coin'
;
update
user_asset
set
goods_coin
=
coin
;
ALTER
TABLE
`user_asset_record`
ADD
COLUMN
`goods_coin`
varchar
(
32
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_unicode_ci
NOT
NULL
DEFAULT
''
COMMENT
'商品coin'
;
\ 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