Browse Source

商品指定

huangzhiguo 1 year ago
parent
commit
43ba52dcc6

+ 6 - 6
src/main/java/com/caimei365/order/components/OrderCommonService.java

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

+ 9 - 9
src/main/java/com/caimei365/order/service/impl/CartClubServiceImpl.java

@@ -1041,9 +1041,9 @@ public class CartClubServiceImpl implements CartClubService {
                         }
                         }
                         // 是否包含需要冷链运输商品
                         // 是否包含需要冷链运输商品
                         List<Integer> collect = productList.stream().map(CartItemVo::getProductId).collect(Collectors.toList());
                         List<Integer> collect = productList.stream().map(CartItemVo::getProductId).collect(Collectors.toList());
-                        if (collect.stream().allMatch(c -> c == 7578)) {
+                        if (collect.stream().allMatch(c -> c == 7881)) {
                             shop.setDesignatedFlag(1);
                             shop.setDesignatedFlag(1);
-                        } else if (!collect.contains(7578)) {
+                        } else if (!collect.contains(7881)) {
                             shop.setDesignatedFlag(2);
                             shop.setDesignatedFlag(2);
                         } else {
                         } else {
                             shop.setDesignatedFlag(3);
                             shop.setDesignatedFlag(3);
@@ -1053,7 +1053,7 @@ public class CartClubServiceImpl implements CartClubService {
                         // 迭代器设置商品信息
                         // 迭代器设置商品信息
                         for (CartItemVo cartItemVo : productList) {
                         for (CartItemVo cartItemVo : productList) {
                             // 设置商品运费
                             // 设置商品运费
-                            if (7578 == cartItemVo.getProductId()) {
+                            if (7881 == cartItemVo.getProductId()) {
                                 if (cartItemVo.getNumber() >= 100) {
                                 if (cartItemVo.getNumber() >= 100) {
                                     coldChain = 0d;
                                     coldChain = 0d;
                                 } else {
                                 } else {
@@ -1366,7 +1366,7 @@ public class CartClubServiceImpl implements CartClubService {
             double coldChain = 0.00d;
             double coldChain = 0.00d;
             if (null != totalProductList) {
             if (null != totalProductList) {
                 for (CartItemVo cart :totalProductList) {
                 for (CartItemVo cart :totalProductList) {
-                    if (7578 == cart.getProductId()) {
+                    if (7881 == cart.getProductId()) {
                         if (cart.getNumber() >= 100) {
                         if (cart.getNumber() >= 100) {
                             coldChain = 0.00d;
                             coldChain = 0.00d;
                         } else {
                         } else {
@@ -1514,9 +1514,9 @@ public class CartClubServiceImpl implements CartClubService {
                     if (null != productList && productList.size() > 0) {
                     if (null != productList && productList.size() > 0) {
                         // 是否包含需要冷链运输商品
                         // 是否包含需要冷链运输商品
                         List<Integer> collect = productList.stream().map(CartItemVo::getProductId).collect(Collectors.toList());
                         List<Integer> collect = productList.stream().map(CartItemVo::getProductId).collect(Collectors.toList());
-                        if (collect.stream().allMatch(c -> c == 7578)) {
+                        if (collect.stream().allMatch(c -> c == 7881)) {
                             shop.setDesignatedFlag(1);
                             shop.setDesignatedFlag(1);
-                        } else if (!collect.contains(7578)) {
+                        } else if (!collect.contains(7881)) {
                             shop.setDesignatedFlag(2);
                             shop.setDesignatedFlag(2);
                         } else {
                         } else {
                             shop.setDesignatedFlag(3);
                             shop.setDesignatedFlag(3);
@@ -1534,7 +1534,7 @@ public class CartClubServiceImpl implements CartClubService {
                         for (CartItemVo cartItemVo : productList) {
                         for (CartItemVo cartItemVo : productList) {
                             // 设置商品运费
                             // 设置商品运费
                             if (null != cityId) {
                             if (null != cityId) {
-                                if (7578 == cartItemVo.getProductId()) {
+                                if (7881 == cartItemVo.getProductId()) {
                                     if (cartItemVo.getNumber() >= 100) {
                                     if (cartItemVo.getNumber() >= 100) {
                                         coldChain = 0d;
                                         coldChain = 0d;
                                     } else {
                                     } else {
@@ -2038,7 +2038,7 @@ public class CartClubServiceImpl implements CartClubService {
         Double coldChain = 0d;
         Double coldChain = 0d;
         if (null != cartDto.getCityId()) {
         if (null != cartDto.getCityId()) {
             // 是否包含需要冷链运输商品 1 冷链费商品 2 不含冷链费商品 3 包含冷链费商品
             // 是否包含需要冷链运输商品 1 冷链费商品 2 不含冷链费商品 3 包含冷链费商品
-            if (cartDto.getProductId() == 7578) {
+            if (cartDto.getProductId() == 7881) {
                 shop.setDesignatedFlag(1);
                 shop.setDesignatedFlag(1);
             } else {
             } else {
                 shop.setDesignatedFlag(2);
                 shop.setDesignatedFlag(2);
@@ -2055,7 +2055,7 @@ public class CartClubServiceImpl implements CartClubService {
                 shop.setUserBeans((Integer) postageMap.get("userBeans"));
                 shop.setUserBeans((Integer) postageMap.get("userBeans"));
             }
             }
 
 
-            if (7578 == cartItemVo.getProductId()) {
+            if (7881 == cartItemVo.getProductId()) {
                 if (cartItemVo.getNumber() >= 100) {
                 if (cartItemVo.getNumber() >= 100) {
                     coldChain = 0d;
                     coldChain = 0d;
                 } else {
                 } else {

+ 3 - 3
src/main/java/com/caimei365/order/service/impl/CartSellerServiceImpl.java

@@ -586,15 +586,15 @@ public class CartSellerServiceImpl implements CartSellerService {
                 if (null != productList && productList.size() > 0) {
                 if (null != productList && productList.size() > 0) {
                     // 是否包含需要冷链运输商品
                     // 是否包含需要冷链运输商品
                     List<Integer> collect = productList.stream().map(CartItemVo::getProductId).collect(Collectors.toList());
                     List<Integer> collect = productList.stream().map(CartItemVo::getProductId).collect(Collectors.toList());
-                    if (collect.stream().allMatch(c -> c == 7578)) {
+                    if (collect.stream().allMatch(c -> c == 7881)) {
                         shop.setDesignatedFlag(1);
                         shop.setDesignatedFlag(1);
-                    } else if (!collect.contains(7578)) {
+                    } else if (!collect.contains(7881)) {
                         shop.setDesignatedFlag(2);
                         shop.setDesignatedFlag(2);
                     } else {
                     } else {
                         shop.setDesignatedFlag(3);
                         shop.setDesignatedFlag(3);
                     }
                     }
                     for (CartItemVo cartItemVo : productList) {
                     for (CartItemVo cartItemVo : productList) {
-                        if (7578 == cartItemVo.getProductId()) {
+                        if (7881 == cartItemVo.getProductId()) {
                             if (cartItemVo.getNumber() >= 100) {
                             if (cartItemVo.getNumber() >= 100) {
                                 coldChain.set(0);
                                 coldChain.set(0);
                             } else {
                             } else {