新增英文版订单

platform-admin/src/main/java/com/platform/controller/TbCfOrderController.java

@@ -248,8 +248,8 @@ public class TbCfOrderController extends AbstractController {
     public R orderBasic(@PathVariable("orderId") String orderId) {
         //查询列表数据
         OrderBasicVo orderBasicVo = tbCfOrderListService.queryorderBasic(orderId);
-        orderBasicVo.setAtcTime("35天");
-        orderBasicVo.setCountry("赞比亚");
+        orderBasicVo.setAtcTime("35天（day）");
+        orderBasicVo.setCountry("赞比亚（Zambia）");
         orderBasicVo.setSource("APP");
         orderBasicVo.setDeliveryOrderList(tbCfOrderListService.queryOrderDeliveryList(orderId));
         return R.ok().put("orderBasicVo", orderBasicVo);

platform-admin/src/main/webapp/js/common.js

@@ -677,6 +677,25 @@ orderStatusFormat = function (cellvalue) {
     return returnStr;
 };
 
+orderStatusEnFormat = function (cellvalue) {
+    var returnStr = "unknown";
+    if (!!cellvalue) {
+        if (cellvalue == '0') {
+            returnStr = "cancel";
+        } else if (cellvalue == '10') {
+            returnStr = "unpaid";
+        } else if (cellvalue == '20') {
+            returnStr = "paid";
+        } else if (cellvalue == '40') {
+            returnStr = "shipped";
+        } else if (cellvalue == '50') {
+            returnStr = "successful trade";
+        } else if (cellvalue == '60') {
+            returnStr = "transaction closed";
+        }
+    }
+    return returnStr;
+};
 
 /**
  * 支付状态翻译 ，10未支付，20已支付
@@ -712,6 +731,26 @@ deliveryFlagFormat = function (cellvalue) {
     }
     return returnStr;
 }
+/**
+ * 快递状态
+ * @param cellvalue
+ * @returns {string}
+ */
+deliveryFlagEnFormat = function (cellvalue) {
+    var returnStr = "unshipped"
+    if (!!cellvalue || cellvalue == '0') {
+        if (cellvalue == '10') {
+            returnStr = "shipped";
+        } else if (cellvalue == '20') {
+            returnStr = "China warehouse";
+        } else if (cellvalue == '40') {
+            returnStr = "Africa warehouse";
+        } else if (cellvalue == '50') {
+            returnStr = "signed";
+        }
+    }
+    return returnStr;
+}
 /**
  * 用户类型翻译
  * @param cellvalue