Merge remote-tracking branch 'origin/developerD' into developerD

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

@@ -341,39 +341,9 @@ public class OrderCommonService {
                     isSplit.set(false);
                 }
             });
-            // 冷链运输费
-            if (null != shopOrder.getIsColdChina() && 1 == shopOrder.getIsColdChina()) {
-                shopOrder.setColdChina(baseMapper.getFreightAmount(7578));
-            } else {
-                shopOrder.setColdChina(0.00d);
-            }
             // 拼接运费信息
-            if (null != shopOrder.getColdChina() && null != shopOrder.getIsColdChina() && 1 == shopOrder.getIsColdChina()) {
-                String open = "";
-                String close = "";
-                if (shopOrder.getIsColdChina()==1) {
-                    open = "(";
-                    close = ")";
-                } else if (!arrList.stream().allMatch(c -> c == 1)) {
-                    open = "(";
-                    close = ")";
-                } else {
-                    open = "";
-                    close = "";
-                }
-                if (2 == shopOrder.getShopPostFlag()) {
-                    // 到付
-                    shopOrder.setPostageInfo("￥" + shopOrder.getShopPostFee() + open +(shopOrder.getIsColdChina()==1?"冷链费: ￥" + shopOrder.getColdChina():"") + (arrList.stream().allMatch(c -> c == 1)?"":" 其他: 到付")+close);
-                } else if (0 == shopOrder.getShopPostFlag()) {
-                    // 包邮
-                    shopOrder.setPostageInfo("￥" + shopOrder.getShopPostFee() + open +(shopOrder.getIsColdChina()==1?"冷链费: ￥" + shopOrder.getColdChina():"") + (arrList.stream().allMatch(c -> c == 1)?"":" 其他: 包邮")+close);
-                } else {
-                    // 有运费
-                    shopOrder.setPostageInfo("￥" + shopOrder.getShopPostFee() + open +(shopOrder.getIsColdChina()==1?"冷链费: ￥" + shopOrder.getColdChina():"") + ((shopOrder.getShopPostFee() != null && shopOrder.getShopPostFee() != 0d)?" 其他: ￥" + MathUtil.sub(shopOrder.getShopPostFee(), shopOrder.getColdChina()):"") + close);
-                }
-            } else {
-                shopOrder.setPostageInfo(shopOrder.getShopPostFlag() == 2 ?"到付":shopOrder.getShopPostFlag() == 0?"包邮":"￥" + shopOrder.getShopPostFee());
-            }
+            shopOrder.setPostageInfo(shopOrder.getShopPostFlag() == 2 ?"到付":shopOrder.getShopPostFlag() == 0?"包邮":"￥" + shopOrder.getShopPostFee());
+
             shopOrder.setOrderProductList(orderProductList);
             shopOrder.setShopLogo(ImageUtil.getImageUrl("shopLogo", shopOrder.getShopLogo(), domain));
             //if (0 == order.getOnlinePayFlag()) {
@@ -465,39 +435,7 @@ public class OrderCommonService {
         } else {
             arrList.add(3);
         }
