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

application/controllers/Index.php

@@ -21,6 +21,14 @@ class IndexController extends \Our\Controller_Abstract  {
 
         return false;
     }
+    public function getQrcodeFlowAction(){
+        $imageKey=$_GET['imageKey'];
+        $memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
+        $imageFlow=$memberDb0Redis->tableCacheGet($imageKey);
+        header('Content-type: image/jpg');
+        echo $imageFlow;
+        exit;
+    }
     public function getHtmlAction(){
         $this->req=$this->getRequest()->getQuery();
         $postData=$this->req;
@@ -37,7 +45,7 @@ class IndexController extends \Our\Controller_Abstract  {
         }
         $this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
 
-        $paramsStr= $this->memberDb0Redis->tablelpop($this->key);
+        $paramsStr= $this->memberDb0Redis->tableCacheGet($this->key);
         if($_GET['debug']==1){
             $paramsStr='{
         "desc": "最优质的产品，最实惠的价格，最好的服务质量，欢迎选购",

application/library/Our/ApiConst.php

@@ -368,7 +368,7 @@ class ApiConst
 
     //等于0表示没有选中地址时是选中当前传入经纬度,等于1表示没有命中地址是选中地址列表中按照is_default desc,address_id desc倒序的第一条地址
     const defaultAddressRoute = 0;
-
+    const shareLimitProgrameError=40001;
     const addGoodsToCart = 1; //将商品加入购物车
     const addBundingToCart = 2; //将组合销售商品加入购物车
     const positionPickupCodeBegin=12;
@@ -430,7 +430,7 @@ class ApiConst
     const xpClientAppVersionOnline='1.0.0';
     const winClientAppVersionOnline='1.0.0';
 //微信小是否发布
-    const isWxPublish = 0;
+    const isWxPublish = 1;
 
     //消息模板类型
     const reachRemindMessageType = 1;

application/library/Our/PathConst.php

@@ -17,7 +17,8 @@ class PathConst {
     const wxGoodsParams="id={0}";
     //1:店铺小程序二维码生成路径,2:商品小程序二维码路径
     const wxStorePath="pages/shops/home/index";
-    const wxGoodsPath="pages/products/home/index";
+    const wxGoodsPath="pages/products/details/index";
+   // const wxGoodsPath="pages/goods/home/index";
     //默认小程序的图片
     const wxDefaultPath="/data/img/qrcode.jpg";
 //下载app的页面

application/library/Our/WechatCommon.php

@@ -73,7 +73,7 @@ class WechatCommon
     }
 
 
-    public function httpsPostJson($url, $data = '', $array = true)
+    public function httpsPostJson($url, $data = '', $array = false)
     {
         $curl = curl_init($url);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);

application/models/Business/Order/OrderService.php

@@ -670,9 +670,12 @@ class OrderServiceModel extends \Business\AbstractModel
                 //更新订单信息
                 $updateData = array('order_state' => ApiConst::orderStateCancel,'is_effective'=>ApiConst::cancelOrderAuto);
                 $update = $orderDao->update(array('order_id' => $order['orderId']),$updateData);
-                $updateCommonData['order_message']=DescribeConst::cancelOrderMessage;
-                $res=$orderCommonDao->update(array('order_id'=>$order['orderId']),$updateCommonData);
-                if(!$update || !$res){
+//                $updateCommonData['order_message']=DescribeConst::cancelOrderMessage;
+//                $res=$orderCommonDao->update(array('order_id'=>$order['orderId']),$updateCommonData);
+//                if(!$update || !$res){
+//                    echo '订单:'.$order['orderId'].'没取消成功!';
+//                }
+                if(!$update){
                     echo '订单:'.$order['orderId'].'没取消成功!';
                 }
                 //$orderGoodsUpdateData['refund_state_name']='退款成功';

application/models/Business/User/ShareService.php

@@ -79,7 +79,7 @@ class ShareServiceModel extends \Business\AbstractModel
     }
     public function saveDataToSession($data){
         $this->memberDb0Redis=\Redis\Db0\MemberRedisModel::getInstance();
-        $res= $this->memberDb0Redis->tablerpush($data['key'],json_encode($data));
+        $res= $this->memberDb0Redis->tableCacheSet($data['key'],json_encode($data),ApiConst::oneDaySecond);
         return $res;
     }
     //二进制转图片image/png
@@ -111,6 +111,12 @@ class ShareServiceModel extends \Business\AbstractModel
             return Common::format(PathConst::shareGroups,$data['groupId'],$data['storeId']);
         }
 
+        if($type='smallPrograme'){
+            $host=\Bootstrap::getUrlIniConfig('resourcesHost');
+            $url=Common::format($host."/index/getQrcodeFlow?imageKey={0}",$data);
+            return $url;
+        }
+
     }
 
     public function growQrcode($data){
@@ -121,12 +127,21 @@ class ShareServiceModel extends \Business\AbstractModel
                     $scene= \Our\Common::format(\Our\PathConst::wxStoreParams,$data['id']);
                     $page=\Our\PathConst::wxStorePath;
                     $res=$this->getQrcode($page,$scene);
-                    $fileName=md5($page.$res);
-                    $fileName=$fileName.NameConst::jpgSuffix;
-                    $base64image=$this->dataUri($res,ImageConst::imagePgn);
-                    $url= ImageUtil::uploadBase64Image($base64image,ImageConst::shareImage,$fileName);
-                    $this->memberDb0Redis->tableCacheSet($fileName,$url,ApiConst::zero);
-                    return $url;
+                    if(Common::isJson($res)){
+                            $res=json_decode($res,true);
+                           if($res['errcode']==ApiConst::shareLimitProgrameError){
+                            $memberRedis = \Redis\Db0\MemberRedisModel::getInstance();
+                            $memberRedis->tableDel('wechatAccessToken');
+                            $res=$this->getQrcode($page,$scene);
+                        }
+                    }
+                    $fileName=md5($res);
+                    //$fileName=$fileName.NameConst::jpgSuffix;
+                   // $base64image=$this->dataUri($res,ImageConst::imagePgn);
+                  //  $url= ImageUtil::uploadBase64Image($base64image,ImageConst::shareImage,$fileName);
+                    $this->memberDb0Redis->tableCacheSet($fileName,$res,ApiConst::oneDaySecond);
+                    $qrcodeUrl=$this->getQrUrl($fileName,'smallPrograme');
+                    return $qrcodeUrl;
                 }else{
                    return $this->getQrUrl($data);
                    // return PathConst::wxDefaultPath;
@@ -140,15 +155,28 @@ class ShareServiceModel extends \Business\AbstractModel
         if($data['type']==\Our\ApiConst::shareGoods){
             if(($data['shareType']==ApiConst::shareWxFriend || $data['shareType']==ApiConst::shareWxFriends)){
                     if(\Our\ApiConst::isWxPublish){
-                        $scene= \Our\Common::format(\Our\PathConst::wxGoodsParams,$data['id']);
-                        $page=\Our\PathConst::wxGoodsPath;
+                        //$scene= \Our\Common::format(\Our\PathConst::wxGoodsParams,$data['id']);
+                          $scene= \Our\Common::format(\Our\PathConst::wxGoodsParams,$data['goodsCommonid']);
+                        $page=\Our\PathConst::wxStorePath;
                         $res=$this->getQrcode($page,$scene);
-                        $fileName=md5($page.$res);
-                        $fileName=$fileName.NameConst::jpgSuffix;
-                        $base64image=$this->dataUri($res,ImageConst::imagePgn);
-                        $url= ImageUtil::uploadBase64Image($base64image,ImageConst::shareImage,$fileName);
-                        $this->memberDb0Redis->tableCacheSet($fileName,$url,ApiConst::zero);
-                        return $url;
+                        if(Common::isJson($res)){
+                            $res=json_decode($res,true);
+                            if($res['errcode']==ApiConst::shareLimitProgrameError){
+                                $memberRedis = \Redis\Db0\MemberRedisModel::getInstance();
+                                $memberRedis->tableDel('wechatAccessToken');
+                                $res=$this->getQrcode($page,$scene);
+                            }
+                        }
+                       // var_dump($res);exit;
+//                        header('Content-type: image/jpg');
+//                        echo $res;exit;
+                        $fileName=md5($res);
+                        //$fileName=$fileName.NameConst::jpgSuffix;
+                        // $base64image=$this->dataUri($res,ImageConst::imagePgn);
+                        //  $url= ImageUtil::uploadBase64Image($base64image,ImageConst::shareImage,$fileName);
+                        $this->memberDb0Redis->tableCacheSet($fileName,$res,ApiConst::oneDaySecond);
+                        $qrcodeUrl=$this->getQrUrl($fileName,'smallPrograme');
+                        return $qrcodeUrl;
                     }else{
                         return $this->getQrUrl($data,'goods');
                         //return PathConst::wxDefaultPath;

application/views/index/goods.phtml

@@ -32,7 +32,7 @@
         <span id="price"></span>
     </div>
     <div class="qrcode" id="qrcode">
-        <img id="qrImg" src="" />
+        <img id="qrImg" width="250" height="250" src="" />
         <div id="qrcodeImg"></div>
         <p id="tip"></p>
     </div>
@@ -63,13 +63,11 @@
 
     if(pageObj.price != pageObj.discount)
         document.getElementById("price").innerHTML = "<span style='font-size:30px;'>¥</span>"+(pageObj.price / 100).toFixed(2);
-
-    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);
-//    }
+    if(pageObj.type<=2){
+        document.getElementById("qrImg").src = pageObj.qrImg;}
+    else{
+        new QRCode(document.getElementById('qrcodeImg'), pageObj.url);
+    }
 
 
 

application/views/index/saleShare.phtml

@@ -161,6 +161,7 @@
 </div>
 </body>
 <script>
+
 //    new QRCode(document.getElementById('qrcodeImg'), {
 //        text: '<?php //echo $params['qrCode']."?x-oss-process=image/resize,m_fill,h_186,w_186";?>//',
 //        width: 250,

application/views/index/store.phtml

@@ -162,11 +162,19 @@
 </div>
 </body>
 <script>
-    new QRCode(document.getElementById('qrcodeImg'), {
-        text: '<?php echo $params['qrCode'];?>',
-        width: 250,
-        height: 250
+    var  shareType="<?php echo $params['shareType'];?>";
+    var qrCode='<?php echo $params['qrCode'];?>';
+    var shareType=parseInt(shareType);
+    if(shareType==1 || shareType==2){
+        document.getElementById('qrcodeImg').innerHTML='<img id="qrcodeImg" src="'+ qrCode+'" alt="">';
+    }else{
+        new QRCode(document.getElementById('qrcodeImg'), {
+            text: '<?php echo $params['qrCode'];?>',
+            width: 250,
+            height: 250
+
+        });
+    }
 
-    });
 </script>
 </html>
\ No newline at end of file