Commit ce51d921 authored by wwccw0591's avatar wwccw0591

pc

parent 7a11f213
...@@ -498,6 +498,8 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -498,6 +498,8 @@ class OrderServiceModel extends \Business\AbstractModel
$delivery['mobPhone'] = $delivery['reciverInfo']['mob_phone']; $delivery['mobPhone'] = $delivery['reciverInfo']['mob_phone'];
$delivery['getTime'] = $value['getTime']; $delivery['getTime'] = $value['getTime'];
$delivery['finishTime'] = $value['finishTime']; $delivery['finishTime'] = $value['finishTime'];
$delivery['mobPhone']= $delivery['mobPhone']? $delivery['mobPhone']:'';
$delivery['finishTime']= $delivery['finishTime']? $delivery['finishTime']:ApiConst::zero;
$delivery['orderGoods'] = $orderGoods; $delivery['orderGoods'] = $orderGoods;
$delivery['street'] = $delivery['reciverInfo']['address'] . $delivery['reciverInfo']['street']; $delivery['street'] = $delivery['reciverInfo']['address'] . $delivery['reciverInfo']['street'];
$delivery['lng'] = $delivery['reciverInfo']['lng']?$delivery['reciverInfo']['lng']:0.0; $delivery['lng'] = $delivery['reciverInfo']['lng']?$delivery['reciverInfo']['lng']:0.0;
......
...@@ -386,6 +386,10 @@ class GoodsModel extends \DAO\AbstractModel { ...@@ -386,6 +386,10 @@ class GoodsModel extends \DAO\AbstractModel {
}else{ }else{
$goods['goodsAttr']=array(); $goods['goodsAttr']=array();
} }
if(isset($goods['refundStateName'])){
$goods['refundStateName']= $goods['refundStateName']? $goods['refundStateName']:'';
}
unset($goods['goodsSpec']); unset($goods['goodsSpec']);
if(isset($goods['goodsGroup'])&&!empty($goods['goodsGroup'])){ if(isset($goods['goodsGroup'])&&!empty($goods['goodsGroup'])){
$goods['goodsGroup']=$this->getGoodsGroup($goods['goodsGroup']); $goods['goodsGroup']=$this->getGoodsGroup($goods['goodsGroup']);
......
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