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

application/models/Business/Goods/GroupSaleService.php

@@ -253,7 +253,10 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
             $storeIds = $cartListData['storeIds'];
             $newResult = array();
             foreach($storeIds as $key){
-                $newResult[] = $result[$key];
+                $tempReturnCart = $result[$key];
+                $tempStore = $storeDao->get($key,false);
+                $tempReturnCart['inAreaFlag'] = $storeDao->checkAddressInServiceArea($address,$tempStore);
+                $newResult[] = $tempReturnCart;
             }
             return array('totalCount'=>count($storeCartList),'list'=>$newResult);
         }

application/models/Business/Message/MessageService.php

@@ -171,6 +171,14 @@ class MessageServiceModel extends \Business\AbstractModel
             $toMember = $this->getUserByMemberIdAndSelfType($val['toId'], $val['toType']);
             $val['message'] = unserialize($val['message']);
             $val['toAvatar'] = $self['avatar'];
+            foreach($val['message']['buttons'] as &$button){
+                if($button['type']==ApiConst::messageButtonTypeConfirmButton || $button['type']==ApiConst::messageButtonTypeReciverButton){
+                    $timeDiff=TIMESTAMP-$val['message']['createTime'];
+                    if($timeDiff>(ApiConst::tenMinSecond-ApiConst::oneMinute)){
+                        $button['showType']=ApiConst::messageButtonShowTypeGray;
+                    }
+                }
+            }
             $val['fromAvatar'] = $toMember['avatar'];
 //                $val['toAvatar']=$this->getAvatar($val['toType'],$val['toId']);
 //                $val['fromAvatar']=$this->getAvatar($val['fromType'],$val['fromId']);

application/models/DAO/Coupon/Coupon.php

@@ -419,11 +419,12 @@ class CouponModel extends \DAO\AbstractModel {
         $gcPrices = array();
         $goodsCommonPrices = array();
         foreach($goodsList as $goods){
-            $goodsNum = $goods['goodsNum'];
             if($goods['type']== \Our\ApiConst::addGoodsToCart){
+
+                $goodsNum = $goods['goodsNum'];
                 if(strpos($giftGoodsIds,','.$goods['goodsCommonId'].',')!==false){
                     $giftGoodsAmount += $goods['goodsPrice'];
-                    $goodsNum = $goods['goodsNum']-\Our\ApiConst::one;
+                    $goodsNum = $goodsNum-\Our\ApiConst::one;
                 }
                 if($goodsNum>\Our\ApiConst::zero){
                     if(isset($gcPrices[$goods['gcId']])){