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

application/models/Business/Coupon/CouponService.php

@@ -246,7 +246,7 @@ class CouponServiceModel extends \Business\AbstractModel{
         }
         $memberCouponDao = \DAO\Coupon\MemberCouponModel::getInstance($dbName);
         if($coupon['is_overlay']){//允许领用多张的优惠券是否存在已经领取的未使用有效优惠券
-            $whereSql = ' coupon_state ='.\Our\ApiConst::couponUnused.' and member_id ='.$memberId.' and out_time > '.time();
+            $whereSql = ' coupon_state ='.\Our\ApiConst::couponUnused.' and member_id ='.$memberId.' and coupon_id='.$coupon['id'].' and out_time > '.time();
             //$memberCoupons = \Our\RedisHelper::cachedFunction(\Redis\Db13\MemberCouponRedisModel::getInstance(), array(&$memberCouponDao, 'getList'),array($whereSql),\Our\ApiConst::oneHour,array($where['couponId']));
             $memberCoupons = $memberCouponDao->getList($whereSql);
         }else{//不允许领用多张的优惠券

application/models/Business/Goods/EvaluationService.php

@@ -74,9 +74,7 @@ class EvaluationServiceModel extends \Business\AbstractModel {
             //$images = $this->_upload($v['images']);
             $images = $v['images'];
             if(!is_array($images)) $images = json_decode($images, true);
-            if(is_array($images) && empty($images)) {
-                $images = null;
-            }
+            if(empty($images)) $images = null;
             $images ? $data['goods'][$k]['haveImg'] = 1 : $data['goods'][$k]['haveImg'] = 0;
             if($data['goods'][$k]['haveImg'] == 1) {
                 foreach ($images as &$image) {

application/models/Business/Order/OrderService.php

@@ -894,7 +894,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 $orderSubTips = \Our\DescribeConst::payFailedSubTips;
                 $orderState = \Our\ApiConst::zero;
                 break;
-            } else if ($order['payment_type'] != \Our\ApiConst::payOnline && $order['order_state'] == \Our\ApiConst::orderStateWaitConfirm) {//已下单的待线上支付订单
+            } else if (($order['payment_type'] == \Our\ApiConst::payOffline||$order['payment_type'] == \Our\ApiConst::payAog) && $order['order_state'] == \Our\ApiConst::orderStateWaitConfirm) {//已下单的待线上支付订单
                 $orderTips = \Our\DescribeConst::addOrderSuccessTips;
                 $store = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($order['store_id']), \Our\ApiConst::oneHour);
                 $orderContent['storeName'] = $store['store_name'];

application/models/DAO/GoodsCommon.php

@@ -183,9 +183,9 @@ class GoodsCommonModel extends \DAO\AbstractModel {
     public function getCount($where,$attrStr=''){
         $this->setDb($this->dbName);
         if($attrStr){
-            return $this->db->from($this->_tableName)->join('han_goods_attribute_value','han_goods_attribute_value.goods_commonid = han_goods_common.goods_commonid')->where($where)->where($attrStr)->fetchNum();
+            return $this->db->from($this->_tableName)->join('han_goods_attribute_value','han_goods_attribute_value.goods_commonid = han_goods_common.goods_commonid')->where($where)->where($attrStr)->where(array('goods_state'=>1,'goods_verify'=>1))->fetchNum();
         }
-        return $this->db->from($this->_tableName)->where($where)->fetchNum();
+        return $this->db->from($this->_tableName)->where(array('goods_state'=>1,'goods_verify'=>1))->where($where)->fetchNum();
     }
     /**
      * 获取分享信息