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

application/controllers/User.php

@@ -33,6 +33,11 @@ class UserController extends \Our\Controller_AbstractIndex {
             $password=$data[NameConst::password];
             if($this->memberService->checkUserNamePassWord($mobile,$password)){
                 $member= $this->memberService->getOneByMobileAndPassword($mobile,$password);
+                //第二步保存扫码会员信息
+                $result = $this->memberService->saveStoreMembers($member['member_id']);
+                if(!$result){
+                    \Error\ErrorModel::throwException(\Error\CodeConfigModel::saveStoreMemberFailed);
+                }
                 /**
                  * 合并第三方授权信息
                  */
@@ -132,6 +137,11 @@ class UserController extends \Our\Controller_AbstractIndex {
             if(!empty($userToken['token'])){
                 $this->updateOldLoginKey($userToken['token']);
             }
+            //第二步保存扫码会员信息
+            $result = $this->memberService->saveStoreMembers($member['member_id']);
+            if(!$result){
+                \Error\ErrorModel::throwException(\Error\CodeConfigModel::saveStoreMemberFailed);
+            }
             $this->memberService->clearKey($this->key);
             $this->key=Common::bulidToken('', '', '', \Our\ApiConst::wechatDeviceType);
             session_id($this->key);

application/models/Business/Store/StoreService.php

@@ -41,7 +41,9 @@ 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) {
@@ -54,15 +56,24 @@ 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);
             }else{
                 $sess=\Yaf\Session::getInstance();
                 $scan_store_ids = $sess->get('scan_store_ids');
-                is_array($scan_store_ids) ? $scan_store_ids = $scan_store_ids : $scan_store_ids = [];
-                array_push($scan_store_ids,$storeId);
-                $sess['scan_store_ids'] = array_unique($scan_store_ids);
+                if($scan_store_ids){
+                    if(is_array($scan_store_ids)){//兼容历史数据,如果有历史数据
+                        $scan_store_ids = implode(',',$scan_store_ids);
+                    }
+                    if(strpos(','.$scan_store_ids.',',','.$storeId.',')===false){
+                        $scan_store_ids .= ','.$storeId;
+                    }
+                }else{
+                    $scan_store_ids = ''.$storeId;
+                }
+                $sess['scan_store_ids'] = $scan_store_ids;
                 if($param['sid']) {
                     $scan_sale_ids = $sess->get('scan_sale_ids');
                     is_array($scan_sale_ids) ? $scan_sale_ids = $scan_sale_ids : $scan_sale_ids = [];

application/models/Business/User/MemberService.php

@@ -80,13 +80,14 @@ class MemberServiceModel extends \Business\AbstractModel
     }
     private function getRealPassword($password,$timeSpan){
         $addKey=Common::getConfig('password.key');
-        $md5Str=$timeSpan.$addKey.$password;
+        $md5Str = $timeSpan.$password.$addKey;
         return $md5Str;
     }
+
     public function getOneByMobileAndPassword($mobile, $password)
     {
-//        $password=$this->getPassAddKey($password);
-//        $password = Common::format('md5({0})');
+//      $password=$this->getPassAddKey($password);
+//      $password = Common::format('md5({0})');
         $member= $this->memberDao->getOneByMobileAndPassword($mobile, $password);
         return $member ? $member : false;
     }
@@ -306,16 +307,20 @@ class MemberServiceModel extends \Business\AbstractModel
      * @param $memberId
      * @return bool
      */
-    private function saveStoreMembers($memberId){
+    public function saveStoreMembers($memberId){
         $sess=\Yaf\Session::getInstance();
         $scan_store_ids = $sess->get('scan_store_ids');//扫码带入的店铺ID
         if($scan_store_ids){
+            if(!is_array($scan_store_ids)){
+                $scan_store_ids = explode(',',$scan_store_ids);
+            }
             $storeMembers = array();
             foreach($scan_store_ids as $storeId){
                 $storeMember = array();
                 $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/Business/User/ShareService.php

@@ -106,11 +106,13 @@ class ShareServiceModel extends \Business\AbstractModel
                         $this->memberDb0Redis->tableCacheSet($fileName,$url,ApiConst::zero);
                         return $url;
                     }else{
-                        return PathConst::wxDefaultPath;
+                        return $this->getQrUrl($data['id']);
+                        //return PathConst::wxDefaultPath;
                     }
             }else{
                 //不是微信分享就是普通下载的二维码图片
-                return PathConst::downLoadQrcode;
+                return $this->getQrUrl($data['id']);
+              //  return PathConst::downLoadQrcode;
             }
         }
         if($data['type']==\Our\ApiConst::sharePlat){

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

@@ -6,6 +6,7 @@ use Error\CodeConfigModel;
 use Error\ErrorModel;
 use Our\Common;
 use Our\ImageConst;
+use Our\Log;
 use Our\NameConst;
 use Our\ApiConst;
 use Our\PathConst;
@@ -55,8 +56,14 @@ class MemberModel extends \DAO\AbstractModel
         $fileName=Common::format(ImageConst::memberAvatarPrefix."{0}".'.jpg',$memberId);
         $file=$basePath.$memberPath.$fileName;
         if(file_exists($file)){
+            if($fileName=='member_avatar_26.jpg'){
+                Log::getInstance()->write($file.'1',"/data/log/test");
+            }
             $avatar=\Our\Common::getStaticFile($fileName, \Our\ImageConst::memberAvatar);
         }else{
+            if($fileName=='member_avatar_26.jpg'){
+                Log::getInstance()->write($file.'2',"/data/log/test");
+            }
             $memerAvatar = $this->getInfo($memberId, 'member_avatar');
             $avatar = $this->getMemberAvatarUrl($memberId, $memerAvatar);
         }
@@ -482,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=>'地址主键参数不能为空',

conf/application.ini

@@ -243,7 +243,7 @@ push.open=1
 [ccwdevelop : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "192.168.1.201"
+resources.database.params.hostname = "192.168.80.18"
 resources.database.params.port     = 3306
 resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
@@ -253,7 +253,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "192.168.1.201"
+resources.database.slave.params.hostname = "192.168.80.18"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"
@@ -263,7 +263,7 @@ resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.drawSource.params.driver   = "pdo_mysql"
-resources.database.drawSource.params.hostname = "192.168.1.201"
+resources.database.drawSource.params.hostname = "192.168.80.18"
 resources.database.drawSource.params.port     = 3306
 resources.database.drawSource.params.database = "drawSource"
 resources.database.drawSource.params.username = "root"

conf/url.ini

@@ -89,7 +89,7 @@ config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 ;推送域名
 config.url.pushHost="127.0.0.1:9503";
 
-config.url.source="E:/WAMP/www/www.qm.com/data/upload/"
+;config.url.source="E:/WAMP/www/www.qm.com/data/upload/"
 ; 文件目录
 ;店铺图片报错目录
 ;config.url.storePath = '/data/upload/mall/store';

public/test.php

 <?php
+$res=file_exists('/www/web/testadmin_shenbd_com/public_html/data/upload/mall/avatar/member_avatar_26.jpg');
+var_dump($res);
+exit;
 $www_file = '/home/wwwroot/mysite/';
 
 //打开网站目录下的hooks.log文件 需要在服务器上创建 并给写权限