-        // 冷链运输费 -- 联合丽格
-        if (null != shopOrder.getIsColdChina() && 1 == shopOrder.getIsColdChina()) {
-            shopOrder.setColdChina(baseMapper.getFreightAmount(7578));
-        } else {
-            shopOrder.setColdChina(0.00d);
-        }
-        // 拼接运费信息--联合丽格
-        if (null != shopOrder.getColdChina() && null != shopOrder.getIsColdChina() && 1 == shopOrder.getIsColdChina()) {
-            String open = "";
-            String close = "";
-            if (shopOrder.getIsColdChina()==1) {
-                open = "(";
-                close = ")";
-            } else if (!arrList.stream().allMatch(c -> c == 1)) {
-                open = "(";
-                close = ")";
-            } else {
-                open = "";
-                close = "";
-            }
-            if (2 == shopOrder.getShopPostFlag()) {
-                // 到付
-                shopOrder.setPostageInfo("￥" + shopOrder.getShopPostFee() + open +(shopOrder.getIsColdChina()==1?"冷链费: ￥" + shopOrder.getColdChina():"") + (arrList.stream().allMatch(c -> c == 1)?"":" 其他: 到付")+close);
-            } else if (0 == shopOrder.getShopPostFlag()) {
-                // 包邮
-                shopOrder.setPostageInfo("￥" + shopOrder.getShopPostFee() + open +(shopOrder.getIsColdChina()==1?"冷链费: ￥" + shopOrder.getColdChina():"") + (arrList.stream().allMatch(c -> c == 1)?"":" 其他: 包邮")+close);
-            } else {
-                // 有运费
-                shopOrder.setPostageInfo("￥" + shopOrder.getShopPostFee() + open +(shopOrder.getIsColdChina()==1?"冷链费: ￥" + shopOrder.getColdChina():"") + ((shopOrder.getShopPostFee() != null && shopOrder.getShopPostFee() != 0d)?" 其他: ￥" + MathUtil.sub(shopOrder.getShopPostFee(), shopOrder.getColdChina()):"") + close);
-            }
-        } else {
-            shopOrder.setPostageInfo(shopOrder.getShopPostFlag() == 2?"到付":shopOrder.getShopPostFlag() == 0?"包邮":"￥" + shopOrder.getShopPostFee());
-        }
+        shopOrder.setPostageInfo(shopOrder.getShopPostFlag() == 2?"到付":shopOrder.getShopPostFlag() == 0?"包邮":"￥" + shopOrder.getShopPostFee());
     }
 
     /**

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

@@ -1187,16 +1187,16 @@ public class CartClubServiceImpl implements CartClubService {
                             shop.setPostageFlag(0);
                         }
                         shop.setPostage(shopPostage.get());
+                        // 运费
+                        // 包邮或者到付 冷链费为 0
+                        coldChain = 0 == shop.getPostage() ? 0 : coldChain;
+                        shop.setPostage(MathUtil.sub(shop.getPostage(), coldChain).doubleValue());
                         shop.setColdChain(coldChain);
                         if (0 != coldChain) {
                             shop.setIsColdChina(true);
                         } else {
                             shop.setIsColdChina(false);
                         }
-                        // 运费
-                        // 包邮或者到付 冷链费为 0
-                        coldChain = 0 == shop.getPostage() ? 0 : coldChain;
-                        shop.setPostage(MathUtil.sub(shop.getPostage(), coldChain).doubleValue());
                         log.info("shop.getPostage()******"+shop.getPostage());
                         // 供应商总金额
                         shopPrice.set(MathUtil.add(MathUtil.add(shopPrice.get(), shop.getPostage()),coldChain).doubleValue());
@@ -1659,12 +1659,7 @@ public class CartClubServiceImpl implements CartClubService {
                             shop.setPostageFlag(0);
                         }
                         shop.setPostage(shopPostage.get());
-                        shop.setColdChain(coldChain);
-                        if (0 != coldChain) {
-                            shop.setIsColdChina(true);
-                        } else {
-                            shop.setIsColdChina(false);
-                        }
+
                         // 总费用 + 冷链费
                         // shopPrice.set(MathUtil.add(shopPrice.get(), coldChain).doubleValue());
                         // 只有冷链费商品 运费为0
@@ -1677,6 +1672,12 @@ public class CartClubServiceImpl implements CartClubService {
                         // 包邮或者到付 冷链费为 0
                         coldChain = 0 == shop.getPostage() ? 0 : coldChain;
                         shop.setPostage(MathUtil.sub(shop.getPostage(), coldChain).doubleValue());
+                        shop.setColdChain(coldChain);
+                        if (0 != coldChain) {
+                            shop.setIsColdChina(true);
+                        } else {
+                            shop.setIsColdChina(false);
+                        }
                         // 供应商总金额
                         shopPrice.set(MathUtil.add(MathUtil.add(shopPrice.get(), shop.getPostage()),coldChain).doubleValue());
                         if (shopKindCount.get() > 0) {
@@ -2061,12 +2062,18 @@ public class CartClubServiceImpl implements CartClubService {
                     coldChain = baseMapper.getFreightAmount(cartItemVo.getProductId());
                     // shop.setPostageFlag(1);
                     // totalPrice.set(MathUtil.add(totalPrice.get(), coldChain).doubleValue());
-                    shop.setIsColdChina(true);
+                    if (1 == postageFlag) {
+                        shop.setIsColdChina(true);
+                    }
                 }
             } else {
                 shop.setIsColdChina(false);
             }
-            shop.setColdChain(coldChain);
+            if (1 == postageFlag) {
+                shop.setColdChain(coldChain);
+            } else {
+                shop.setColdChain(0d);
+            }
         }
         // 只有冷链费商品 运费为0
         /*if (null != cartDto.getTownId()) {

src/main/resources/mapper/OrderSellerMapper.xml

@@ -481,10 +481,12 @@
         <if test="orderState == 5 ">
             AND (orderStatusFlag in (2, 3) or refundStatus in (2, 3)) AND shopStatus not in (0, 4)
         </if>
-        AND userID IN
-        <foreach item="userId" index="index" collection="userIds" open="(" separator="," close=")">
-            #{userId}
-        </foreach>
+          <if test="userIds.size() > 0">
+            AND userID IN
+            <foreach item="userId" index="index" collection="userIds" open="(" separator="," close=")">
+                #{userId}
+            </foreach>
+          </if>
     </select>
     <select id="getLastCheckOrderDate" resultType="java.util.Date">
         SELECT lastCheckOrderDate