Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop'

拼单接口调整

See merge request !18

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

@@ -95,11 +95,11 @@ public interface CollageOrderBaseService {
 
 
     /**
-     * 设置用户在该店铺下的拼单时间
+     * 设置用户在该店铺下的拼单记录
      * @param collageOrderDto
      * @return
      */
-    BaseResponse setCollageMemberAddTime(CollageOrderDto collageOrderDto);
+    BaseResponse setCollagePartnerMember(CollageOrderDto collageOrderDto);
 
     /**
      * 判断用户是否参加了某一个拼单
@@ -131,9 +131,9 @@ public interface CollageOrderBaseService {
     BaseResponse cleanMemberStates(CollageOrderDto collageOrderDto);
 
     /**
-     * 清除用户在店铺下的拼单时间
+     * 清除用户在店铺下的拼单记录
      */
-    BaseResponse cleanCollageMemberAddTime(CollageOrderDto collageOrderDto);
+    BaseResponse cleanCollagePartnerMember(CollageOrderDto collageOrderDto);
 
     /**
      * 修改用户加购状态 加购完毕

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

@@ -248,6 +248,7 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
         try {
             String collageMemberStateKey = this.genCollageMemberStateHashKey(collageOrderDto.getPartnerId(), collageOrderDto.getStoreId(), collageOrderDto.getCreateCollageUserId());
             CollageMemberState collageMemberState = this.getCollageMemberState(collageMemberStateKey, collageOrderDto.getCurrentUserId());
+            if (null == collageMemberState) return CartResponseUtil.error("当前用户未参与此拼单");
             collageMemberState.setState(CollageMemberStateType.READY.getValue());
             this.setCollageMemberState(collageMemberStateKey, collageMemberState);
             return CartResponseUtil.success();
@@ -262,6 +263,7 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
         try {
             String collageMemberStateKey = this.genCollageMemberStateHashKey(collageOrderDto.getPartnerId(), collageOrderDto.getStoreId(), collageOrderDto.getCreateCollageUserId());
             CollageMemberState collageMemberState = this.getCollageMemberState(collageMemberStateKey, collageOrderDto.getCurrentUserId());
+            if (null == collageMemberState) return CartResponseUtil.error("当前用户未参与此拼单");
             collageMemberState.setState(CollageMemberStateType.SHOPPING.getValue());
             this.setCollageMemberState(collageMemberStateKey, collageMemberState);
             return CartResponseUtil.success();
@@ -283,7 +285,7 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
     }
 
     @Override
-    public BaseResponse setCollageMemberAddTime(CollageOrderDto collageOrderDto){
+    public BaseResponse setCollagePartnerMember(CollageOrderDto collageOrderDto){
         try {
             String collagePartnerMemberKey = this.genCollagePartnerMemberHashKey(collageOrderDto.getPartnerId());
             String collageBaseHashKey = this.genCollageBaseHashKey(collageOrderDto.getPartnerId(), collageOrderDto.getStoreId(), collageOrderDto.getCreateCollageUserId());
@@ -291,7 +293,7 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
             CollagePartnerMember collagePartnerMember = new CollagePartnerMember(collageOrderDto.getPartnerId(), collageOrderDto.getStoreId(), collageOrderDto.getCreateCollageUserId(), collageBaseHash.getExpireTime());
             this.putCollagePartnerMember(collagePartnerMemberKey, collageOrderDto.getCurrentUserId(), collagePartnerMember);
         } catch (Exception e) {
-            ErrorLog.printErrorLog("设置用户在该商户下拼单参与列表记录异常", "CollageOrderBaseServiceImpl/setCollageMemberAddTime", this.collageOrderRequest(collageOrderDto),  e);
+            ErrorLog.printErrorLog("设置用户在该商户下拼单参与列表记录异常", "CollageOrderBaseServiceImpl/setCollagePartnerMember", this.collageOrderRequest(collageOrderDto),  e);
             CartResponseUtil.error("设置用户在该商户下拼单参与列表记录失败");
         }
         return CartResponseUtil.success();
@@ -338,8 +340,8 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
     }
 
     @Override
-    public BaseResponse cleanCollageMemberAddTime(CollageOrderDto collageOrderDto){
-        String key = genCollageMemberStateHashKey(collageOrderDto.getPartnerId(),collageOrderDto.getStoreId(),collageOrderDto.getCreateCollageUserId());
+    public BaseResponse cleanCollagePartnerMember(CollageOrderDto collageOrderDto){
+        String key = genCollagePartnerMemberHashKey(collageOrderDto.getPartnerId());
         redisTemplate.boundHashOps(key).delete(collageOrderDto.getCurrentUserId());
         return CartResponseUtil.success();
     }

shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -166,18 +166,14 @@ public enum ResponseResult {
     COLLAGE_MEMBER_NOT_ADD("49010", "用户未参加拼单，请确认"),
     COLLAGE_MEMBER_NOT_CREATE("49011", "只有拼单发起者才能移除拼单人员，请确认"),
     COLLAGE_STATES_CHOOSE("49012", "获取用户选购状态失败"),
+    COLLAGE_CAN_NOT_REMOVE_SELF("49013", "不能将自己移除拼单"),
 
     /**
      * 微信卡券
      */
     WEICHAT_SHOP_NOTSUPPORT("48001", "当前门店不可用"),
     WEICHAT_NOT_PRODUCTCARD("48002", "不是商品券不用加入购物车"),
-    WEICHAT_PRODUCT_NOEXIST("48003", "商品不存在"),
-
-    /**
-     * 拼单
-     */
-    COLLAGE_REMOVE_MEMBER_ERROR("49001", "当前门店不可用");
+    WEICHAT_PRODUCT_NOEXIST("48003", "商品不存在");
 
 
     private String code;

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

@@ -277,7 +277,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         collageOrderBaseService.addCollageMemberState(collageMemberStateHashKey, collageOrderDto);
 
         // 设置用户在该商户下拼单参与列表记录
-        collageOrderBaseService.setCollageMemberAddTime(collageOrderDto);
+        collageOrderBaseService.setCollagePartnerMember(collageOrderDto);
 
         return ResponseUtil.success();
     }
