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

application/models/Business/Cart/CartService.php

@@ -737,6 +737,13 @@ class CartServiceModel extends \Business\AbstractModel{
                             $deliverySetting['other'] = $deliverTimeList['other']?$deliverTimeList['other']:\Our\ApiConst::zero;
                         }
                     }
+                }else{
+                    $sess=\Yaf\Session::getInstance();
+                    $currentAddress = $sess->get('currentAddress');
+                    $result = \Store\StoreUtil::getInstance()->checkAddressInServiceArea(array('lng'=>$currentAddress['lng'],'lat'=>$currentAddress['lat']),$storeId);
+                    if($result){
+                        $deliverySetting['inServiceAreaFlag'] = \Our\ApiConst::one;
+                    }
                 }
             }else{
                 $deliverySetting['sellerDistribution'] = \Our\ApiConst::zero;

application/models/Business/Order/RefundService.php

@@ -210,6 +210,26 @@ class RefundServiceModel extends \Business\AbstractModel
         $refundReturnDao->db->doRollback();
         return false;
 
+    }
+
+    public function makeRefund($storeId,$refundId){
+        $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
+        $returnDetail=$refundReturnDao->findByRefundId($refundId,$refundReturnDao->refundDetailField);
+        $storeDao=\DAO\StoreModel::getInstance(DbNameConst::masterDBConnectName);
+        if($returnDetail['storeId']!=$storeId){
+            ErrorModel::throwException(CodeConfigModel::notExistRefund);
+        }$updateData=array();
+        $updateData['is_suc_refund']=ApiConst::refundSuccess;
+        $updateData['refund_type']=ApiConst::refundStateComplete;
+        $res=$refundReturnDao->update(array('refund_id'=>$refundId), $updateData);
+        \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),  array(&$refundReturnDao, 'getList'), array(), array($refundId));
+        $storeDao->deleteStoreCache($storeId,$refundId);
+        $storeDao->deleteStoreRefundCache($storeId,$refundId);
+        if($res!==false){
+            return true;
+        }
+        return false;
+
     }
     /**
      * 退货审核页

application/models/Business/Store/StoreService.php

@@ -438,7 +438,11 @@ class StoreServiceModel extends \Business\AbstractModel{
                         }
                     }
                 }
-                $recommendGoods = array_values($recommendGoods);
+                $tempRecommendGoods = array();
+                foreach($tempStcs as $tempStc){
+                    $tempRecommendGoods[] = $recommendGoods[$tempStc['stc_id']];
+                }
+                $recommendGoods = $tempRecommendGoods;
             }
         }
 //        var_dump($recommendGoods);

application/models/DAO/Member.php

@@ -116,9 +116,9 @@ class MemberModel extends \DAO\AbstractModel
   public function saveInfo($data, $memberId)
   {
     $this->setDb(\Our\DbNameConst::masterDBConnectName);
-    if($data['member_name']){
+    /*if($data['member_name']){
       $data['member_name'] = base64_encode($data['member_name']);
-    }
+    }*/
     $result = $this->db->update($this->_tableName)->rows($data)->where(array('member_id' => $memberId))->execute();
     if ($result!==false) {
       $memberDb0Redis = \Redis\Db0\MemberRedisModel::getInstance();

application/models/DAO/Order/RefundReturn.php

@@ -92,6 +92,7 @@ class RefundReturnModel extends \DAO\AbstractModel
     public function update($where, $data)
     {
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        $data['gmt_update']=TIMESTAMP;
         return $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
     }
 

application/models/DAO/ShortMessage.php

@@ -114,7 +114,7 @@ class ShortMessageModel {
      * @throws \Exception
      */
     public function validCode($where){
-        if($where['code']=='666666'){
+        if($where['code']=='666666'&&(APP_ENV=='test'||APP_ENV=='develop'||APP_ENV=='pre')){
             return true;
         }
         $this->validateValidCodeData($where);

application/models/DAO/Store.php

@@ -366,12 +366,13 @@ class StoreModel extends \DAO\AbstractModel
         }
         if ($storeInfo['open_flag'] != 1 || $storeInfo['store_state'] != 1) {
             if ($reportError) {
-                if($storeInfo['open_flag'] != 1) {
+                /*if($storeInfo['open_flag'] != 1) {
 //                    \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotOpen);
                     \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotExistOrClose);
                 }else{
                     \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotExistOrClose);
-                }
+                }*/
+                \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotExistOrClose1);
             } else {
                 $storeInfo['isClose'] = 1;
             }

application/modules/Client/controllers/Shopkeeper.php

@@ -268,6 +268,14 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
 
     }
 
+    //标记为已退款
+    public function makeRefundAction(){
+        $refundService=\Business\Order\RefundServiceModel::getInstance();
+       if( $refundService->makeRefund($this->storeId,$this->req['data']['refundId'])){
+           $this->success('操作成功');
+       };
+        ErrorModel::throwException(CodeConfigModel::commonError);
+    }
     /**
      * 拒绝退款
      */

conf/application.ini

@@ -404,7 +404,7 @@ elastic.master.scheme="http";
 resources.database.params.driver   = "pdo_mysql"
 resources.database.params.hostname = "127.0.0.1"
 resources.database.params.port     = 3306
-resources.database.params.database = "testqmcs"
+resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
 resources.database.params.password = "123456"
 resources.database.params.charset  = "UTF8"
@@ -414,7 +414,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
 resources.database.slave.params.driver   = "pdo_mysql"
 resources.database.slave.params.hostname = "127.0.0.1"
 resources.database.slave.params.port     = 3306
-resources.database.slave.params.database = "testqmcs"
+resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"
 resources.database.slave.params.password = "123456"
 resources.database.slave.params.charset  = "UTF8"