Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

application/controllers/Store.php

@@ -13,7 +13,8 @@ class StoreController extends \Our\Controller_AbstractIndex {
      * 获取店铺首页头部(公用)
      */
     public function getStoreInfoAction(){
-        $storeInfo = $this->storeService->getStoreInfo($this->req[\Our\NameConst::data],$this->memberId);
+        $address = \Business\User\AddressServiceModel::getInstance()->getMyAddress($this->req[\Our\NameConst::data],$this->memberId);
+        $storeInfo = $this->storeService->getStoreInfo($this->req[\Our\NameConst::data],$this->memberId, $address);
         //.
         $storeInfo['adv'] = array('href'=>'','imageUrl'=>'http://qmoss-01.oss-cn-hangzhou.aliyuncs.com/data/upload/mall/adv/05715960161498410.jpg');
         $storeInfo['share'] = \Business\Common\CommonServiceModel::getInstance()->getShareInfo(\Our\ApiConst::shareStore,$this->req[\Our\NameConst::data]['storeId']);

application/models/Business/Order/OrderService.php

@@ -179,6 +179,8 @@ class OrderServiceModel extends \Business\AbstractModel
             } else {
                 ErrorModel::throwException(CodeConfigModel::orderDeleteError);
             }
+        }else{
+            ErrorModel::throwException(CodeConfigModel::notAllowCancel);
         }
 
     }

application/models/Business/Store/StoreService.php

@@ -37,13 +37,18 @@ class StoreServiceModel extends \Business\AbstractModel{
      * @param $store_id
      * @param $memberId
      */
-    public function getStoreInfo($param,$memberId){
+    public function getStoreInfo($param,$memberId,$address){
         $storeId = intval($param['storeId']);
         if(!$storeId){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyStoreId);
         }
-        $lng = $param['lng'];
-        $lat = $param['lat'];
+        if($address) {
+            $lng = $address['lng'];
+            $lat = $address['lat'];
+        }else{
+            $lng = $param['lng'];
+            $lat = $param['lat'];
+        }
         if(!$lng || !$lat){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyLatLngParam);
         }

application/models/DAO/Order/Order.php

@@ -736,7 +736,7 @@ class OrderModel extends \DAO\AbstractModel
 
             //放入回收站
             case NameConst::delete:
-                $state = in_array($orderInfo['orderState'], array(ApiConst::orderStateCancel, ApiConst::orderStateComplete)) && $orderInfo['deleteState'] == ApiConst::zero;
+                $state = in_array($orderInfo['orderState'], array(ApiConst::orderStateCancel, ApiConst::orderStateComplete,ApiConst::orderStateClose)) && $orderInfo['deleteState'] == ApiConst::zero;
                 $this->errorMessage = CodeConfigModel::deleteError;
                 break;
 

application/models/Error/CodeConfig.php

@@ -270,6 +270,7 @@ class CodeConfigModel {
     const notExsitDeliver=300111;
     const notExsitOrder=300112;
     const alreadyExsitRefundGoods=300113;
+const notAllowDelete=300114;
     //店铺相关错误码
 
     //商品分类
@@ -664,6 +665,7 @@ class CodeConfigModel {
             self::notExsitDeliver=>'配送单不存在',
             self::notExsitOrder=>'订单不存在',
             self::alreadyExsitRefundGoods=>'退款订单已经存在',
+            self::notAllowDelete=>'当前订单状态不允许删除',
             self::deleteError=>'放入回收站失败，订单状态有误',
             self::restoreError=>'永久删除、从回收站还原失败，订单状态有误',
             self::shareError=>'分享失败，订单状态有误',