联合丽格1.0.1

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 == 7881)) {
+            if (collect.stream().allMatch(c -> c == 7536)) {
                 arrList.add(1);
-            } else if (!collect.contains(7881)) {
+            } else if (!collect.contains(7536)) {
                 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 == 7881)) {
+            if (collect.stream().allMatch(c -> c == 7536)) {
                 arrList.add(1);
-            } else if (!collect.contains(7881)) {
+            } else if (!collect.contains(7536)) {
                 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 == 7881)) {
+        if (collect.stream().allMatch(c -> c == 7536)) {
             arrList.add(1);
-        } else if (!collect.contains(7881)) {
+        } else if (!collect.contains(7536)) {
             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 == 7881)) {
+        if (collect.stream().allMatch(c -> c == 7536)) {
             postageMap.put("designatedFlag", 1);
-        } else if (!collect.contains(7881)) {
+        } else if (!collect.contains(7536)) {
             postageMap.put("designatedFlag", 2);
         } else {
             postageMap.put("designatedFlag", 3);

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

@@ -1048,7 +1048,7 @@ public class CartClubServiceImpl implements CartClubService {
                         // 迭代器设置商品信息
                         for (CartItemVo cartItemVo : productList) {
                             // 设置商品运费
-                            if (7881 == cartItemVo.getProductId()) {
+                            if (7536 == cartItemVo.getProductId()) {
                                 if (cartItemVo.getNumber() >= 100) {
                                     coldChain = 0d;
                                 } else {
@@ -1341,7 +1341,7 @@ public class CartClubServiceImpl implements CartClubService {
             double coldChain = 0.00d;
             if (null != totalProductList) {
                 for (CartItemVo cart :totalProductList) {
-                    if (7881 == cart.getProductId()) {
+                    if (7536 == cart.getProductId()) {
                         if (cart.getNumber() >= 100) {
                             coldChain = 0.00d;
                         } else {
@@ -1502,7 +1502,7 @@ public class CartClubServiceImpl implements CartClubService {
                         for (CartItemVo cartItemVo : productList) {
                             // 设置商品运费
                             if (null != townId) {
-                                if (7881 == cartItemVo.getProductId()) {
+                                if (7536 == cartItemVo.getProductId()) {
                                     if (cartItemVo.getNumber() >= 100) {
                                         coldChain = 0d;
                                     } else {
@@ -1986,7 +1986,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 (7881 == cartItemVo.getProductId()) {
+            if (7536 == cartItemVo.getProductId()) {
                 if (cartItemVo.getNumber() >= 100) {
                     coldChain = 0d;
                 } else {

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

@@ -346,7 +346,7 @@ public class CartSellerServiceImpl implements CartSellerService {
                     cartItemVo.setIsChecked(false);
                     // 设置skus
                     cartItemVo.setSkus(orderClubMapper.getOrganizeSku(cartItemVo.getProductId()));
-                    if (cartItemVo.getValidFlag() == 2) {
+                    if (cartItemVo.getValidFlag() != 2) {
                         // 后台逻辑删除,已停售
                         cartItemVo.setStatus(1);
                         invalidList.add(cartItemVo);
@@ -589,7 +589,7 @@ public class CartSellerServiceImpl implements CartSellerService {
                 AtomicDouble coldChain = new AtomicDouble(0);
                 if (null != productList && productList.size() > 0) {
                     for (CartItemVo cartItemVo : productList) {
-                        if (7881 == cartItemVo.getProductId()) {
+                        if (7536 == cartItemVo.getProductId()) {
                             if (cartItemVo.getNumber() >= 100) {
                                 coldChain.set(0);
                             } else {

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

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

src/main/resources/mapper/BaseMapper.xml

@@ -312,7 +312,6 @@
         FROM product p
                  LEFT JOIN cm_sku cs on cs.productId = p.productID
         WHERE cs.skuId = #{skuId}
-          and cs.organizeId = 0
     </select>
     <select id="getClauseList" resultType="com.caimei365.order.model.vo.ClauseVo">
         SELECT id,

src/main/resources/mapper/CartSellerMapper.xml

@@ -58,29 +58,28 @@
                p.`name`                     AS `name`,
                p.mainImage                  AS image,
                p.productCode,
-               cmps.price,
-               cmps.price                     AS originalPrice,
+               cs.price,
+               cs.price                     AS originalPrice,
                cs.unit                      AS unit,
                cs.stock                     AS stock,
                p.step                       AS step,
-               cmop.minBuyNumber              AS min,
+               cs.minBuyNumber              AS min,
                p.priceFlag,
                cs.ladderPriceFlag           AS ladderFlag,
                p.includedTax                AS includedTax,
                p.invoiceType                AS invoiceType,
                p.taxPoint                   AS taxRate,
                p.productCategory,
-               cmop.validFlag                  AS validFlag,
+               copi.validFlag                  AS validFlag,
                p.productType
         FROM bp_order_product_cart c
-                 LEFT JOIN cm_mall_product_sku cmps ON c.skuId = cmps.skuId
-                 LEFT JOIN cm_mall_organize_products cmop ON cmps.productID = cmop.productId
                  LEFT JOIN cm_sku cs on c.skuId = cs.skuId
                  LEFT JOIN product p ON cs.productId = p.productID
+                 LEFT JOIN cm_organize_product_info copi ON copi.productId = p.productId
         WHERE c.serviceProviderId = #{serviceProviderId}
           AND c.clubId = #{clubId}
           AND c.shopID = #{shopId}
-          AND cmop.delFlag = 0
+          AND copi.organizeId = 4
         ORDER BY c.id DESC
     </select>
     <select id="getSellerCartCount" resultType="java.lang.Integer">
@@ -191,7 +190,7 @@
         LEFT JOIN cm_sku cs ON c.skuId = cs.skuId
         LEFT JOIN product p ON cs.productId = p.productID
         LEFT JOIN cm_svip_product csp ON cs.productID = csp.productId
-        WHERE c.serviceProviderId = #{serviceProviderId} AND c.clubId = #{clubId} AND c.shopID = #{shopId} and cs.organizeId = 0
+        WHERE c.serviceProviderId = #{serviceProviderId} AND c.clubId = #{clubId} AND c.shopID = #{shopId}
         AND c.skuId in
         <foreach collection="skuIds" open="(" separator="," close=")" item="skuId">
             #{skuId}