运费

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

@@ -298,12 +298,12 @@ public class OrderUtils {
         NewShopOrder shopOrder = shopOrderDao.findColdChain(order.getOrderId());
 
         if (null != shopOrder) {
-            shopOrder.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
+            order.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
         } else {
             /**
              *  没有运费订单
              */
-            shopOrder.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
+            order.setPostageInfo("￥ 0.00");
         }
 
         if(null!=order.getNewShopOrders()){
@@ -630,12 +630,12 @@ public class OrderUtils {
         NewShopOrder shopOrder = shopOrderDao.findColdChain(detail.getShopOrders().get(0).getOrderId());
 
         if (null != shopOrder) {
-            shopOrder.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
+            order.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
         } else {
             /**
              *  没有运费订单
              */
-            shopOrder.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
+            order.setPostageInfo("￥ 0.00");
         }
     }
 
@@ -644,12 +644,12 @@ public class OrderUtils {
         NewOrder order = newOrderDao.get(s.getOrderId().toString());
         NewShopOrder shopOrder = shopOrderDao.findColdChain(s.getOrderId());
         if (null != shopOrder) {
-            shopOrder.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
+            order.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
         } else {
             /**
              *  没有运费订单
              */
-            shopOrder.setPostageInfo("2".equals(shopOrder.getShopPostFlag()) ?"到付": "0".equals(shopOrder.getShopPostFlag())?"包邮":"￥" + shopOrder.getShopPostFee());
+            order.setPostageInfo("￥ 0.00");
         }
     }
 

src/main/resources/mapper/NewShopOrderMapper.xml

@@ -568,7 +568,7 @@
     </select>
 
     <select id="findColdChain" resultType="com.caimei.modules.order.entity.NewShopOrder">
-        select ifnull(totalAmount, 0) as freePostageFee,ifnull(isColdChina,0) as isColdChina,
+        select ifnull(totalAmount, 0) as freePostageFee,ifnull(isColdChina,0) as isColdChina, ifnull(shopPostFlag, 0) as shopPostFlag, ifnull(shopPostFee, 0) as shopPostFee,
         (SELECT COUNT(orderProductId) FROM cm_order_product WHERE orderid=#{orderId} AND shopId !=998) AS itemCount
         from cm_shop_order
         where shopId = 998