Merge branch 'hotfix_现货寄存订单发货变更' into test6.9.13

chenchao
Commit d48b46d9642d24d7ad0caaedf2f086bb15d51fff 2 parents 8b21f185 5adcf681
Showing 1 changed file with 11 additions and 1 deletions
order/src/main/java/com/yohoufo/order/service/support/ShoppingSupport.java
--- a/order/src/main/java/com/yohoufo/order/service/support/ShoppingSupport.java
View file @d48b46d
+++ b/order/src/main/java/com/yohoufo/order/service/support/ShoppingSupport.java
View file @d48b46d
@@ -105,7 +105,17 @@ public class ShoppingSupport {
     private String getDeliveryWayStr(int deliveryWay) {
-        return deliveryWay == DeliveryWayEnum.SELF_FETCH.getCode() ? OrderConstant.DELIVERY_WAY_STORE_NAME : OrderConstant.DELIVERY_WAY_SF_NAME;
+        String deliverWayName;
+
+        if (deliveryWay == DeliveryWayEnum.SELF_FETCH.getCode()){
+            deliverWayName = OrderConstant.DELIVERY_WAY_STORE_NAME;
+        }else if(deliveryWay == DeliveryWayEnum.OVERSEAS_HONGHONG.getCode()){
+            //中通国际 TODO 加到model
+            deliverWayName = "中通国际";
+        }else{
+            deliverWayName = OrderConstant.DELIVERY_WAY_SF_NAME;
+        }
+        return deliverWayName;
     }