判断同一门店下用户拼单超期逻辑修改

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

@@ -362,16 +362,26 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
     }
 
     /**
+     * 判断userId是否在当前门店拼单用户列表中
+     * @param collageStoreMemberKey
+     * @return
+     */
+    private Long getCollageStoreMemberExpireTime(String collageStoreMemberKey, String userId) throws Exception {
+        return Optional.ofNullable((Long) redisTemplate.boundHashOps(collageStoreMemberKey).get(userId)).orElseGet(() -> 0L);
+    }
+
+    /**
      * 查询当前用户是否存在进行中的拼单
      * @param collageOrderDto
      * @return
      */
-    private boolean isInCollageStoreMemberList(CollageOrderDto collageOrderDto) {
+    public boolean isInCollageStoreMemberList(CollageOrderDto collageOrderDto) {
         try {
             String collageStoreMemberKey = this.genCollageMemerHashKey(collageOrderDto.getPartnerId(), collageOrderDto.getStoreId());
-            Map<String, Long> customerMap = this.getCollageStoreMember(collageStoreMemberKey);
+            // 获取当前用户拼单状态过期时间
+            Long collageStoreMemberExpireTime = this.getCollageStoreMemberExpireTime(collageStoreMemberKey, collageOrderDto.getCurrentUserId());
             // 当前登录用户ID存在且未超过过期时间
-            if (customerMap.keySet().contains(collageOrderDto.getCurrentUserId()) && DateTimeUtils.currentTimeMillis() < customerMap.get(collageOrderDto.getCurrentUserId())) {
+            if (DateTimeUtils.currentTimeMillis() < collageStoreMemberExpireTime) {
                 return true;
             }
         } catch (Exception e) {