Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

biz/shop/classes/ShopClass.php

@@ -177,6 +177,7 @@ class ShopClass extends BaseClass
         $url = httpUtil::becomeHttps($url);
         Yii::info('收款码url：' . $url);
         $gatheringCode = qrCodeUtil::generateGatheringQrCode($url, $sjId, $shopId, '', 10);
+        Yii::info('gatheringCode：' . $gatheringCode);
         $imgUrl = Yii::$app->params['hdImgHost'] . 'gathering/1.jpg?x-oss-process=image/watermark,image_' . base64_encode($gatheringCode . '?x-oss-process=image/resize,P_55') . ',g_nw,x_278,y_465/watermark,image_' . base64_encode('gathering/logo_big.png?x-oss-process=image/resize,P_12') . ',g_nw,x_555,y_728';
         return $imgUrl;
     }