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

application/models/Business/Goods/EvaluationService.php

@@ -159,7 +159,7 @@ class EvaluationServiceModel extends \Business\AbstractModel {
             //更新店铺评论总分
             \DAO\StoreScoreStatisticsModel::getInstance()->insertOrUpdate(array('store_id'=>$order['store_id'],'evaluation_score'=>$grade['evaluation_score'],'evaluation_number'=>$grade['evaluation_number']));
         }
-
+        \DAO\Goods\StoreTopSaleGoodsModel::getInstance()->pushChangeSaleStore($order['store_id']);
         $orderInstance = \DAO\Order\OrderModel::getInstance();
         //修改订单状态
         $orderInstance->update(array('order_id'=>$order['order_id']),array('evaluation_state'=>1));

application/models/Business/User/MemberService.php

@@ -177,6 +177,7 @@ class MemberServiceModel extends \Business\AbstractModel
     public function saveMemberInfo($where,$memberId){
         $memberDao=\DAO\MemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $data = $memberDao->getValidMember($where);
+
         $result = $memberDao->saveInfo($data,$memberId);
         return $result;
     }

application/models/DAO/Goods.php

@@ -313,7 +313,7 @@ class GoodsModel extends \DAO\AbstractModel {
         $updateAllSql = $baseSql;
         $dataIds = array();
         for ($i = 0; $i < count($datas); $i++) {
-            $updateSql = \Our\Common::format(" WHEN {0} THEN goods_storage{2}{1},", $datas[$i]['goodsId'], $datas[$i]['goodsNum'],\Our\ArrayConst::ops[$op]);
+            $updateSql = \Our\Common::format(" WHEN {0} THEN goods_storage{2}{1} ", $datas[$i]['goodsId'], $datas[$i]['goodsNum'],\Our\ArrayConst::ops[$op]);
             $dataIds[] = $datas[$i]['goodsId'];
             $updateAllSql .= $updateSql;
             if ($i % 1000 == 0 && $i != 0) {

application/models/DAO/Goods/StoreTopSaleGoods.php

@@ -61,7 +61,7 @@ class StoreTopSaleGoodsModel extends \DAO\AbstractModel{
                 if ($storeGoods) {
                     $orderGoods = empty($orderGoods)?$storeGoods:array_merge($orderGoods, $storeGoods);
                 }else{
-                    $singleStoreGoods = $this->getList(array('store_id'=>$storeId));
+                    $singleStoreGoods = $this->getList(array('store_id'=>$storeId,'goods_commonid'=>array('neq','')));
                     if($singleStoreGoods){
                         $ordesGoods = empty($orderGoods)?$singleStoreGoods:array_merge($orderGoods,$singleStoreGoods);
                         $storeTopSaleGoodsRedis->update($storeId,$singleStoreGoods,\Our\ApiConst::oneDaySecond);

application/models/DAO/GoodsCommon.php

@@ -223,9 +223,9 @@ class GoodsCommonModel extends \DAO\AbstractModel {
             $saleNumSql = 'sale_num = case goods_commonid ';
         }
         for ($i = 0; $i < count($datas); $i++) {
-            $goodsCommonSql .= \Our\Common::format("  WHEN {0} THEN goods_storage{1}{2}, ", $datas[$i]['goodsCommonId'],\Our\ArrayConst::ops[$op], $datas[$i]['goodsNum']);
+            $goodsCommonSql .= \Our\Common::format("  WHEN {0} THEN goods_storage{1}{2} ", $datas[$i]['goodsCommonId'],\Our\ArrayConst::ops[$op], $datas[$i]['goodsNum']);
             if($updateSaleNumFlag){
-                $saleNumSql .= \Our\Common::format(" when {0} THEN sale_num {1}{2},", $datas[$i]['goodsCommonId'],$updateSaleNumOp, $datas[$i]['goodsNum']);
+                $saleNumSql .= \Our\Common::format(" when {0} THEN sale_num {1}{2} ", $datas[$i]['goodsCommonId'],$updateSaleNumOp, $datas[$i]['goodsNum']);
             }
             $dataIds[] = $datas[$i]['goodsCommonId'];
             if ($i % 1000 == 0 && $i != 0) {
@@ -248,7 +248,7 @@ class GoodsCommonModel extends \DAO\AbstractModel {
                 $dataIds = array();
             }
         }
-        if ($updateAllSql != $baseSql) {
+        if ($goodsCommonSql) {
             $goodsCommonSql = trim($goodsCommonSql,',').' END ';
             $updateAllSql .= $goodsCommonSql;
             if($updateSaleNumFlag){

application/models/DAO/Member.php

@@ -283,9 +283,10 @@ class MemberModel extends \DAO\AbstractModel
         if (!($where['memberSex'] && in_array($where['memberSex'], array(\Our\ApiConst::woman, \Our\ApiConst::man)))) {
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::wrongMemberSex);
         }
-        unset($where['key']);
-        $where = \Our\Common::convertHump($where);
-        return $where;
+        $memberInfo['memberName'] = $where['memberName'];
+        $memberInfo['memberSex'] = $where['memberSex'];
+        $memberInfo = \Our\Common::convertHump($memberInfo);
+        return $memberInfo;
 
     }
 

application/models/Mysql/LinkMySQL.php

@@ -935,7 +935,7 @@ class LinkMySQLModel{
                 return false;
             }
         }else{
-            if (empty($array) || !$key ||( count($array) != 2)|| $array[1] === '' || $array[1] === null) {
+            if (empty($array) || !$key ||( count($array) != 2)) {
                 return false;
             }
         }