fix:冲突

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -3498,39 +3498,6 @@ public class OrderServiceImpl implements Orderservice {
     //}
 
 
-    @Override
-    public BaseResponse queryCollageOrderById(Integer operation, String sessionId, String oid, String partnerId, String channel) {
-
-        BaseResponse orderInfoRes = this.queryOrderById(operation,sessionId, oid,partnerId,channel);
-
-        if(null == orderInfoRes.getResult() || !String.valueOf(RESPONSE_SUCCESS_CODE).equals(orderInfoRes.getCode())){
-            return orderInfoRes;
-        }
-
-        // 根据用户聚合商品信息
-        QueryCollageOrderResponseVo queryCollageOrderResponseVo = new QueryCollageOrderResponseVo();
-        QueryOrderResponseVo queryOrderResponseVo  = (QueryOrderResponseVo)orderInfoRes.getResult();
-        List<ProductVo> productVo = queryOrderResponseVo.getProducts();
-        // 根据用户id分类商品
-        Map<String,List<ProductVo>> orderItemMap = productVo.stream().collect(Collectors.groupingBy(ProductVo::getUserId));
-        List<UserProductVo> userProducts = new ArrayList<>();
-        for(Map.Entry<String,List<ProductVo>> m : orderItemMap.entrySet()){
-            List<ProductVo> products = m.getValue();
-
-            UserProductVo userProductVo = new UserProductVo();
-            userProductVo.setUserId(products.get(0).getUserId());
-            userProductVo.setOpenId(products.get(0).getOpenId());
-            userProductVo.setNickName(products.get(0).getNickName());
-            userProductVo.setPhotoUrl(products.get(0).getPhotoUrl());
-            userProductVo.setProducts(products);
-            userProducts.add(userProductVo);
-        }
-
-        queryCollageOrderResponseVo = JSONObject.parseObject(JSONObject.toJSONString(queryOrderResponseVo),QueryCollageOrderResponseVo.class);
-        queryCollageOrderResponseVo.setUserProducts(userProducts);
-
-        return ResponseUtil.success(queryCollageOrderResponseVo);
-    }
     /**
      * 获取混合支付是否开启
      * @param partnerId