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

application/library/Our/DescribeConst.php

@@ -113,6 +113,7 @@ class DescribeConst
     const couponFullForGift = '满{0}送礼品券';
     const noLimitGoodsCouponName = '元无门槛';
     const available = '可用';
+    const minus = '减';
 
 
     const couponTitleFullAvailAbleNoAmountLimit = '全场减{0}';//无门槛减免券

application/models/Business/Coupon/CouponService.php

@@ -304,7 +304,7 @@ class CouponServiceModel extends \Business\AbstractModel{
                 if($coupon['type'] == \Our\ApiConst::noLimitCouponType){
                     $couponTitles[] = $coupon['title'].\Our\DescribeConst::noLimitGoodsCouponName;
                 }else if($coupon['type'] == \Our\ApiConst::fullMinusCouponType){
-                    $couponTitles[] = str_replace(\Our\DescribeConst::available,$coupon['title'],$coupon['subTitle']);
+                    $couponTitles[] = str_replace(\Our\DescribeConst::available,\Our\DescribeConst::minus.$coupon['title'],$coupon['subTitle']);
                 }else{
                     $couponTitles[] = $coupon['subTitle'];
                 }

application/models/Business/Goods/GoodsClassService.php

@@ -255,7 +255,7 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
     public function getStoreTopClasses($data){
         $storeOnlineGoodsClassDao = \DAO\GoodsClass\StoreOnlineGoodsClassModel::getInstance();
         $storeOnlineGoodsClassDao->checkStoreTopClasses($data);
-        $list = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreOnlineGoodsClassRedisModel::getInstance(),array(&$storeOnlineGoodsClassDao, 'getList'),array(array('store_id'=>$data['storeId']),'distinct(gc_id_1) as gcId'),\Our\ApiConst::oneHour);
+        $list = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreOnlineGoodsClassRedisModel::getInstance(),array(&$storeOnlineGoodsClassDao, 'getList'),array(array('store_id'=>$data['storeId']),'distinct(gc_id_1) as gcId'),\Our\ApiConst::oneHour,array($data['storeId']));
         $returnClasses = array();
         if($list){
             $goodsClassDao = \DAO\GoodsClassModel::getInstance();

application/models/Business/Order/OrderService.php

@@ -300,7 +300,6 @@ class OrderServiceModel extends \Business\AbstractModel
             $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateComplete, TRUE);
             if ($res) {
                 $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id']);
-                \Our\RedisHelper::memberTotalFromStateToState($memberId, $order['order_state'], ApiConst::orderStateComplete);
                 return true;
             } else {
                 ErrorModel::throwException(CodeConfigModel::receiveError);

application/models/Business/User/AddressService.php

@@ -70,6 +70,7 @@ class AddressServiceModel extends \Business\AbstractModel {
                 if($currentAddress['addressId']&&$currentAddress['chooseFlag']){
                     $address['addressId'] = $currentAddress['addressId'];
                     $address['address'] = $currentAddress['address'];
+                    $address['name'] = $currentAddress['name'];
                     $address['tagType'] = $currentAddress['tagType'];
                     $addresses[] = $address;
                     $returnAddress = array('returnAddressId'=>$currentAddress['addressId'],'choosedAddressFlag'=>$currentAddress['chooseFlag'],'addresses'=>$addresses);
@@ -105,6 +106,7 @@ class AddressServiceModel extends \Business\AbstractModel {
         $sess = \Yaf\Session::getInstance();
         $newAddress['addressId'] = $address['addressId'];
         $newAddress['address'] = $address['address'];
+        $newAddress['name'] = $address['name'];
         $newAddress['tagType'] = $address['tagType'];
         $returnAddresses[] = $newAddress;
         $choosedAddressId = $address['addressId'];
@@ -182,6 +184,7 @@ class AddressServiceModel extends \Business\AbstractModel {
                 $address = array();
                 $address['addressId']= $newAddressList[$pos]['address_id'];
                 $address['address']= $newAddressList[$pos]['address'];
+                $address['name'] = $newAddressList[$pos]['name'];
                 $address['tagType']= $newAddressList[$pos]['tag_type'];
                 $choosedAddressId = $address['addressId'];
                 $newAddress = $address;
@@ -246,6 +249,7 @@ class AddressServiceModel extends \Business\AbstractModel {
                     $temp = array();
                     $temp['addressId'] = $tempAddr['addressId'];
                     $temp['address'] = $tempAddr['address'];
+                    $temp['name'] = $tempAddr['name'];
                     $temp['tagType'] = $tempAddr['tagType'];
                     $returnAddressList[] = $temp;
                 }
@@ -369,6 +373,7 @@ class AddressServiceModel extends \Business\AbstractModel {
             'lng',
             'lat',
             'address',
+            'name',
             'citycode',
             'tag_type'
         );

application/models/DAO/GoodsClass/StoreOnlineGoodsClass.php

@@ -27,7 +27,8 @@ class StoreOnlineGoodsClassModel extends \DAO\AbstractModel{
 
     public function getList($where,$field = \Our\NameConst::allField){
         $this->setDb($this->dbName);
-        return $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
+        $result = $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
+        return $result;
     }
 
 

application/models/DAO/Order/Order.php

@@ -244,6 +244,7 @@ class OrderModel extends \DAO\AbstractModel
         }
         $where = $this->db->getSqlWhereByArray($where);
         $data['order_state'] = $status;
+        $data['finnshed_time']=TIMESTAMP;
         if ($isConfirm) {
             $data['shipping_over'] = ApiConst::shippingOver;
         }
@@ -785,6 +786,9 @@ class OrderModel extends \DAO\AbstractModel
             $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
             $orderGoodsDao->deleteOrderGoodsCache($memberId, $orderId);
             \DAO\MemberModel::getInstance()->deleteTotalCache($memberId);
+            $orderCommonDao= \DAO\Order\OrderCommonModel::getInstance(DbNameConst::masterDBConnectName);
+            \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array($orderId, $orderCommonDao->orderCommonField));
+
         }
         if (!empty($stroeId)) {
             if ($deleteGetShopKeeperCountByStoreId) {
@@ -795,6 +799,7 @@ class OrderModel extends \DAO\AbstractModel
                 $favoritesStoreDao->deleteGetFavoritesCountByStoreId($stroeId);
             }
         }
+        return true;
 
     }
 

public/index.php

@@ -7,7 +7,7 @@ define("APP_ENV",ini_get('yaf.environ'));
 if(APP_ENV=='develop'){
     error_reporting(E_ALL);
 }
-if(APP_ENV=='test' || APP_ENV=='pre'){
+if(APP_ENV=='test' || APP_ENV=='pre' ||APP_ENV=='ccwdevelop'){
     if(isset($_POST['data']['debug'])&&!empty($_POST['data']['debug'])){
         error_reporting(E_ALL);
     }else{