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

移除拼单参与人接口调整

See merge request !11

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

@@ -27,6 +27,9 @@ public class CollageOrderRequestVo {
     @ApiModelProperty(value = "拼单创建人用户ID")
     private String createCollageUserId;
 
+    @ApiModelProperty(value = "移除拼单参与人ID")
+    private String removeUserId;
+
     @ApiModelProperty(value = "商户ID", required = true)
     @NotEmpty(message = "商户ID 不能为空")
     private String partnerId;

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

@@ -339,8 +339,8 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         }
 
         CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
-        // 设置当前登陆用户
-        collageOrderDto.setCurrentUserId(currentUserInfoVo.getMemberId());
+        // 设置移除拼单用户ID
+        collageOrderDto.setCurrentUserId(request.getRemoveUserId());
         // 设置拼单发起人
         collageOrderDto.setCreateCollageUserId(request.getCreateCollageUserId());