Commit d62122d6 authored by liuyuzhen's avatar liuyuzhen

首页地址返回经纬度

parent b8e366d0
...@@ -221,7 +221,7 @@ class OrderConfirmUtil { ...@@ -221,7 +221,7 @@ class OrderConfirmUtil {
\Error\ErrorModel::throwException(\Error\CodeConfigModel::noExpressDeliveryForOrder); \Error\ErrorModel::throwException(\Error\CodeConfigModel::noExpressDeliveryForOrder);
} }
if($tempStore['goodsFreight']==\Our\ApiConst::zero&&!($tempStore['is_transport']&&$tempStore['transport_id']>\Our\ApiConst::zero&&isset($temp['shippingFee']))){ if($tempStore['goodsFreight']==\Our\ApiConst::zero&&!($tempStore['is_transport']&&$tempStore['transport_id']>\Our\ApiConst::zero&&isset($temp['shippingFee']))){
\Error\ErrorModel::throwException(\Error\CodeConfigModel::noExpressDeliveryForOrder1); \Error\ErrorModel::throwException(\Error\CodeConfigModel::noExpressDeliveryForOrder);
} }
$deliveryFee = $temp['shippingFee']; $deliveryFee = $temp['shippingFee'];
} }
......
...@@ -271,8 +271,6 @@ class CodeConfigModel { ...@@ -271,8 +271,6 @@ class CodeConfigModel {
const notExsitOrder=300112; const notExsitOrder=300112;
const alreadyExsitRefundGoods=300113; const alreadyExsitRefundGoods=300113;
const notAllowDelete=300114; const notAllowDelete=300114;
const noExpressDeliveryForOrder1 = 300115;
//店铺相关错误码 //店铺相关错误码
//商品分类 //商品分类
...@@ -736,7 +734,6 @@ class CodeConfigModel { ...@@ -736,7 +734,6 @@ class CodeConfigModel {
self::blGoodsStorageToCacheFailedForOrder => '组合销售库存更新失败(cache)', self::blGoodsStorageToCacheFailedForOrder => '组合销售库存更新失败(cache)',
self::goodsStorageToCacheFailedForOrder => '普通商品库存更新失败(cache)', self::goodsStorageToCacheFailedForOrder => '普通商品库存更新失败(cache)',
self::notExistOrderGoods => '退款商品不存在', self::notExistOrderGoods => '退款商品不存在',
self::noExpressDeliveryForOrder1=>'test123',
//销售员 //销售员
self::emptySaleGoodsId=>'商品id不能为空', self::emptySaleGoodsId=>'商品id不能为空',
self::emptySaleGoods=>'销售商品不存在', self::emptySaleGoods=>'销售商品不存在',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment