Skip to content

O
order-group
Commit dd4bb338 by 刘鹏飞
Options

拼单购物车人员标识改为userId

parent 0061ea47
Showing with 26 additions and 26 deletions
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java
......@@ -34,9 +34,9 @@ public class CartGoods {
private String goodsId;
/**
* 购买人的的sessionid
* 购买人的的姓名
*/
private String sessionId;
private String userName;
/**
* 购买人的的userId
......@@ -340,8 +340,8 @@ public class CartGoods {
originalString.append(goodsId);
originalString.append(couponCode);
if(StringUtils.isNotEmpty(sessionId)){
originalString.append(sessionId);
if(StringUtils.isNotEmpty(userId)){
originalString.append(userId);
}
if (CollectionUtils.isNotEmpty(extra)) {
......@@ -367,8 +367,8 @@ public class CartGoods {
currentString.append(cartGoods.getGoodsId());
currentString.append(cartGoods.getCouponCode());
if(StringUtils.isNotEmpty(cartGoods.getSessionId())){
currentString.append(cartGoods.getSessionId());
if(StringUtils.isNotEmpty(cartGoods.getUserId())){
currentString.append(cartGoods.getUserId());
}
if (CollectionUtils.isNotEmpty(cartGoods.getExtra())) {
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartCollageServiceImpl.java
......@@ -112,7 +112,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
UserLoginInfoDto userLoginInfoDto = convert2UserLoginInfoDto(currentUserInfoVo);
String currentUserId = currentUserInfoVo.getMemberId();
String currentSessionId = addShoppingCartGoodsRequestVo.getSessionId();
//String currentSessionId = addShoppingCartGoodsRequestVo.getSessionId();
String partnerId = addShoppingCartGoodsRequestVo.getPartnerId();
String storeId = addShoppingCartGoodsRequestVo.getShopId();
String appId = addShoppingCartGoodsRequestVo.getAppId();
......@@ -126,11 +126,11 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
String crateUserId = addShoppingCartGoodsRequestVo.getCreateCollageUserId();
// 拼单相关条件校验
check(partnerId, storeId, crateUserId,spuId,currentSessionId);
check(partnerId, storeId, crateUserId,spuId,currentUserId);
CartGoods cartGoods = ShoppingCartConvertAdapter.convent2CartGoods(addShoppingCartGoodsRequestVo);
cartGoods.setSessionId(currentSessionId);
cartGoods.setUserId(currentUserId);
cartGoods.setUserName(currentUserInfoVo.getNickName());
List<Long> productIds = new ArrayList<>();
productIds.add(Long.parseLong(goodsId));
......@@ -145,7 +145,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
try {
//缓存中获取购物车商品信息
allCartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, crateUserId, currentSessionId, null, collageCartBaseService);
allCartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, crateUserId, currentUserId, null, collageCartBaseService);
if (CollectionUtils.isEmpty(allCartGoodsList)) {
allCartGoodsList = new ArrayList<>();
}
......@@ -159,8 +159,8 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
List<CartGoods> cartGoodsRedisList= addNotProductCouponGoods(addShoppingCartGoodsRequestVo, cartGoods, goodsId, crateUserId, shoppingCartGoodsResponseVo, allCartGoodsList);
// 更新拼单购物车人员缓存中的的购物车行id集合
List<String> cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentSessionId.equals(cartGoods1.getSessionId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,currentSessionId);
List<String> cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentUserId.equals(cartGoods1.getUserId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,currentUserId);
// 当商品数量被设为0时
if (Objects.equals(cartGoods.getQty(), 0)) {
......@@ -206,7 +206,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = new ShoppingCartGoodsResponseVo();
CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(updateShoppingCartGoodsQtyRequestVo.getSessionId());
UserLoginInfoDto userLoginInfoDto = convert2UserLoginInfoDto(assortmentCustomerInfoVo);
String currentSessionId = updateShoppingCartGoodsQtyRequestVo.getSessionId();
//String currentSessionId = updateShoppingCartGoodsQtyRequestVo.getSessionId();
String currentUserId = userLoginInfoDto.getMemberId();
String partnerId = updateShoppingCartGoodsQtyRequestVo.getPartnerId();
String storeId = updateShoppingCartGoodsQtyRequestVo.getShopId();
......@@ -221,7 +221,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
String crateUserId = updateShoppingCartGoodsQtyRequestVo.getCreateCollageUserId();
// 拼单相关条件校验
check(partnerId, storeId, crateUserId,null,currentSessionId);
check(partnerId, storeId, crateUserId,null,currentUserId);
// 购物车版本加锁
dolock(partnerId, storeId, crateUserId,updateShoppingCartGoodsQtyRequestVo.getCarVer());
......@@ -250,11 +250,11 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
cartGoodsList = JSONArray.parseArray(JSONObject.toJSONString(checkCartRequest.getCartGoodsList()), CartGoods.class);
// 重新存储最新购物车
List<CartGoods> cartGoodsRedisList = assortmentSdkService.setShoppingCart(partnerId, storeId, crateUserId, cartGoodsList, currentSessionId, "", collageCartBaseService);
List<CartGoods> cartGoodsRedisList = assortmentSdkService.setShoppingCart(partnerId, storeId, crateUserId, cartGoodsList, currentUserId, "", collageCartBaseService);
// 更新拼单购物车人员缓存中的的购物车行id集合
List<String> cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentSessionId.equals(cartGoods1.getSessionId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,currentSessionId);
List<String> cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentUserId.equals(cartGoods1.getUserId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,currentUserId);
} catch (Exception e) {
ErrorLog.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "shoppingCartCollageServiceImpl updateGoodsQty:" + e.getMessage(), e);
......@@ -301,7 +301,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(shoppingCartInfoRequestVo.getSessionId());
UserLoginInfoDto userLoginInfoDto = convert2UserLoginInfoDto(assortmentCustomerInfoVo);
String currentUserId = userLoginInfoDto.getMemberId();
String currentSessionId = shoppingCartInfoRequestVo.getSessionId();
//String currentSessionId = shoppingCartInfoRequestVo.getSessionId();
String partnerId = shoppingCartInfoRequestVo.getPartnerId();
String storeId = shoppingCartInfoRequestVo.getShopId();
String appId = shoppingCartInfoRequestVo.getAppId();
......@@ -346,8 +346,8 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
List<CartGoods> cartGoodsRedisList = assortmentSdkService.setShoppingCart(partnerId, storeId, crateUserId, cartGoodsList, assortmentCustomerInfoVo.getSessionId(), "", this.collageCartBaseService);
// 更新拼单购物车人员缓存中的的购物车行id集合
List<String> cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentSessionId.equals(cartGoods1.getSessionId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,currentSessionId);
List<String> cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentUserId.equals(cartGoods1.getUserId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,currentUserId);
}
} catch (Exception e) {
ErrorLog.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "shoppingCartCollageServiceImpl getGoodsList:" + e.getMessage(), e);
......@@ -585,9 +585,9 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
* @param storeId
* @param crateUserId
* @param spuId
* @param currentSessionId
* @param currentUserId
*/
public void check(String partnerId,String storeId,String crateUserId,String spuId,String currentSessionId){
public void check(String partnerId,String storeId,String crateUserId,String spuId,String currentUserId){
//店铺id不能为空
if (StringUtils.isEmpty(storeId)){
......@@ -621,14 +621,14 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
// 判单拼单的点餐位是否存在
// 发起拼单、加入拼单，都会给用户创建点餐位，用来存储用户的购物车行id
// 并设置其相应的购物车行id为空集合，没有点餐位，则认为该用户是没有加入拼单
List<String> cartGoodsUids = collageCartBaseService.getCollageMemberHashKey(partnerId, storeId,crateUserId ,currentSessionId);
List<String> cartGoodsUids = collageCartBaseService.getCollageMemberHashKey(partnerId, storeId,crateUserId ,currentUserId);
if(cartGoodsUids == null){
throw new ServiceException(ResponseResult.COLLAGE_NOT_ADD);
}
// 校验用户选好了状态
// 只有用户不是选好了状态的时候才能更改购物车
Boolean memberState = collageCartBaseService.getCollageMemStateHashKey(partnerId, storeId, crateUserId,currentSessionId);
Boolean memberState = collageCartBaseService.getCollageMemStateHashKey(partnerId, storeId, crateUserId,currentUserId);
if(memberState != null && memberState){
throw new ServiceException(ResponseResult.COLLAGE_ALREADY_CHOOSE);
}
......@@ -790,7 +790,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(shoppingCartCollageClearRequestVo.getSessionId());
UserLoginInfoDto userLoginInfoDto = convert2UserLoginInfoDto(assortmentCustomerInfoVo);
String currentUserId = userLoginInfoDto.getMemberId();
String currentSessionId = shoppingCartCollageClearRequestVo.getSessionId();
//String currentSessionId = shoppingCartCollageClearRequestVo.getSessionId();
String partnerId = shoppingCartCollageClearRequestVo.getPartnerId();
String storeId = shoppingCartCollageClearRequestVo.getShopId();
String appId = shoppingCartCollageClearRequestVo.getAppId();
......@@ -838,7 +838,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
List<CartGoods> cartGoodsRedisList = assortmentSdkService.setShoppingCart(partnerId, storeId, crateUserId, cartGoodsList, shoppingCartCollageClearRequestVo.getSessionId(), "", collageCartBaseService);
// 更新拼单购物车人员缓存中的的购物车行id集合
List<String> cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentSessionId.equals(cartGoods1.getSessionId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
List<String> cartGoodsUids = cartGoodsRedisList.stream().filter(cartGoods1 -> currentUserId.equals(cartGoods1.getUserId())).map(CartGoods::getCartGoodsUid).collect(Collectors.toList());
collageCartBaseService.updateCollageCartGoodsUids(cartGoodsUids,partnerId, storeId, crateUserId,shoppingCartCollageClearRequestVo.getSessionId());
} catch (Exception e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment