Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' of…

Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' of http://gitlab.freemud.com/order-group-application/order-group into feature/2.0.1-collageOrder-刘鹏飞

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

@@ -62,7 +62,7 @@ public interface CollageOrderBaseService {
     /**
      * 判断门店下的拼单是否存在该会员
      */
-    BaseResponse judgeMemberStates(CollageOrderDto collageOrderDto);
+    BaseResponse judgeMemberAddStates(CollageOrderDto collageOrderDto);
 
     /**
      * 设置用户的点餐位信息

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

@@ -176,7 +176,7 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
     }
 
     @Override
-    public BaseResponse judgeMemberStates(CollageOrderDto collageOrderDto){
+    public BaseResponse judgeMemberAddStates(CollageOrderDto collageOrderDto){
         String key = genCollageMemerHashKey(collageOrderDto.getPartnerId(),collageOrderDto.getStoreId());
         Boolean states = (Boolean)redisTemplate.boundHashOps(key).get(collageOrderDto.getCurrentUserId());
         if(states){

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

@@ -192,7 +192,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
 
         // 判断当前登陆用户是否参加过当前店铺其他的拼团
         // 因为一个用户在一个店铺下只能参加一个拼单，所以通过判断用户在店铺下的拼单状态来确认
-        BaseResponse judgeMem = collageOrderBaseService.judgeMemberStates(collageOrderDto);
+        BaseResponse judgeMem = collageOrderBaseService.judgeMemberAddStates(collageOrderDto);
         if(!ResponseResult.SUCCESS.getCode().equals(judgeMem.getCode())){
             throw new ServiceException(ResponseResult.COLLAGE_MEMBER_ALREADY_ADD);
         }