联合丽格V1.0.2

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1330,6 +1330,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                     }
                     //拼接运费
                     Double ColdChina = Double.valueOf(700);
+                    String shopPostFlag = shopOrder.getShopPostFlag()!=null?shopOrder.getShopPostFlag():"-2";
                     String PostageInfo = null;
                     if (null != shopOrder.getIsColdChina() && shopOrder.getIsColdChina() == 1) {
                         if ("2" == shopOrder.getShopPostFlag()) {
@@ -1343,7 +1344,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                             PostageInfo = "￥" + MathUtil.add(shopOrder.getShopPostFee(), ColdChina) + "(" + (shopOrder.getIsColdChina() == 1 ? "冷链费: ￥" + ColdChina + "," : "") + "其他: ￥" + shopOrder.getShopPostFee() + ")";
                         }
                     } else {
-                        PostageInfo = shopOrder.getShopPostFlag().equals("2") ? "到付" : shopOrder.getShopPostFlag().equals("0") ? "包邮" : "￥" + shopOrder.getShopPostFee();
+                        PostageInfo = shopPostFlag.equals("2") ? "到付" : shopPostFlag.equals("0") ? "包邮" : "￥" + shopOrder.getShopPostFee();
                     }
 
                     //支付凭证