加入拼单，会员结构修改

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/CollageOrderBaseService.java

@@ -74,11 +74,11 @@ public interface CollageOrderBaseService {
 
 
     /**
-     * 设置用户在该店铺下的拼单状态
+     * 设置用户在该店铺下的拼单时间
      * @param collageOrderDto
      * @return
      */
-    BaseResponse setCollageMemberAddStates(CollageOrderDto collageOrderDto,Boolean states);
+    BaseResponse setCollageMemberAddTime(CollageOrderDto collageOrderDto);
 
     /**
      * 判断用户是否参加了某一个拼单
@@ -108,4 +108,9 @@ public interface CollageOrderBaseService {
      * 清除用户选好了的状态
      */
     BaseResponse cleanMemberStates(CollageOrderDto collageOrderDto);
+
+    /**
+     * 清除用户在店铺下的拼单时间
+     */
+    BaseResponse cleanCollageMemberAddTime(CollageOrderDto collageOrderDto);
 }

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageOrderBaseServiceImpl.java

@@ -196,15 +196,20 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
 
     @Override
     public BaseResponse setCollageMember(CollageOrderDto collageOrderDto){
-        String key = genCollageMemerHashKey(collageOrderDto.getPartnerId(),collageOrderDto.getStoreId());
+        String key = genCollageMemberHashKey(collageOrderDto.getPartnerId(),collageOrderDto.getStoreId(),collageOrderDto.getCreateCollageUserId());
         redisTemplate.boundHashOps(key).put(collageOrderDto.getCurrentUserId(),new ArrayList<>());
         return CartResponseUtil.success();
     }
 
     @Override
-    public BaseResponse setCollageMemberAddStates(CollageOrderDto collageOrderDto,Boolean states){
-        String key = genCollageMemberHashKey(collageOrderDto.getPartnerId(),collageOrderDto.getStoreId(),collageOrderDto.getCreateCollageUserId());
-        redisTemplate.boundHashOps(key).put(collageOrderDto.getCurrentUserId(),states);
+    public BaseResponse setCollageMemberAddTime(CollageOrderDto collageOrderDto){
+        try {
+            String collageStoreMemberKey = this.genCollageMemerHashKey(collageOrderDto.getPartnerId(), collageOrderDto.getStoreId());
+            String collageBaseHashKey = this.genCollageBaseHashKey(collageOrderDto.getPartnerId(), collageOrderDto.getStoreId(), collageOrderDto.getCreateCollageUserId());
+            this.putCollageStoreMember(collageStoreMemberKey, collageOrderDto.getCurrentUserId(), this.getCollageBashHashExpireSeconds(collageBaseHashKey));
+        } catch (Exception e) {
+            CartResponseUtil.error("");
+        }
         return CartResponseUtil.success();
     }
 
@@ -246,6 +251,13 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
         return CartResponseUtil.success();
     }
 
+    @Override
+    public BaseResponse cleanCollageMemberAddTime(CollageOrderDto collageOrderDto){
+        String key = genCollageMemberStateHashKey(collageOrderDto.getPartnerId(),collageOrderDto.getStoreId(),collageOrderDto.getCreateCollageUserId());
+        redisTemplate.boundHashOps(key).delete(collageOrderDto.getCurrentUserId());
+        return CartResponseUtil.success();
+    }
+
     /**
      * 构建门店下拼单人员hashKey
      * @param partnerId

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartCollageGoodsResponseVo.java

@@ -22,7 +22,7 @@ public class ShoppingCartCollageGoodsResponseVo extends ShoppingCartGoodsBaseRes
     /**
      * 用户商品信息
      */
-    List<CartGoods> userProducts;
+    List<CartGoods> products;
 
     /**
      * 用户昵称

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java

@@ -193,11 +193,16 @@ public class CollageOrderServiceImpl implements CollageOrderService {
     @Override
     public BaseResponse addCollageOrder(CollageOrderRequestVo request) {
         CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
+
+        CustomerInfoVo userInfo = this.getUserInfo(request.getSessionId());
+
         // 设置当前登陆用户
         collageOrderDto.setCurrentUserId(this.getUserIdBySessionId(request.getSessionId()));
 
         // 设置拼单发起人
         collageOrderDto.setCreateCollageUserId(request.getCreateCollageUserId());
+        collageOrderDto.setNickName(userInfo.getNickName());
+        collageOrderDto.setPhotoUrl(userInfo.getPhotoUrl());
 
         // 校验拼单是否存在
         CollageOrder collageOrder = this.collageOrderBaseService.queryCollageOrder(collageOrderDto).getResult();
@@ -219,7 +224,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         collageOrderBaseService.initCollageMemberState(collageMemberStateHashKey, collageOrderDto);
 
         // 设置用户在该店铺的拼单结束时间
-        collageOrderBaseService.setCollageMemberAddStates(collageOrderDto,Boolean.TRUE);
+        collageOrderBaseService.setCollageMemberAddTime(collageOrderDto);
 
         return ResponseUtil.success();
     }
@@ -281,7 +286,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         collageOrderBaseService.cleanMemberStates(collageOrderDto);
 
         // 删除用户在该店铺的拼单结束时间
-        collageOrderBaseService.setCollageMemberAddStates(collageOrderDto,Boolean.FALSE);
+        collageOrderBaseService.cleanCollageMemberAddTime(collageOrderDto);
 
         return ResponseUtil.success();
     }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartCollageServiceImpl.java

@@ -142,6 +142,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         CartGoods cartGoods = ShoppingCartConvertAdapter.convent2CartGoods(addShoppingCartGoodsRequestVo);
         cartGoods.setUserId(currentUserId);
         cartGoods.setUserName(currentUserInfoVo.getNickName());
+        cartGoods.setPhotoUrl(currentUserInfoVo.getPhotoUrl());
 
         List<Long> productIds = new ArrayList<>();
         productIds.add(Long.parseLong(goodsId));
@@ -235,7 +236,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         for(Map.Entry<String,String> m:userInfo.entrySet()){
             ShoppingCartCollageGoodsResponseVo shoppingCartCollageGoodsResponseVo = new ShoppingCartCollageGoodsResponseVo();
             shoppingCartCollageGoodsResponseVo.setUserName(m.getValue());
-            shoppingCartCollageGoodsResponseVo.setUserProducts(userGoods.get(m.getKey()));
+            shoppingCartCollageGoodsResponseVo.setProducts(userGoods.get(m.getKey()));
             userProducts.add(shoppingCartCollageGoodsResponseVo);
         }