记得上下班打卡 | 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
2de2e50b
Commit
2de2e50b
authored
Mar 02, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单关闭接口修改
parent
d6aad6c6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
7 deletions
+11
-7
GoblinStoreOrderVo.java
...m/liquidnet/service/goblin/dto/vo/GoblinStoreOrderVo.java
+2
-0
GoblinOrderAppServiceImpl.java
...ervice/goblin/service/impl/GoblinOrderAppServiceImpl.java
+1
-1
GoblinOrderServiceImpl.java
...t/service/goblin/service/impl/GoblinOrderServiceImpl.java
+4
-3
GoblinZhengzaiServiceImpl.java
...goblin/service/impl/manage/GoblinZhengzaiServiceImpl.java
+1
-1
GoblinRedisUtils.java
...a/com/liquidnet/service/goblin/util/GoblinRedisUtils.java
+3
-2
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderVo.java
View file @
2de2e50b
...
@@ -110,6 +110,8 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
...
@@ -110,6 +110,8 @@ public class GoblinStoreOrderVo implements Serializable, Cloneable {
private
String
marketId
;
private
String
marketId
;
@ApiModelProperty
(
value
=
" 创建时间"
)
@ApiModelProperty
(
value
=
" 创建时间"
)
private
String
createdAt
;
private
String
createdAt
;
@ApiModelProperty
(
value
=
" 创建时间"
)
private
int
randomKey
;
@ApiModelProperty
(
value
=
"orderAttr"
)
@ApiModelProperty
(
value
=
"orderAttr"
)
private
GoblinOrderAttrVo
orderAttrVo
;
private
GoblinOrderAttrVo
orderAttrVo
;
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderAppServiceImpl.java
View file @
2de2e50b
...
@@ -570,7 +570,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
...
@@ -570,7 +570,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
redisUtils
.
setGoblinOrder
(
orderId
,
orderVo
);
redisUtils
.
setGoblinOrder
(
orderId
,
orderVo
);
redisUtils
.
setOffCode
(
orderVo
.
getWriteOffCode
(),
orderVo
.
getMasterOrderCode
());
redisUtils
.
setOffCode
(
orderVo
.
getWriteOffCode
(),
orderVo
.
getMasterOrderCode
());
//删除未支付订单
//删除未支付订单
redisUtils
.
removeGoblinOrder
(
null
,
orderId
);
redisUtils
.
removeGoblinOrder
(
orderVo
.
getRandomKey
()+
""
,
orderId
);
//mongo
//mongo
mongoUtils
.
updateGoblinStoreOrderVo
(
orderId
,
orderVo
);
mongoUtils
.
updateGoblinStoreOrderVo
(
orderId
,
orderVo
);
//mysql
//mysql
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java
View file @
2de2e50b
...
@@ -514,15 +514,16 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
...
@@ -514,15 +514,16 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
//订单attr vo
//订单attr vo
GoblinOrderAttrVo
orderAttrVo
=
GoblinOrderAttrVo
.
getNew
();
GoblinOrderAttrVo
orderAttrVo
=
GoblinOrderAttrVo
.
getNew
();
BeanUtils
.
copyProperties
(
orderAttr
,
orderAttrVo
);
BeanUtils
.
copyProperties
(
orderAttr
,
orderAttrVo
);
//redis 添加未支付列表
int
randomKey
=
redisUtils
.
addUnPayOrder
(
orderVo
.
getOrderId
());
//redis 赋值
//redis 赋值
orderVo
.
setRandomKey
(
randomKey
);
orderVo
.
setOrderAttrVo
(
orderAttrVo
);
orderVo
.
setOrderAttrVo
(
orderAttrVo
);
orderVo
.
setOrderSkuVoIds
(
goblinOrderSkuIdList
);
orderVo
.
setOrderSkuVoIds
(
goblinOrderSkuIdList
);
orderVo
.
setCreatedAt
(
getNowTime
());
orderVo
.
setCreatedAt
(
getNowTime
());
redisUtils
.
setGoblinOrder
(
orderVo
.
getOrderId
(),
orderVo
);
redisUtils
.
setGoblinOrder
(
orderVo
.
getOrderId
(),
orderVo
);
redisUtils
.
setMasterCode
(
preParam
.
getOrderMasterCode
(),
preParam
.
getOrderIdList
().
substring
(
1
));
redisUtils
.
setMasterCode
(
preParam
.
getOrderMasterCode
(),
preParam
.
getOrderIdList
().
substring
(
1
));
mongoUtils
.
insertGoblinStoreOrderVo
(
orderVo
);
mongoUtils
.
insertGoblinStoreOrderVo
(
orderVo
);
//redis 添加未支付列表
redisUtils
.
addUnPayOrder
(
orderVo
.
getOrderId
());
//redis 订单列表
//redis 订单列表
if
(
noZhengzaiOrder
(
uid
))
{
if
(
noZhengzaiOrder
(
uid
))
{
if
(
orderVo
.
getMarketType
()
==
null
)
{
if
(
orderVo
.
getMarketType
()
==
null
)
{
...
@@ -746,7 +747,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
...
@@ -746,7 +747,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
redisUtils
.
setGoblinOrder
(
orderId
,
orderVo
);
redisUtils
.
setGoblinOrder
(
orderId
,
orderVo
);
redisUtils
.
setOffCode
(
orderVo
.
getWriteOffCode
(),
orderVo
.
getMasterOrderCode
());
redisUtils
.
setOffCode
(
orderVo
.
getWriteOffCode
(),
orderVo
.
getMasterOrderCode
());
//删除未支付订单
//删除未支付订单
redisUtils
.
removeGoblinOrder
(
null
,
orderId
);
redisUtils
.
removeGoblinOrder
(
orderVo
.
getRandomKey
()+
""
,
orderId
);
//mongo
//mongo
mongoUtils
.
updateGoblinStoreOrderVo
(
orderId
,
orderVo
);
mongoUtils
.
updateGoblinStoreOrderVo
(
orderId
,
orderVo
);
//mysql
//mysql
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinZhengzaiServiceImpl.java
View file @
2de2e50b
...
@@ -328,7 +328,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
...
@@ -328,7 +328,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
redisUtils
.
incrSkuStock
(
null
,
skuId
,
restStock
+
restStockDe
);
redisUtils
.
incrSkuStock
(
null
,
skuId
,
restStock
+
restStockDe
);
mongoUtils
.
delGoodsSkuInfoVo
(
marketSkuId
);
mongoUtils
.
delGoodsSkuInfoVo
(
marketSkuId
);
redisUtils
.
delGoodsSkuInfoVo
(
marketSkuId
);
redisUtils
.
delGoodsSkuInfoVo
(
marketSkuId
);
redisUtils
.
removeGoblinOrder
(
skuId
,
marketSkuId
);
redisUtils
.
removeGoblinOrder
(
null
,
marketSkuId
);
}
}
//mongo
//mongo
mongoUtils
.
delGoodsInfoVo
(
marketSpuId
);
mongoUtils
.
delGoodsInfoVo
(
marketSpuId
);
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java
View file @
2de2e50b
...
@@ -804,13 +804,14 @@ public class GoblinRedisUtils {
...
@@ -804,13 +804,14 @@ public class GoblinRedisUtils {
}
}
}
}
// 添加 未支付订单id列表
// 添加 未支付订单id列表
返回 radomKey
public
void
addUnPayOrder
(
String
orderId
)
{
public
int
addUnPayOrder
(
String
orderId
)
{
int
randomKey
=
RandomUtil
.
getRandomInt
(
0
,
randomMax
);
int
randomKey
=
RandomUtil
.
getRandomInt
(
0
,
randomMax
);
String
redisKey
=
GoblinRedisConst
.
REDIS_GOBLIN_ORDER_UN_PAY
.
concat
(
randomKey
+
""
);
String
redisKey
=
GoblinRedisConst
.
REDIS_GOBLIN_ORDER_UN_PAY
.
concat
(
randomKey
+
""
);
List
<
String
>
list
=
getUnPayOrder
(
randomKey
+
""
);
List
<
String
>
list
=
getUnPayOrder
(
randomKey
+
""
);
list
.
add
(
orderId
);
list
.
add
(
orderId
);
redisUtil
.
set
(
redisKey
,
list
);
redisUtil
.
set
(
redisKey
,
list
);
return
randomKey
;
}
}
// 删除 未支付订单id列表
// 删除 未支付订单id列表
...
...
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