Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop'

Feature/20201208 collage order miaohui

See merge request !62

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2005,6 +2005,7 @@ public class OrderAdapter {
             productVos.sort(Comparator.comparing(ProductVo::getSequence));
             responseVo.setProducts(productVos);
             responseVo.setProductNum(productVos.stream().mapToInt(ProductVo::getQty).sum());
+            responseVo.setOrderUserNum(productVos.stream().filter(product -> StringUtils.isNotEmpty(product.getUserId())).map(ProductVo::getUserId).distinct().count());
         }
     }
 

order-application-service/src/main/java/cn/freemud/entities/vo/QueryCollageOrderResponseVo.java

@@ -266,6 +266,11 @@ public class QueryCollageOrderResponseVo {
      */
     private Byte marketingType;
 
+    /**
+     * 订单参与人数（普通订单-0；拼单订单-实际参与人数）
+     */
+    private Long orderUserNum;
+
 
     //private List<ProductVo> products;
 

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -401,6 +401,11 @@ public class QueryOrderResponseVo {
      */
     private Byte marketingType;
 
+    /**
+     * 订单参与人数（普通订单-0；拼单订单-实际参与人数）
+     */
+    private Long orderUserNum;
+
     @Data
     public static class OrderStatusFlow {
         /**

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

@@ -24,6 +24,9 @@ public class CollageOrderRequestVo {
     @NotEmpty(message = "sessionId不能为空")
     private String sessionId;
 
+    @ApiModelProperty(value = "当前操作人用户ID")
+    private String currentUserId;
+
     @ApiModelProperty(value = "拼单创建人用户ID")
     private String createCollageUserId;
 

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

@@ -59,7 +59,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
     public BaseResponse queryCollageOrder(CollageOrderRequestVo request) {
         CollageOrderDto collageOrderDto = this.collageOrderAdapter.convert2CollageOrderDto(request);
         // 查询时需传入拼单创建人的userId，若上送字段为空时，默认查询当前登录人自己的拼单信息
-        String currentUserId = this.getUserIdBySessionId(request.getSessionId());
+        String currentUserId = StringUtils.isNotBlank(request.getCurrentUserId()) ? request.getCurrentUserId() : this.getUserIdBySessionId(request.getSessionId());
         collageOrderDto.setCurrentUserId(currentUserId);
         // 若拼单发起人ID为空，则默认按当前用户查询
         if (StringUtils.isEmpty(request.getCreateCollageUserId())) {