运费

src/main/java/com/caimei/modules/order/util/OrderUtils.java

@@ -297,43 +297,13 @@ public class OrderUtils {
     public NewOrder setOrderPostInfo(NewOrder order) {
         NewShopOrder shopOrder = shopOrderDao.findColdChain(order.getOrderId());
 
-        String freePostFlag = order.getFreePostFlag();
-        String otherString = "";
-        String coldString = "";
         if (null != shopOrder) {
-            Integer itemCount = shopOrder.getItemCount();
-            Integer isColdChina = shopOrder.getIsColdChina();
-            // 冷链费商品运费模板配置运费
-            Double freightAmount = shopOrderDao.getFreightAmount(7578);
-            /**     拼接运费信息--联合丽格
-             *      itemCount > 1,有不止一个商品
-             *      有冷链费 且不止一个商品的时候,显示其他商品运费,否则不显示
-             *      isColdChina 0 不包含冷链费用,1包含
-             */
-            double fee = shopOrder.getFreePostageFee() != null ? shopOrder.getFreePostageFee() : 0;
-            double other = 0d;
-            if (1 == isColdChina) {
-                if (fee >= freightAmount) {
-                    other = fee - freightAmount;
-                }
-                coldString = "￥ " + fee + "(冷链费: ￥ " + freightAmount;
-            }
-            if (itemCount > 1) {
-                otherString = "2".equals(freePostFlag) ? ", 其他: 到付)" : "0".equals(freePostFlag) ? ", 其他: 包邮)" :
-                        "1".equals(freePostFlag) ? "，其他: ￥" + other + ")" : "";
-            } else {
-                coldString += ")";
-            }
-            if (0 == isColdChina && 1 == itemCount) {
-                coldString = "￥ "+fee;
-                otherString = "";
-            }
-            order.setPostageInfo(coldString + otherString);
+            shopOrder.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
         } else {
             /**
              *  没有运费订单
              */
-            order.setPostageInfo("￥ 0.00");
+            shopOrder.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
         }
 
         if(null!=order.getNewShopOrders()){
@@ -347,23 +317,8 @@ public class OrderUtils {
                         , newShopOrder.getReceiptAmount());
                 newShopOrder.setRestAmount(sub.doubleValue());
 
-                Double ColdChina = shopOrderDao.getFreightAmount(7578);
-                String shopPostFlag = newShopOrder.getShopPostFlag()!=null?newShopOrder.getShopPostFlag():"-2";
-                String PostageInfo = null;
-                if (null!=newShopOrder.getIsColdChina()&&newShopOrder.getIsColdChina()==1) {
-                    if ("2".equals(newShopOrder.getShopPostFlag())) {
-                        // 到付
-                        PostageInfo = "￥" + ColdChina + "(" + (newShopOrder.getIsColdChina()==1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 到付)";
-                    } else if ("0" .equals(newShopOrder.getShopPostFlag())) {
-                        // 包邮
-                        PostageInfo = "￥" + ColdChina+ "(" + (newShopOrder.getIsColdChina()==1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: 包邮)";
-                    } else {
-                        // 有运费
-                        PostageInfo = "￥" +newShopOrder.getShopPostFee() + "(" + (newShopOrder.getIsColdChina()==1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + MathUtil.sub(newShopOrder.getShopPostFee(), ColdChina)+ ")";
-                    }
-                } else {
-                    PostageInfo = shopPostFlag.equals("2") ? "到付" : shopPostFlag.equals("0") ? "包邮" : "￥" + newShopOrder.getShopPostFee();
-                }
+                String shopPostFlag = newShopOrder.getShopPostFlag()!=null?newShopOrder.getShopPostFlag():"2";
+                String PostageInfo = shopPostFlag.equals("2") ? "到付" : shopPostFlag.equals("0") ? "包邮" : "￥" + newShopOrder.getShopPostFee();
                 //支付凭证
                 List<Voucher> vouchers = newOrderService.findVoucher(newShopOrder.getShopOrderId());
                 newShopOrder.setPostageInfo(PostageInfo);
@@ -674,43 +629,13 @@ public class OrderUtils {
         NewOrder order = newOrderDao.get(detail.getShopOrders().get(0).getOrderId().toString());
         NewShopOrder shopOrder = shopOrderDao.findColdChain(detail.getShopOrders().get(0).getOrderId());
 
-        String freePostFlag = order.getFreePostFlag();
-        String otherString = "";
-        String coldString = "";
         if (null != shopOrder) {
-            Integer itemCount = shopOrder.getItemCount();
-            Integer isColdChina = shopOrder.getIsColdChina();
-            // 冷链费商品运费模板配置运费
-            Double freightAmount = shopOrderDao.getFreightAmount(7578);
-            /**     拼接运费信息--联合丽格
-             *      itemCount > 1,有不止一个商品
-             *      有冷链费 且不止一个商品的时候,显示其他商品运费,否则不显示
-             *      isColdChina 0 不包含冷链费用,1包含
-             */
-            double fee = shopOrder.getFreePostageFee() != null ? shopOrder.getFreePostageFee() : 0;
-            double other = 0d;
-            if (1 == isColdChina) {
-                if (fee >= freightAmount) {
-                    other = fee - freightAmount;
-                }
-                coldString = "￥ " + fee + "(冷链费: ￥ " + freightAmount;
-            }
-            if (itemCount > 1) {
-                otherString = "2".equals(freePostFlag) ? ", 其他: 到付)" : "0".equals(freePostFlag) ? ", 其他: 包邮)" :
-                        "1".equals(freePostFlag) ? "，其他: ￥" + other + ")" : "";
-            } else {
-                coldString += ")";
-            }
-            if (0 == isColdChina && 1 == itemCount) {
-                coldString = "￥ " + fee;
-                otherString = "";
-            }
-            detail.setPostageInfo(coldString + otherString);
+            shopOrder.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
         } else {
             /**
              *  没有运费订单
              */
-            detail.setPostageInfo("￥ 0.00");
+            shopOrder.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
         }
     }
 
@@ -718,43 +643,13 @@ public class OrderUtils {
     public void setShopPostInfo(NewShopOrder s) {
         NewOrder order = newOrderDao.get(s.getOrderId().toString());
         NewShopOrder shopOrder = shopOrderDao.findColdChain(s.getOrderId());
-        String freePostFlag = order.getFreePostFlag();
-        String otherString = "";
-        String coldString = "";
         if (null != shopOrder) {
-            Integer itemCount = shopOrder.getItemCount();
-            Integer isColdChina = shopOrder.getIsColdChina();
-            // 冷链费商品运费模板配置运费
-            Double freightAmount = shopOrderDao.getFreightAmount(7578);
-            /**     拼接运费信息--联合丽格
-             *      itemCount > 1,有不止一个商品
-             *      有冷链费 且不止一个商品的时候,显示其他商品运费,否则不显示
-             *      isColdChina 0 不包含冷链费用,1包含
-             */
-            double fee = shopOrder.getFreePostageFee() != null ? shopOrder.getFreePostageFee() : 0;
-            double other = 0d;
-            if (1 == isColdChina) {
-                if (fee >= freightAmount) {
-                    other = fee - freightAmount;
-                }
-                coldString = "￥ " + fee + "(冷链费: ￥ " + freightAmount;
-            }
-            if (itemCount > 1) {
-                otherString = "2".equals(freePostFlag) ? ", 其他: 到付)" : "0".equals(freePostFlag) ? ", 其他: 包邮)" :
-                        "1".equals(freePostFlag) ? "，其他: ￥" + other + ")" : "";
-            } else {
-                coldString += ")";
-            }
-            if (0 == isColdChina && 1 == itemCount) {
-                coldString = "￥ " + fee;
-                otherString = "";
-            }
-            s.setPostageInfo(coldString + otherString);
+            shopOrder.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
         } else {
             /**
              *  没有运费订单
              */
-            s.setPostageInfo("￥ 0.00");
+            shopOrder.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
         }
     }