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

application/library/Our/ApiConst.php

@@ -213,10 +213,17 @@ class ApiConst
     //一个小时
     const oneHourCache = 1;
 
+    //forStoreMember
     const storeQrcodeMember = 1;//扫描店铺二维码
     const sellerQrcodeMember = 2;//扫描销售员二维码
     const buyMember = 3;//购买
 
+    //forFavoritesStore
+    const selfFavor = 1;//主动关注
+    const buyFavor = 2;//购买关注
+    const scanFavor = 3;//扫码关注
+
+
     const messageTypeRegister = 1;//注册类短信
     const messageTypeLogin = 2; //登录类短信
     const messageTypeSeller = 3; //销售员登录短信

application/library/Our/ImageUtil.php

@@ -131,6 +131,18 @@ class ImageUtil {
         }
         return $goodsImg;
     }
+
+    public function getStoreLabel($storeLabel, $directory = \Our\ImageConst::storeLabel,$width=\Our\ApiConst::zero,$height=\Our\ApiConst::zero){
+        $storeLableImage = \Our\Common::getStaticFile($storeLabel, $directory);
+        if($width){
+            if(!$height){
+                $height = $width;
+            }
+            $storeLableImage .= "?x-oss-process=image/resize,m_fill,h_{$height},w_{$width}";
+        }
+        return $storeLableImage;
+    }
+
     public function getGoodsImgWithUrl($goodsImgUrl,$width=\Our\ImageConst::goodsListImgSize, $height = 0) {
         $width = $width * \Our\ImageConst::sizeScale;
         $height ? $height = $height * \Our\ImageConst::sizeScale : $height = $width;

application/models/Business/Store/StoreService.php

@@ -718,7 +718,7 @@ class StoreServiceModel extends \Business\AbstractModel{
                 $store['storeDistance'] = \Our\CommonExtension::getDistance($lat,$lng,$store['store_latitude'],$store['store_longitude']);
                 unset($store['store_longitude']);
                 unset($store['store_latitude']);
-                $store['storeLabel'] = \Our\Common::getStaticFile($store['storeLabel'], \Our\ImageConst::storeLabel);
+                $store['storeLabel'] = \Our\ImageUtil::getStoreLabel($store['storeLabel'], \Our\ImageConst::storeLabel,213);
                 $storeList[$store['storeId']] = $store;
             }
             return $storeList;

application/models/Business/User/MemberService.php

@@ -261,6 +261,7 @@ class MemberServiceModel extends \Business\AbstractModel
         $member['member_mobile'] = $where['mobile'];
         $member['member_mobile_bind'] = \Our\ApiConst::one;
         $member['member_passwd'] = md5($where['password']);
+        $member['member_time'] = TIMESTAMP;
         $result = $memberDao->addInfo($member);
         return $result;
     }
@@ -285,14 +286,20 @@ class MemberServiceModel extends \Business\AbstractModel
         if($scan_store_ids){
             $storeMembers = array();
             foreach($scan_store_ids as $storeId){
-                $storeMember['storeId'] = $storeId;
-                $storeMember['memberId'] = $memberId;
-                $storeMember['type']    = \Our\ApiConst::storeQrcodeMember;
+                $storeMember = array();
+                $storeMember['store_id'] = $storeId;
+                $storeMember['member_id'] = $memberId;
+                $storeMember['fav_from'] = \Our\ApiConst::scanFavor;
                 $storeMembers[] = $storeMember;
             }
-            $storeMemberDao = \DAO\StoreMemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);
-            $result = $storeMemberDao->addBatch($storeMember);
-            return $result;
+            /*$storeMemberDao = \DAO\StoreMemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);
+            $result = $storeMemberDao->addBatch($storeMember);*/
+            $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
+            $result = $favoritesStoreDao->insertAll($storeMembers);
+            if(!$result){
+                \Our\Log::getInstance()->write(json_encode($storeMembers).'扫码数据写入失败');
+                return false;
+            }
         }
         $scan_sale_ids = $sess->get('scan_sale_ids');
         if($scan_sale_ids){

application/models/DAO/FavoritesStore.php

@@ -86,6 +86,57 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
         $sql = \Our\Common::format($baseSql, $data['member_id'], $data['store_id'],$data['fav_time']);
         return $this->db->insert($this->_tableName)->query($sql);
     }
+
+    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";
+        $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);
+            $insertAllSql .= $addSql;
+            if ($i % 1000 == 0 && $i != 0) {
+                $insertAllSql = rtrim($insertAllSql, ',');
+                $insertAllSql .= 'ON DUPLICATE KEY UPDATE fav_time=VALUES (fav_time)';
+                $one = $this->db->insert($this->_tableName)->query($insertAllSql);
+                if (!$one) {
+                    $error++;
+                }
+                $insertAllSql = $baseSql;
+            }
+        }
+        if ($insertAllSql != $baseSql) {
+            $insertAllSql = rtrim($insertAllSql, ',');
+            $insertAllSql .= 'ON DUPLICATE KEY UPDATE fav_time=VALUES (fav_time)';
+            $one = $this->db->insert($this->_tableName)->query($insertAllSql);
+
+            if (!$one) {
+                $error++;
+            }
+        }
+        if ($error > 0) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 批量添加
+     * @param $datas
+     */
+    public function addBatch($datas){
+        parent::setDb(\Our\DbNameConst::masterDBConnectName);
+
+        $sql = "INSERT INTO {$this->_tableName} ( store_id,member_id,fav_from,fav_time) values";
+        foreach($datas as $key => $data){
+            $sql .=\Our\Common::format(" (store_id={0} and member_id = {1} and fav_from={2} ),",$data['storeId'],$data['memberId'],$data['type']);
+        }
+        $sql = trim($sql,',');
+        $sql .= ";";
+        $res = $this->db->insert($this->_tableName)->query($sql);
+        return $res;
+    }
+
     public function getFavoritesStoreCountByStoreId($storeId, $num = 0) {
         $statisticsDb6Redis = \Redis\Db6\StatisticsRedisModel::getInstance();
         $collectCount = $statisticsDb6Redis->tableCacheGet('storeCollectCount:'.$storeId);