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
72a57bf1
Commit
72a57bf1
authored
Sep 29, 2020
by
缪晖
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【ID1010972】多人拼单 处理冲突
parent
39f92567
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
163 additions
and
14 deletions
+163
-14
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageCartBaseServiceImpl.java
+118
-9
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java
+45
-5
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartCollageServiceImpl.java
+0
-0
No files found.
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageCartBaseServiceImpl.java
View file @
72a57bf1
...
...
@@ -5,11 +5,12 @@ import cn.freemud.base.entity.BaseResponse;
import
cn.freemud.redis.RedisCache
;
import
com.freemud.application.sdk.api.couponcenter.online.service.FMActiveSdkService
;
import
com.freemud.application.sdk.api.log.ErrorLog
;
import
com.freemud.sdk.api.assortment.shoppingcart.adapter.CollageOrderSdkAdapter
;
import
com.freemud.sdk.api.assortment.shoppingcart.constant.CartResponseConstant
;
import
com.freemud.sdk.api.assortment.shoppingcart.constant.RedisKeyConstant
;
import
com.freemud.sdk.api.assortment.shoppingcart.
domain.CartAddItem
;
import
com.freemud.sdk.api.assortment.shoppingcart.
domain.CartGood
s
;
import
com.freemud.sdk.api.assortment.shoppingcart.domain.
CartParamDto
;
import
com.freemud.sdk.api.assortment.shoppingcart.
constant.ShoppingCartConstant
;
import
com.freemud.sdk.api.assortment.shoppingcart.
constant.VersionUtil
s
;
import
com.freemud.sdk.api.assortment.shoppingcart.domain.
*
;
import
com.freemud.sdk.api.assortment.shoppingcart.exception.ServiceException
;
import
com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService
;
import
com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil
;
...
...
@@ -18,12 +19,14 @@ import org.springframework.beans.factory.annotation.Value;
import
org.springframework.data.redis.core.BoundHashOperations
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.StringUtils
;
import
java.text.MessageFormat
;
import
java.util.Comparator
;
import
java.util.List
;
import
java.util.Map
;
import
java.time.LocalDateTime
;
import
java.time.ZoneOffset
;
import
java.util.*
;
import
java.util.concurrent.TimeUnit
;
import
java.util.function.Function
;
import
java.util.stream.Collectors
;
...
...
@@ -109,7 +112,15 @@ public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
@Override
public
BaseResponse
clear
(
CartParamDto
cartParamDto
,
String
trackingNo
)
{
return
null
;
try
{
// 构建缓存key
String
collageCartHashKey
=
genCollageCarHashKey
(
cartParamDto
.
getPartnerId
(),
cartParamDto
.
getStoreId
(),
cartParamDto
.
getUserId
());
redisCache
.
delete
(
collageCartHashKey
);
return
new
BaseResponse
(
VersionUtils
.
VER_1
,
CartResponseConstant
.
SUCCESS
.
getCode
(),
CartResponseConstant
.
SUCCESS
.
getMessage
());
}
catch
(
Exception
e
)
{
ErrorLog
.
printErrorLog
(
"assortment-shoppingcart-sdk"
,
trackingNo
,
e
.
getMessage
(),
"setCartGoodsList"
,
cartParamDto
,
e
,
Level
.
ERROR
);
return
null
;
}
}
@Override
...
...
@@ -124,12 +135,37 @@ public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
@Override
public
BaseResponse
<
CartGoods
>
getCartGoods
(
CartParamDto
cartParamDto
,
String
trackingNo
)
{
return
null
;
try
{
String
redisKey
=
genCollageCarHashKey
(
cartParamDto
.
getPartnerId
(),
cartParamDto
.
getStoreId
(),
cartParamDto
.
getUserId
());
BoundHashOperations
<
String
,
String
,
CartGoods
>
operations
=
redisTemplate
.
boundHashOps
(
redisKey
);
CartGoods
cartGoods
=
operations
.
get
(
cartParamDto
.
getCartGoodsUid
());
return
CartResponseUtil
.
success
(
cartGoods
);
}
catch
(
Exception
e
)
{
ErrorLog
.
printErrorLog
(
"collageCartBaseServiceImpl"
,
trackingNo
,
e
.
getMessage
(),
"getCartGoods"
,
cartParamDto
,
e
,
Level
.
ERROR
);
return
null
;
}
}
@Override
public
BaseResponse
<
List
<
CartGoods
>>
updateGoodsQty
(
CartParamDto
cartParamDto
,
String
trackingNo
)
{
return
null
;
try
{
String
redisKey
=
genCollageCarHashKey
(
cartParamDto
.
getPartnerId
(),
cartParamDto
.
getStoreId
(),
cartParamDto
.
getUserId
());
BoundHashOperations
<
String
,
String
,
CartGoods
>
operations
=
redisTemplate
.
boundHashOps
(
redisKey
);
CartGoods
cartGoods
=
operations
.
get
(
cartParamDto
.
getCartGoodsUid
());
if
(
cartGoods
!=
null
)
{
// 当数量为0时,移除
if
(
Objects
.
equals
(
cartParamDto
.
getQty
(),
0
))
{
operations
.
delete
(
cartParamDto
.
getCartGoodsUid
());
}
else
{
cartGoods
.
setQty
(
cartParamDto
.
getQty
());
operations
.
put
(
cartParamDto
.
getCartGoodsUid
(),
cartGoods
);
}
}
return
this
.
getCartGoodsList
(
cartParamDto
,
trackingNo
);
}
catch
(
Exception
e
)
{
ErrorLog
.
printErrorLog
(
"assortment-shoppingcart-sdk"
,
trackingNo
,
e
.
getMessage
(),
"updateGoodsQty"
,
cartParamDto
,
e
,
Level
.
ERROR
);
return
null
;
}
}
/**
...
...
@@ -249,6 +285,32 @@ public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
}
/**
* 获取拼单人员缓存购物车行
* @param partnerId
* @param storeId
* @param crateUserId
* @param sessionId
* @return
*/
public
List
<
String
>
getCollageCartGoodsUids
(
String
partnerId
,
String
storeId
,
String
crateUserId
,
String
sessionId
){
try
{
String
collageMemberKey
=
genCollageMemberHashKey
(
partnerId
,
storeId
,
crateUserId
);
BoundHashOperations
<
String
,
String
,
List
<
String
>>
operations
=
redisTemplate
.
boundHashOps
(
collageMemberKey
);
List
<
String
>
goodsUids
=
operations
.
get
(
sessionId
);
return
goodsUids
;
}
catch
(
Exception
e
)
{
Map
<
String
,
String
>
request
=
new
HashMap
<>();
request
.
put
(
"partnerId"
,
partnerId
);
request
.
put
(
"storeId"
,
storeId
);
request
.
put
(
"crateUserId"
,
crateUserId
);
request
.
put
(
"sessionId"
,
crateUserId
);
ErrorLog
.
printErrorLog
(
"获取拼单人员缓存购物车行异常"
,
"CollageCartBaseServiceImpl/getCollageCartGoodsUids"
,
request
,
e
);
return
null
;
}
}
/**
* 构建拼单购物车版本号缓存key
* @param partnerId
* @param storeId
...
...
@@ -270,4 +332,51 @@ public class CollageCartBaseServiceImpl implements ShoppingCartBaseService {
public
Integer
incrementCartVersion
(
String
partnerId
,
String
storeId
,
String
userId
)
{
return
redisCache
.
opsForValue
().
increment
(
genCollageCarVerKey
(
partnerId
,
storeId
,
userId
),
1
).
intValue
();
}
public
List
<
CartGoods
>
removeGoodsUids
(
String
partnerId
,
String
storeId
,
String
userId
,
List
<
String
>
goodsUids
)
{
String
redisKey
=
genCollageCarHashKey
(
partnerId
,
storeId
,
userId
);
BoundHashOperations
<
String
,
String
,
CartGoods
>
operations
=
redisTemplate
.
boundHashOps
(
redisKey
);
if
(
null
!=
goodsUids
&&
!
goodsUids
.
isEmpty
()){
operations
.
delete
(
goodsUids
.
toArray
());
}
List
<
CartGoods
>
cartGoodsList
=
operations
.
values
();
//对创建时间进行排序
cartGoodsList
.
sort
(
Comparator
.
comparingLong
(
CartGoods:
:
getCreateTimeMili
));
return
cartGoodsList
;
}
}
shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java
View file @
72a57bf1
...
...
@@ -13,19 +13,23 @@
package
cn
.
freemud
.
controller
;
import
cn.freemud.base.entity.BaseResponse
;
import
cn.freemud.entities.vo.AddShoppingCartGoodsRequestVo
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.enums.ResponseResult
;
import
cn.freemud.service.impl.ShoppingCartCollageServiceImpl
;
import
cn.freemud.utils.ResponseUtil
;
import
com.freemud.api.assortment.datamanager.enums.IappIdType
;
import
com.freemud.application.sdk.api.base.SDKCommonBaseContextWare
;
import
com.freemud.application.sdk.api.log.ApiAnnotation
;
import
com.freemud.application.sdk.api.log.LogParams
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.MediaType
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
@RestController
@RequestMapping
(
value
=
"/shoppingCart/collage"
,
consumes
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
...
...
@@ -40,4 +44,40 @@ public class ShoppingCartCollageController {
public
BaseResponse
addGoods
(
@Validated
@LogParams
@RequestBody
AddShoppingCartGoodsRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
addGoods
(
request
);
}
/**
* 修改拼单购物车中商品数量
*/
@ApiAnnotation
(
logMessage
=
"updateGoodsQty"
)
@PostMapping
(
value
=
"/updateGoodsQty"
)
public
BaseResponse
updateGoodsQty
(
@Validated
@LogParams
@RequestBody
UpdateShoppingCartGoodsQtyRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
updateGoodsQty
(
request
);
}
/**
* 查询购物车信息
*/
@ApiAnnotation
(
logMessage
=
"listCartGoods"
)
@PostMapping
(
value
=
"/listCartGoods"
)
public
BaseResponse
listCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartInfoRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
getGoodsList
(
request
);
}
/**
* 清空自己的购物车
*/
@ApiAnnotation
(
logMessage
=
"clearPartCartGoods"
)
@PostMapping
(
value
=
"/clearPartCartGoods"
)
public
BaseResponse
clearPartCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartCollageClearRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
clearPartCarGoods
(
request
);
}
/**
* 清空购物车
*/
@ApiAnnotation
(
logMessage
=
"clearCartGoods"
)
@PostMapping
(
value
=
"/clearCartGoods"
)
public
BaseResponse
clearCartGoods
(
@Validated
@LogParams
@RequestBody
ShoppingCartClearRequestVo
request
)
{
return
SDKCommonBaseContextWare
.
getBean
(
ShoppingCartCollageServiceImpl
.
class
).
clear
(
request
);
}
}
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartCollageServiceImpl.java
View file @
72a57bf1
This diff is collapsed.
Click to expand it.
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