Merge branch 'test' of https://git.yidian-inc.com:8021/bp/goods into test

application/services/marketing/MarketingGoodsService.php

@@ -101,7 +101,11 @@ class MarketingGoodsService
         foreach ($data as $key => $value) {
 
             $inventoryRest = !empty($goodsSkuList[$value['goods_sku_id']]['inventory_rest']) ? $goodsSkuList[$value['goods_sku_id']]['inventory_rest'] : '';
-            if (!empty($inventoryRest)) {
+            $expirationTime = !empty($goodsSkuList[$value['goods_sku_id']]['expiration_time']) ? $goodsSkuList[$value['goods_sku_id']]['expiration_time'] : '';
+
+            $onlineStatus = !empty($goodsSkuList[$value['goods_sku_id']]['online_status']) ? $goodsSkuList[$value['goods_sku_id']]['online_status'] : '';
+
+            if (!empty($inventoryRest) && $expirationTime> date("Y-m-d H:i:s") && $onlineStatus == 1 ) {
                 $list[$i]['inventory_rest'] = !empty($goodsSkuList[$value['goods_sku_id']]['inventory_rest']) ? $goodsSkuList[$value['goods_sku_id']]['inventory_rest'] : '';
                 $list[$i] = $value;
                 $list[$i]['life_account_id'] = !empty($goodsSkuList[$value['goods_sku_id']]['life_account_id']) ? $goodsSkuList[$value['goods_sku_id']]['life_account_id'] : '';

vendor/api/php_services/src/ShopImage/GetImage.php

@@ -172,18 +172,23 @@ class GetImage
         imagecopyresized($im, $goods_im, 47, 173, 0, 0, $goods_size, $goods_size,$goods_size, $goods_size);
 
         // 底部二维码
-        $qr = new QR($qr_string);
-        $qr_size = 100;
+        //$qr = new QR($qr_string);
+        $qr_size = 170;
+        // $qr->setSize($qr_size);
+        // $qr->setRoundBlockSize(QrCode::ROUND_BLOCK_SIZE_MODE_MARGIN);
+        // $qr_string = $qr->get();
+
+        $qr = new QrCode($qr_string);
         $qr->setSize($qr_size);
-        $qr->setRoundBlockSize(QrCode::ROUND_BLOCK_SIZE_MODE_MARGIN);
-        $qr_string = $qr->get();
+        $qr_string = $qr->writeString();
+        //$qr_string = $qr->get();
         $qr_img = imagecreatefromstring($qr_string);
         list($qr_w,$qr_h) = getimagesizefromstring($qr_string);
-        imagecopyresized($im, $qr_img, 49, 1102, 0, 0, $qr_size, $qr_size, $qr_size, $qr_size);
+        imagecopyresized($im, $qr_img, 0, 1065, 0, 0, $qr_size, $qr_size, 190, 190);
 
         // 底部文字
-        imagettftext($im, 21,0, 195, 1160, 333333 ,$this->font_m, "长按扫码快速抢券");
-        imagettftext($im, 16,0, 195, 1200, 666666 ,$this->font_r, "分享自 生活圈APP");
+        imagettftext($im, 21,0, 295, 1160, 333333 ,$this->font_m, "长按扫码快速抢券");
+        imagettftext($im, 16,0, 295, 1200, 666666 ,$this->font_r, "分享自 生活圈APP");
 
         // 底部logo
         $logo_path = __DIR__.'/images/3_logo.png';