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

application/models/Business/Store/StoreService.php

@@ -41,9 +41,7 @@ class StoreServiceModel extends \Business\AbstractModel{
         list($storeInfo,$storeLabel) = \DAO\StoreModel::getInstance()->get($storeId);
         if((int)$param['isScan'] > 0) {
             //扫码进入
-            \Our\Log::getInstance()->write($param['key'].$param['isScan'].' '.$memberId,'/data/log/special');
             if($memberId > 0) {
-                \Our\Log::getInstance()->write('会员','/data/log/special');
                 if($param['sid']) {
                     $sale = \DAO\SaleModel::getInstance()->getOne(array('sale_id'=>$param['sid']),'sale_act_id,member_id');
                     if($sale) {
@@ -56,6 +54,7 @@ class StoreServiceModel extends \Business\AbstractModel{
                 $storeMember['store_id'] = $storeId;
                 $storeMember['member_id'] = $memberId;
                 $storeMember['fav_from'] = \Our\ApiConst::scanFavor;
+                $storeMember['fav_type'] = \Our\ApiConst::one;
                 $storeMembers[] = $storeMember;
                 $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
                 $result = $favoritesStoreDao->insertAll($storeMembers);
@@ -318,7 +317,8 @@ class StoreServiceModel extends \Business\AbstractModel{
                 $file_name = $time.\Our\Validate::getNumberString();
                 $result = \Our\ImageUtil::uploadBase64Image($image,\Our\ImageConst::reportShops,$file_name);
                 if($result){
-                    $imgArr[] = $file_name;
+                    $result = \Our\Common::getStaticFile($file_name,\Our\ImageConst::feedback);
+                    $imgArr[] = pathinfo($result)['basename'];
                 }
             }else{
                 $imgArr[] = pathinfo($image)['basename'];

application/models/Business/User/FeedBackService.php

@@ -36,7 +36,8 @@ class FeedBackServiceModel extends \Business\AbstractModel
                 $file_name = $time.\Our\Validate::getNumberString();
                 $result = \Our\ImageUtil::uploadBase64Image($image,\Our\ImageConst::feedback,$file_name);
                 if($result){
-                    $imgArr[] = $file_name;
+                    $result = \Our\Common::getStaticFile($file_name,\Our\ImageConst::feedback);
+                    $imgArr[] = pathinfo($result)['basename'];
                 }
             }else{
                 $imgArr[] = pathinfo($image)['basename'];

application/models/Business/User/MemberService.php

@@ -320,6 +320,7 @@ class MemberServiceModel extends \Business\AbstractModel
                 $storeMember['store_id'] = $storeId;
                 $storeMember['member_id'] = $memberId;
                 $storeMember['fav_from'] = \Our\ApiConst::scanFavor;
+                $storeMember['fav_type'] = \Our\ApiConst::one;
                 $storeMembers[] = $storeMember;
             }
             /*$storeMemberDao = \DAO\StoreMemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);

application/models/DAO/FavoritesStore.php

@@ -113,18 +113,24 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
         return $result;
     }
 
+    /**
+     * 该函数目前仅适用于扫码关注业务 ,使用请谨慎
+     * @param $datas
+     * @return bool
+     * @throws \Our\Exception
+     */
     public function insertAll($datas){
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
         $error = 0;
-        $baseSql = "insert IGNORE into {$this->_tableName}(member_id,store_id,fav_from,fav_time) values";
+        $baseSql = "insert IGNORE into {$this->_tableName}(member_id,store_id,fav_from,fav_time,fav_type) values";
         $insertAllSql = $baseSql;
         for ($i = 0; $i < count($datas); $i++) {
-            $addSql = \Our\Common::format("('{0}','{1}','{2}','{3}'),", $datas[$i]['member_id'], $datas[$i]['store_id'], $datas[$i]['fav_from'],TIMESTAMP);
+            $addSql = \Our\Common::format("('{0}','{1}','{2}','{3}','{4}'),", $datas[$i]['member_id'], $datas[$i]['store_id'], $datas[$i]['fav_from'],TIMESTAMP,$datas[$i]['fav_type']);
             \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(), array(&$this, 'selectList'), array() ,array($datas[$i]['member_id']));
             $insertAllSql .= $addSql;
             if ($i % 1000 == 0 && $i != 0) {
                 $insertAllSql = rtrim($insertAllSql, ',');
-                $insertAllSql .= 'ON DUPLICATE KEY UPDATE fav_time=VALUES (fav_time),fav_from = VALUES (fav_from)';
+                $insertAllSql .= 'ON DUPLICATE KEY UPDATE fav_time=VALUES (fav_time),fav_from = VALUES (fav_from) ,fav_type = VALUES (fav_type)';
                 $one = $this->db->insert($this->_tableName)->query($insertAllSql);
                 if (!$one) {
                     $error++;
@@ -134,7 +140,7 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
         }
         if ($insertAllSql != $baseSql) {
             $insertAllSql = rtrim($insertAllSql, ',');
-            $insertAllSql .= 'ON DUPLICATE KEY UPDATE fav_time=VALUES (fav_time),fav_from = VALUES (fav_from)';
+            $insertAllSql .= 'ON DUPLICATE KEY UPDATE fav_time=VALUES (fav_time),fav_from = VALUES (fav_from),fav_type = VALUES (fav_type)';
             $one = $this->db->insert($this->_tableName)->query($insertAllSql);
 
             if (!$one) {

application/models/DAO/Member.php

@@ -489,8 +489,9 @@ class MemberModel extends \DAO\AbstractModel
         if (!$data['oldPassword']) {
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyOldPassword);
         }
-        $memberCurrent = $this->getOneByWhereWithField(array('member_id' => $memberId), 'member_passwd');
-        if (!($memberCurrent && $memberCurrent['member_passwd'] == md5($data['oldPassword']))) {
+        $memberCurrent = $this->getOneByWhereWithField(array('member_id' => $memberId), 'member_passwd,member_time');
+        $addKey=Common::getConfig('password.key');
+        if (!($memberCurrent && $memberCurrent['member_passwd'] == md5($memberCurrent['member_time'].$data['oldPassword'].$addKey))) {
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::worngOldPassword);
         }
         $this->checkPassword($data);

application/models/Error/CodeConfig.php

@@ -568,7 +568,7 @@ class CodeConfigModel {
             self::editDelCartFailed => '编辑购物车时删除数据失败',
             self::editCartUploadCartFailed => '编辑购物车更新购物车时间失败',
             self::wrongAddCartForSelfStore => '店主不能添加自己店铺的商品到购物车',
-            self::pbundingGoodsCannotMoveToFavouites => '组合销售商品暂时不支持移入收藏夹',
+            self::pbundingGoodsCannotMoveToFavouites => '组合商品暂不支持移入收藏夹',
 
             self::addressNotExist=>'地址不存在',
             self::emptyAddressId=>'地址主键参数不能为空',