bugfix

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

@@ -289,7 +289,7 @@ public class OrderUtils {
                 if (fee >= 700) {
                     other = fee - 700;
                 }
-                coldString = "￥ " + fee + "(冷链费: ￥ 700 ";
+                coldString = "￥ " + fee + "(冷链费: ￥ 700.00 ";
             }
             if (itemCount > 1) {
                 otherString = "-1".equals(freePostFlag) ? ", 其他: 到付)" : "0".equals(freePostFlag) ? ", 其他: 包邮)" :
@@ -297,6 +297,10 @@ public class OrderUtils {
             } else {
                 coldString += ")";
             }
+            if (0 == isColdChina && 1 == itemCount) {
+                coldString = "￥ 0.00";
+                otherString = "";
+            }
             order.setPostageInfo(coldString + otherString);
         } else {
             /**
@@ -304,7 +308,7 @@ public class OrderUtils {
              */
             otherString = "-1".equals(freePostFlag) ? "到付" :
                     "0".equals(freePostFlag) ? "包邮" :
-                            "1".equals(freePostFlag) ? "￥ 0" : "";
+                            "1".equals(freePostFlag) ? "￥ 0.00" : "";
             order.setPostageInfo(otherString);
         }
         return order;
@@ -563,7 +567,7 @@ public class OrderUtils {
                 if (fee >= 700) {
                     other = fee - 700;
                 }
-                coldString = "￥ " + fee + "(冷链费: ￥ 700 ";
+                coldString = "￥ " + fee + "(冷链费: ￥ 700.00 ";
             }
             if (itemCount > 1) {
                 otherString = "-1".equals(freePostFlag) ? ", 其他: 到付)" : "0".equals(freePostFlag) ? ", 其他: 包邮)" :
@@ -571,6 +575,10 @@ public class OrderUtils {
             } else {
                 coldString += ")";
             }
+            if (0 == isColdChina && 1 == itemCount) {
+                coldString = "￥ 0.00";
+                otherString = "";
+            }
             detail.setPostageInfo(coldString + otherString);
         } else {
             /**
@@ -578,7 +586,7 @@ public class OrderUtils {
              */
             otherString = "-1".equals(freePostFlag) ? "到付" :
                     "0".equals(freePostFlag) ? "包邮" :
-                            "1".equals(freePostFlag) ? "￥ 0" : "";
+                            "1".equals(freePostFlag) ? "￥ 0.00" : "";
             detail.setPostageInfo(otherString);
         }
     }
@@ -604,7 +612,7 @@ public class OrderUtils {
                 if (fee >= 700) {
                     other = fee - 700;
                 }
-                coldString = "￥ " + fee + "(冷链费: ￥ 700 ";
+                coldString = "￥ " + fee + "(冷链费: ￥ 700.00 ";
             }
             if (itemCount > 1) {
                 otherString = "-1".equals(freePostFlag) ? ", 其他: 到付)" : "0".equals(freePostFlag) ? ", 其他: 包邮)" :
@@ -612,6 +620,10 @@ public class OrderUtils {
             } else {
                 coldString += ")";
             }
+            if (0 == isColdChina && 1 == itemCount) {
+                coldString = "￥ 0.00";
+                otherString = "";
+            }
             s.setPostageInfo(coldString + otherString);
         } else {
             /**
@@ -619,7 +631,7 @@ public class OrderUtils {
              */
             otherString = "-1".equals(freePostFlag) ? "到付" :
                     "0".equals(freePostFlag) ? "包邮" :
-                            "1".equals(freePostFlag) ? "￥ 0" : "";
+                            "1".equals(freePostFlag) ? "￥ 0.00" : "";
             s.setPostageInfo(otherString);
         }
     }