Authored by chenchao

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

... ... @@ -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;
}
... ...