拼单详情去除分摊金额

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

@@ -1073,7 +1073,7 @@ public class OrderServiceImpl implements Orderservice {
             return orderInfoRes;
         }
 
-        // 根据用户聚合商品信息，计算分摊
+        // 根据用户聚合商品信息
         QueryCollageOrderResponseVo queryCollageOrderResponseVo = new QueryCollageOrderResponseVo();
         QueryOrderResponseVo queryOrderResponseVo  = (QueryOrderResponseVo)orderInfoRes.getResult();
         List<ProductVo> productVo = queryOrderResponseVo.getProducts();
@@ -1083,26 +1083,11 @@ public class OrderServiceImpl implements Orderservice {
         for(Map.Entry<String,List<ProductVo>> m : orderItemMap.entrySet()){
             List<ProductVo> products = m.getValue();
 
-            // 根据行金额计算加和每个会员的分摊金额
-            BigDecimal avgAmount = new BigDecimal(0);
-            for (ProductVo po : products){
-                avgAmount.add(new BigDecimal(po.getFinalPrice()));
-                List<ProductVo> materialProducts = po.getSetMaterialProducts();
-                for(ProductVo mp : materialProducts){
-                    avgAmount.add(new BigDecimal(mp.getFinalPrice()));
-                }
-
-                List<ProductVo> mealProducts = po.getSetMealProducts();
-                for(ProductVo mp:mealProducts){
-                    avgAmount.add(new BigDecimal(mp.getFinalPrice()));
-                }
-            }
             UserProductVo userProductVo = new UserProductVo();
             userProductVo.setUserId(products.get(0).getUserId());
             userProductVo.setNickName(products.get(0).getNickName());
             userProductVo.setPhotoUrl(products.get(0).getPhotoUrl());
             userProductVo.setProducts(products);
-            userProductVo.setAvgAmount(avgAmount);
             userProducts.add(userProductVo);
         }
 

shopping-cart-application-service/src/main/java/cn/freemud/factory/AbstractShoppingCartImpl.java

@@ -113,11 +113,23 @@ public abstract class AbstractShoppingCartImpl implements ShoppingCartNewService
         GetSessionUserInfoDto getSessionUserInfoDto = new GetSessionUserInfoDto();
         getSessionUserInfoDto.setIsGetPaid(true);
         getSessionUserInfoDto.setSessionId(sessionId);
-        BaseResponse<CustomerInfoVo> sessionUserInfo = customerApplicationClient.getSessionUserInfo(getSessionUserInfoDto);
+/*        BaseResponse<CustomerInfoVo> sessionUserInfo = customerApplicationClient.getSessionUserInfo(getSessionUserInfoDto);
         if (!ResponseResult.SUCCESS.getCode().equals(sessionUserInfo.getCode()) || sessionUserInfo.getResult() == null) {
             throw new ServiceException(ResponseResult.NOT_LOGIN);
+        }*/
+        CustomerInfoVo aa = new CustomerInfoVo();
+        if("1".equals(sessionId)){
+            aa.setMemberId("111");
+            aa.setNickName("111");
+            aa.setPhotoUrl("111");
+            aa.setNewMember(false);
+        }else{
+            aa.setMemberId("222");
+            aa.setNickName("222");
+            aa.setPhotoUrl("222");
+            aa.setNewMember(false);
         }
-        return sessionUserInfo.getResult();
+        return aa;
     }
 
     public UserLoginInfoDto convert2UserLoginInfoDto(CustomerInfoVo assortmentCustomerInfoVo) {