Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
0061ea47
Commit
0061ea47
authored
Sep 29, 2020
by
缪晖
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【ID1010972】多人拼单 添加拼单锁定状态返回
parent
d1d12ff8
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
3 deletions
+27
-3
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/CollageLockStatus.java
+0
-2
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/CollageOrderBaseService.java
+7
-0
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageOrderBaseServiceImpl.java
+10
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CollageOrderResponseVo.java
+8
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java
+2
-0
No files found.
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/CollageLockStatus.java
View file @
0061ea47
package
com
.
freemud
.
sdk
.
api
.
assortment
.
shoppingcart
.
constant
;
package
com
.
freemud
.
sdk
.
api
.
assortment
.
shoppingcart
.
constant
;
import
java.util.Optional
;
public
enum
CollageLockStatus
{
public
enum
CollageLockStatus
{
LOCKED
(
true
,
"已锁定"
),
LOCKED
(
true
,
"已锁定"
),
RELEASE
(
false
,
"未锁定"
);
RELEASE
(
false
,
"未锁定"
);
...
...
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/CollageOrderBaseService.java
View file @
0061ea47
...
@@ -49,4 +49,11 @@ public interface CollageOrderBaseService {
...
@@ -49,4 +49,11 @@ public interface CollageOrderBaseService {
* @return
* @return
*/
*/
BaseResponse
unlockCollageOrder
(
CollageOrderDto
collageOrderDto
);
BaseResponse
unlockCollageOrder
(
CollageOrderDto
collageOrderDto
);
/**
* 获取拼单订单锁状态
* @param collageOrderDto
* @return
*/
BaseResponse
<
Boolean
>
isLockedCollageOrder
(
CollageOrderDto
collageOrderDto
);
}
}
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageOrderBaseServiceImpl.java
View file @
0061ea47
...
@@ -129,6 +129,16 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
...
@@ -129,6 +129,16 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
}
}
/**
/**
* 获取拼单订单锁状态
* @param collageOrderDto
* @return
*/
@Override
public
BaseResponse
<
Boolean
>
isLockedCollageOrder
(
CollageOrderDto
collageOrderDto
)
{
return
CartResponseUtil
.
success
(
this
.
getCollageLock
(
collageOrderDto
.
getPartnerId
(),
collageOrderDto
.
getStoreId
(),
collageOrderDto
.
getCreateCollageUserId
()).
getValue
());
}
/**
* Redis获取拼单订单信息
* Redis获取拼单订单信息
* @param redisKey
* @param redisKey
* @return
* @return
...
...
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CollageOrderResponseVo.java
View file @
0061ea47
...
@@ -17,8 +17,15 @@ import lombok.Data;
...
@@ -17,8 +17,15 @@ import lombok.Data;
@Data
@Data
public
class
CollageOrderResponseVo
{
public
class
CollageOrderResponseVo
{
// 拼单订单信息
/**
* 拼单订单信息
*/
private
CollageOrder
order
;
private
CollageOrder
order
;
/**
* 是否锁定
*/
private
Boolean
locked
;
// 拼单参与人信息
// 拼单参与人信息
}
}
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java
View file @
0061ea47
...
@@ -62,6 +62,8 @@ public class CollageOrderServiceImpl implements CollageOrderService {
...
@@ -62,6 +62,8 @@ public class CollageOrderServiceImpl implements CollageOrderService {
CollageOrderResponseVo
collageOrderResponseVo
=
new
CollageOrderResponseVo
();
CollageOrderResponseVo
collageOrderResponseVo
=
new
CollageOrderResponseVo
();
// 订单基础信息
// 订单基础信息
collageOrderResponseVo
.
setOrder
(
collageOrder
);
collageOrderResponseVo
.
setOrder
(
collageOrder
);
// 订单锁定状态
collageOrderResponseVo
.
setLocked
(
this
.
collageOrderBaseService
.
isLockedCollageOrder
(
collageOrderDto
).
getResult
());
// TODO 订单参与人列表信息
// TODO 订单参与人列表信息
return
ResponseUtil
.
success
(
collageOrderResponseVo
);
return
ResponseUtil
.
success
(
collageOrderResponseVo
);
...
...
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