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

application/library/Our/ApiConst.php

@@ -24,7 +24,7 @@ class ApiConst
 
     const halfHour = 1800;
     //预警时间
-    const storageAlarmHour = 100000000000000;
+    const storageAlarmHour = 60;
 
     const twoMinSecond = 120;
 
@@ -391,6 +391,7 @@ class ApiConst
     const sharePlat = 1;//平台
     const shareStore = 2;//店铺
     const shareGoods = 3;//商品
+    const shareSaler=4;//销售员分享
 
     const wxAppPayType = 1; //APP微信支付
     const aliPayType = 2; //APP支付宝支付

application/library/Our/Controller/Abstract.php

@@ -48,8 +48,8 @@ abstract class Controller_Abstract extends \Yaf\Controller_Abstract {
         $data['data']=array();
         $data['data'] =$this->req[NameConst::data];
         if(APP_ENV=='test' || APP_ENV=='pre'){
-            $log = \Our\Log::getInstance();
-            $log->write(json_encode($data));
+//            $log = \Our\Log::getInstance();
+//            $log->write(json_encode($data));
         }
         header("Access-Control-Allow-Origin: *");
         header('Access-Control-Allow-Method: *');

application/library/Our/PathConst.php

@@ -25,6 +25,8 @@ class PathConst {
 
     const sharePlat="http://www.shenbd.com";
 
+    const shareStore="http://share.shenbd.com/share.html?type=store&id={0}";
+
     const timeParam='&param='.TIMESTAMP;
 
     const cutVertical='|';

application/models/Business/Goods/GoodsCommonService.php

@@ -460,8 +460,8 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $goodsRedis = \Redis\Db4\GoodsRedisModel::getInstance();
         $onlineStorageGoodsKey = \Our\NameConst::onlineStorageGoodsPrefix.$goodsCommonId;
         $onlineStorageGoods = $goodsRedis->tableHGAll($onlineStorageGoodsKey);
-        if(count($goods) > 1){
-            foreach (unserialize($commonInfo['goods_attr']) as $k=>$v){
+        if($goodsAttr = unserialize($commonInfo['goods_attr'])){
+            foreach ($goodsAttr as $k=>$v){
                 $tempArr = array('attrName'=>$k,'attrValue'=>$v,'isPrimeAttribute'=>0,'images'=>[]);
                 if(key_exists($k,$attrImage)){
                     foreach ($v as $v1){

application/models/Business/Store/ShopkeeperService.php

@@ -281,14 +281,14 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $goodsDao = \DAO\GoodsModel::getInstance();
         $orderCommonDao = \DAO\Order\OrderCommonModel::getInstance();
         $returnData = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderDao, 'getList'), array($where, $orderDao->getOrderDetailField(), $pageIndex, $pageSize, $order, \Our\ApiConst::oneDaySecond, array($storeId)));
-        //$returnData = $orderDao->getOrders($where, $this->orderListField, $pageIndex, $pageSize);
         $orders = $returnData['list'];
         if (!empty($orders)) {
             $orderIds = array_column($orders, 'orderId');
             if (!empty($orderIds)) {
                 $orderGoods = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderIds, $orderGoodsDao->orderGoodsField), \Our\ApiConst::oneDaySecond, array($storeId));
                 //$orderGoods = $orderGoodsDao->getOrderGoodsByOrderIds($orderIds, $orderGoodsDao->orderGoodsField);
-                $orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
+                $orderCommons=\Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'getAllByOrderIds'), array($orderIds, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond, array($storeId));
+                //$orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
                 $ordersOrderCommons = Common::intergrateOneToOne($orders, $orderCommons, 'orderId', 'orderId');
                 $orderMerge = \Our\Common::intergrateOneToMany($ordersOrderCommons, $orderGoods, 'orderId', 'orderId', 'orderGoods');
                 foreach ($orderMerge as &$value) {
@@ -352,7 +352,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         }
         $res1['must'][0] = $query1;
         $query2[] = array('match' => array('goodsName' => $keyword));
-        $query2[] = array('wildcard' => array('orderSn' => "*{$keyword}*"));
+        $query2[] = array('match' => array('orderSn' => "{$keyword}"));
+        //$query2[] = array('wildcard' => array('orderSn' => "*{$keyword}*"));
         $res1['must'][1]['bool']['should'] = $query2;
         $allQuery['bool'] = $res1;
         $elasticTool = \Elastics\ElasticsToolModel::getInstance(NameConst::ordersIndex);

application/models/Business/User/ShareService.php

@@ -35,7 +35,7 @@ class ShareServiceModel extends \Business\AbstractModel
         $driverType = \Our\Common::getDriverType();
         $data['driverType'] = $driverType;
         $data['qrCode']=$this->growQrcode($data);
-        if($data['type']==ApiConst::shareStore){
+        if($data['type']==ApiConst::shareStore || $data['type']== ApiConst::shareSaler){
             $storeDao=\DAO\StoreModel::getInstance(DbNameConst::salveDBConnectName);
             $data['address']=$storeDao->getAddress($data['id']);
         }
@@ -66,6 +66,10 @@ class ShareServiceModel extends \Business\AbstractModel
         ));
         return $res;
     }
+    public function getQrUrl($id){
+                return Common::format(PathConst::shareStore,$id);
+    }
+
     public function growQrcode($data){
         $this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
         if($data['type']==\Our\ApiConst::shareStore){
@@ -81,11 +85,13 @@ class ShareServiceModel extends \Business\AbstractModel
                     $this->memberDb0Redis->tableCacheSet($fileName,$url,ApiConst::zero);
                     return $url;
                 }else{
+                   // return $this->getQrUrl($data['id']);
                     return PathConst::wxDefaultPath;
                 }
             }else{
+                return $this->getQrUrl($data['id']);
                 //不是微信分享就是普通下载的二维码图片
-                return PathConst::downLoadQrcode;
+                //return PathConst::downLoadQrcode;
             }
         }
         if($data['type']==\Our\ApiConst::shareGoods){
@@ -101,18 +107,21 @@ class ShareServiceModel extends \Business\AbstractModel
                         $this->memberDb0Redis->tableCacheSet($fileName,$url,ApiConst::zero);
                         return $url;
                     }else{
-                        return $this->getQrUrl($data['id']);
-                        //return PathConst::wxDefaultPath;
+                        //return $this->getQrUrl($data['id']);
+                        return PathConst::wxDefaultPath;
                     }
             }else{
                 //不是微信分享就是普通下载的二维码图片
-                return $this->getQrUrl($data['id']);
-              //  return PathConst::downLoadQrcode;
+                 return $this->getQrUrl($data['id']);
+                //return PathConst::downLoadQrcode;
             }
         }
         if($data['type']==\Our\ApiConst::sharePlat){
             return PathConst::sharePlat;
         }
