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

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

@@ -225,10 +225,8 @@ public class ProductService {
             commodityTypeList = postageFlagList.stream().map(ProductPostageVo::getCommodityType).collect(Collectors.toList());
             for (ProductPostageVo postageVo : postageFlagList) {
                 if (null != postageVo) {
-                    // 是否是仪器 或 设置了运费到付
-                    // 偏远地区到付
-                    if ((null != postageVo.getPostageFlag() && 2 == postageVo.getPostageFlag())
-                            || (null != postageVo.getCommodityType() && 2 == postageVo.getCommodityType())) {
+                    // 设置了运费到付
+                    if ((null != postageVo.getPostageFlag() && 2 == postageVo.getPostageFlag())) {
                         // 到付
                         postageFlag = 2;
                     } else if (null != postageVo.getPostageFlag() && 0 == postageVo.getPostageFlag()) {