@@ -322,7 +322,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         try {
             this.removeMemberData(collageOrderDto);
         } catch (Exception e) {
-            ResponseUtil.error(ResponseResult.COLLAGE_REMOVE_MEMBER_ERROR);
+            ResponseUtil.error(ResponseResult.SYSTEM_ERROR);
         }
 
         return ResponseUtil.success();
@@ -342,6 +342,11 @@ public class CollageOrderServiceImpl implements CollageOrderService {
             throw new ServiceException(ResponseResult.COLLAGE_MEMBER_NOT_CREATE);
         }
 
+        // 不能移除自己
+        if(currentUserInfoVo.getMemberId().equals(request.getRemoveUserId())){
+            throw new ServiceException(ResponseResult.COLLAGE_CAN_NOT_REMOVE_SELF);
+        }
+
         CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
         // 设置移除拼单用户ID
         collageOrderDto.setCurrentUserId(request.getRemoveUserId());
@@ -356,7 +361,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         try {
             this.removeMemberData(collageOrderDto);
         } catch (Exception e) {
-            ResponseUtil.error(ResponseResult.COLLAGE_REMOVE_MEMBER_ERROR);
+            ResponseUtil.error(ResponseResult.SYSTEM_ERROR);
         }
 
         return ResponseUtil.success();
@@ -384,8 +389,8 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         // 删除用户选好了状态
         collageOrderBaseService.cleanMemberStates(collageOrderDto);
 
-        // 删除用户在该店铺的拼单结束时间
-        collageOrderBaseService.cleanCollageMemberAddTime(collageOrderDto);
+        // 删除用户在该店铺的拼单参与记录
+        collageOrderBaseService.cleanCollagePartnerMember(collageOrderDto);
     }