联合丽格1.0.2

src/main/java/com/caimei365/order/components/OrderCommonService.java

@@ -82,9 +82,9 @@ public class OrderCommonService {
             // 冷链商品判定
             List<Integer> collect = orderProductList.stream().map(OrderProductVo::getProductId).collect(Collectors.toList());
             collect.removeIf(c -> c == 999);
-            if (collect.stream().allMatch(c -> c == 7550)) {
+            if (collect.stream().allMatch(c -> c == 7881)) {
                 arrList.add(1);
-            } else if (!collect.contains(7550)) {
+            } else if (!collect.contains(7881)) {
                 arrList.add(2);
             } else {
                 arrList.add(3);
@@ -289,9 +289,9 @@ public class OrderCommonService {
             // 冷链商品判定
             List<Integer> collect = orderProductList.stream().map(OrderProductVo::getProductId).collect(Collectors.toList());
             collect.removeIf(c -> c == 999);
-            if (collect.stream().allMatch(c -> c == 7550)) {
+            if (collect.stream().allMatch(c -> c == 7881)) {
                 arrList.add(1);
-            } else if (!collect.contains(7550)) {
+            } else if (!collect.contains(7881)) {
                 arrList.add(2);
             } else {
                 arrList.add(3);
@@ -454,9 +454,9 @@ public class OrderCommonService {
         // 冷链商品判定
         List<Integer> collect = orderProductList.stream().map(OrderProductVo::getProductId).collect(Collectors.toList());
         collect.removeIf(c -> c == 999);
-        if (collect.stream().allMatch(c -> c == 7550)) {
+        if (collect.stream().allMatch(c -> c == 7881)) {
             arrList.add(1);
-        } else if (!collect.contains(7550)) {
+        } else if (!collect.contains(7881)) {
             arrList.add(2);
         } else {
             arrList.add(3);

src/main/java/com/caimei365/order/components/ProductService.java

@@ -217,9 +217,9 @@ public class ProductService {
         }
         // 是否包含需要冷链运输商品
         List<Integer> collect = postageFlagList.stream().map(ProductPostageVo::getProductId).collect(Collectors.toList());
-        if (collect.stream().allMatch(c -> c == 7550)) {
+        if (collect.stream().allMatch(c -> c == 7881)) {
             postageMap.put("designatedFlag", 1);
-        } else if (!collect.contains(7550)) {
+        } else if (!collect.contains(7881)) {
             postageMap.put("designatedFlag", 2);
         } else {
             postageMap.put("designatedFlag", 3);
@@ -274,6 +274,10 @@ public class ProductService {
                 // 到付
                 postageFlag = 2;
             }
+            // 只有冷链费商品 运费为0
+            if (1 == (Integer) postageMap.get("designatedFlag")) {
+                postage = 15.00d;
+            }
             postageMap.put("postageFlag", postageFlag);
             postageMap.put("postage", postage);
             return postageMap;

src/main/java/com/caimei365/order/service/impl/CartClubServiceImpl.java

@@ -1048,7 +1048,7 @@ public class CartClubServiceImpl implements CartClubService {
                         // 迭代器设置商品信息
                         for (CartItemVo cartItemVo : productList) {
                             // 设置商品运费
-                            if (7550 == cartItemVo.getProductId()) {
+                            if (7881 == cartItemVo.getProductId()) {
                                 if (cartItemVo.getNumber() >= 100) {
                                     coldChain = 0d;
                                 } else {
@@ -1166,6 +1166,10 @@ public class CartClubServiceImpl implements CartClubService {
                         }
                         // 总费用 + 冷链费
                         // shopPrice.set(MathUtil.add(shopPrice.get(), coldChain).doubleValue());
+                        // 只有冷链费商品 运费为0
+                        if (1 == shop.getDesignatedFlag()) {
+                            shop.setPostage(0d);
+                        }
                         // 总运费
                         shop.setAllPostage(MathUtil.add(shop.getPostage(),coldChain).doubleValue());
                         // 供应商总金额
@@ -1335,7 +1339,7 @@ public class CartClubServiceImpl implements CartClubService {
             double coldChain = 0.00d;
             if (null != totalProductList) {
                 for (CartItemVo cart :totalProductList) {
-                    if (7550 == cart.getProductId()) {
+                    if (7881 == cart.getProductId()) {
                         if (cart.getNumber() >= 100) {
                             coldChain = 0.00d;
                         } else {
@@ -1496,7 +1500,7 @@ public class CartClubServiceImpl implements CartClubService {
                         for (CartItemVo cartItemVo : productList) {
                             // 设置商品运费
                             if (null != townId) {
-                                if (7550 == cartItemVo.getProductId()) {
+                                if (7881 == cartItemVo.getProductId()) {
                                     if (cartItemVo.getNumber() >= 100) {
                                         coldChain = 0d;
                                     } else {
@@ -1607,6 +1611,10 @@ public class CartClubServiceImpl implements CartClubService {
                         }
                         // 总费用 + 冷链费
                         // shopPrice.set(MathUtil.add(shopPrice.get(), coldChain).doubleValue());
+                        // 只有冷链费商品 运费为0
+                        if (1 == shop.getDesignatedFlag()) {
+                            shop.setPostage(0d);
+                        }
                         // 总运费
                         shop.setAllPostage(MathUtil.add(shop.getPostage(),coldChain).doubleValue());
                         // 供应商总金额
@@ -1974,7 +1982,7 @@ public class CartClubServiceImpl implements CartClubService {
             shop.setPostageFlag((Integer) postageMap.get("postageFlag"));
             shop.setUserBeans((Integer) postageMap.get("userBeans"));
             shop.setDesignatedFlag((Integer) postageMap.get("designatedFlag"));
-            if (7550 == cartItemVo.getProductId()) {
+            if (7881 == cartItemVo.getProductId()) {
                 if (cartItemVo.getNumber() >= 100) {
                     coldChain = 0d;
                 } else {
@@ -1988,6 +1996,10 @@ public class CartClubServiceImpl implements CartClubService {
             }
             shop.setColdChain(coldChain);
         }
+        // 只有冷链费商品 运费为0
+        if (1 == shop.getDesignatedFlag()) {
+            shop.setPostage(0d);
+        }
         // 总运费
         shop.setAllPostage(MathUtil.add(shop.getPostage(),coldChain).doubleValue());
         // 供应商总金额

src/main/java/com/caimei365/order/service/impl/CartSellerServiceImpl.java

@@ -506,7 +506,7 @@ public class CartSellerServiceImpl implements CartSellerService {
                 AtomicDouble coldChain = new AtomicDouble(0);
                 if (null != productList && productList.size() > 0) {
                     for (CartItemVo cartItemVo : productList) {
-                        if (7550 == cartItemVo.getProductId()) {
+                        if (7881 == cartItemVo.getProductId()) {
                             if (cartItemVo.getNumber() >= 100) {
                                 coldChain.set(0);
                             } else {
@@ -618,6 +618,10 @@ public class CartSellerServiceImpl implements CartSellerService {
                     } else {
                         shop.setIsColdChina(false);
                     }
+                    // 只有冷链费商品 运费为0
+                    if (1 == shop.getDesignatedFlag()) {
+                        shop.setPostage(0d);
+                    }
                     // 总运费
                     shop.setAllPostage(MathUtil.add(shop.getPostage(),coldChain.get()).doubleValue());
                     // 供应商总金额

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -592,7 +592,7 @@ public class SubmitServiceImpl implements SubmitService {
                 }
                 // 联合丽格冷链费商品
                 if (1 == isColdChinaShop) {
-                    if (7550 == product.getProductId()) {
+                    if (7881 == product.getProductId()) {
                         if (productNum >= 100) {
                             shopIsColdChina.set(0.00d);
                         } else {
@@ -2042,7 +2042,7 @@ public class SubmitServiceImpl implements SubmitService {
                 // 统计 总金额 包括税费
                 shopProductFee.set(MathUtil.add(shopProductFee.get(), product.getRealProductFee()).doubleValue());
                 // 再勾选冷链费时
-                if (1 == oldShop.get(0).getIsColdChina() && product.getProductId() == 7550) {
+                if (1 == oldShop.get(0).getIsColdChina() && product.getProductId() == 7881) {
                     isColdChina.set(MathUtil.add(isColdChina.get(), 700).doubleValue());
                 }
                 // 商品总金额