+        if($data['type']==\Our\ApiConst::shareSaler){
+            return $data['qrCode'];
+        }
     }
     public function excuteCommand($key){
         $command=\Bootstrap::getUrlIniConfig("convert");

application/views/index/goods.phtml

@@ -64,11 +64,12 @@
     if(pageObj.price != pageObj.discount)
         document.getElementById("price").innerHTML = "<span style='font-size:30px;'>¥</span>"+(pageObj.price / 100).toFixed(2);
 
-    if(pageObj.type<=2){
-        document.getElementById("qrImg").src = pageObj.qrImg;}
-    else{
-        new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
-    }
+    new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
+//    if(pageObj.type<=2){
+//        document.getElementById("qrImg").src = pageObj.qrImg;}
+//    else{
+//        new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
+//    }
 
 
 

application/views/index/store.phtml

@@ -64,12 +64,12 @@
         document.getElementById(v).innerHTML = pageObj[v];
     });
     document.getElementById("headerBg").src = pageObj.headerBg;
-
-    if(pageObj.type<=2){
-        document.getElementById("qrImg").src = pageObj.qrImg;}
-    else{
-        new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
-    }
+    new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
+//    if(pageObj.type<=2){
+//        document.getElementById("qrImg").src = pageObj.qrImg;}
+//    else{
+//        new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
+//    }
 
 
 

conf/application.ini

@@ -263,31 +263,31 @@ push.open=1
 [ccwdevelop : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "127.0.0.1"
+resources.database.params.hostname = "192.168.1.201"
 resources.database.params.port     = 3306
 resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
-resources.database.params.password = "root"
+resources.database.params.password = "123456"
 resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "127.0.0.1"
+resources.database.slave.params.hostname = "192.168.1.201"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"
-resources.database.slave.params.password = "root"
+resources.database.slave.params.password = "123456"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.drawSource.params.driver   = "pdo_mysql"
-resources.database.drawSource.params.hostname = "127.0.0.1"
+resources.database.drawSource.params.hostname = "192.168.1.201"
 resources.database.drawSource.params.port     = 3306
 resources.database.drawSource.params.database = "drawSource"
 resources.database.drawSource.params.username = "root"
-resources.database.drawSource.params.password = "root"
+resources.database.drawSource.params.password = "111111"
 resources.database.drawSource.params.charset  = "UTF8"
 resources.database.drawSource.params.driver_options.1002 = "SET NAMES utf8"
 

public/test.php

 <?php
+echo 1;exit;
 echo json_encode($_SERVER);exit;
 $res=file_exists('/www/web/testadmin_shenbd_com/public_html/data/upload/mall/avatar/member_avatar_26.jpg');
 var_dump($res);