修改包装费

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

@@ -44,6 +44,18 @@ public class ShoppingCartCollageGoodsResponseVo extends ShoppingCartGoodsBaseRes
      */
     private Long packPrice;
 
+    /**
+     * 商品总数
+     */
+    private Integer productsCount;
 
+    /**
+     * 原总价
+     */
+    private Long originalTotalAmount;
+    /**
+     * 现总价
+     */
+    private Long totalAmount;
 
 }

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

@@ -247,41 +247,31 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
             shoppingCartCollageGoodsResponseVo.setPhotoUrl(cmbs.getPhotoUrl());
             // 包装费
             Long packPrice = 0L;
-            List<CartGoods> products = userGoods.get(collageMemberState.get(0).getUserId());
-            if(products != null && !products.isEmpty()){
-                for(CartGoods cg :products){
-                    packPrice = packPrice + (cg.getPackPrice() == null ? 0 : cg.getPackPrice());
-                }
-            }
-            shoppingCartCollageGoodsResponseVo.setPackPrice(packPrice);
-            shoppingCartCollageGoodsResponseVo.setProducts(userGoods.get(cmbs.getUserId()));
-            shoppingCartCollageGoodsResponseVo.setStates(cmbs.getState());
-            userProducts.add(shoppingCartCollageGoodsResponseVo);
-        }
-
-        shoppingCartCollageResponseVo.setUserProducts(userProducts);
-
-        if(StringUtils.isNotEmpty(currentUserId)){
             // 商品数量
             Integer productsCount = 0;
             // 商品原价总价
             Long totalAmount = 0L;
-            if(null != collageMemberState && null != collageMemberState.get(0)){
-                List<CartGoods> products = userGoods.get(collageMemberState.get(0).getUserId());
+            List<CartGoods> products = userGoods.get(cmbs.getUserId());
             if(products != null && !products.isEmpty()){
                 for(CartGoods cg :products){
+                    packPrice = packPrice + (cg.getPackPrice() == null ? 0 : cg.getPackPrice());
                     productsCount = productsCount + (cg.getQty() == null ? 0 : cg.getQty());
                     totalAmount = totalAmount + (cg.getOriginalAmount() == null ? 0 : cg.getOriginalAmount());
-
                 }
             }
+            // 只有总的包装费不为0、null时才计算个人包装费
+            if(shoppingCartGoodsResponseVo.getNewPackAmount() != null && shoppingCartGoodsResponseVo.getNewPackAmount().longValue() != 0){
+                shoppingCartCollageGoodsResponseVo.setPackPrice(packPrice);
+            }
+            shoppingCartCollageGoodsResponseVo.setProductsCount(productsCount);
+            shoppingCartCollageGoodsResponseVo.setTotalAmount(totalAmount);
+            shoppingCartCollageGoodsResponseVo.setOriginalTotalAmount(totalAmount);
+            shoppingCartCollageGoodsResponseVo.setProducts(products);
+            shoppingCartCollageGoodsResponseVo.setStates(cmbs.getState());
+            userProducts.add(shoppingCartCollageGoodsResponseVo);
         }
 
-            // 重新计算个人购物车的总金额（优惠后）、商品数量
-            shoppingCartCollageResponseVo.setProductsCount(productsCount);
-            shoppingCartCollageResponseVo.setTotalAmount(totalAmount);
-            shoppingCartCollageResponseVo.setOriginalTotalAmount(totalAmount);
-        }
+        shoppingCartCollageResponseVo.setUserProducts(userProducts);
 
         return shoppingCartCollageResponseVo;
     }