From dfa29cdf223f2cb78184c4b15ab9f0824f3427c4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 15 Mar 2021 20:10:29 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
index f2c9a3a..e94b42d 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
@@ -159,7 +159,7 @@
             BufferedImage qrcordImgBuf = ImageIO.read(new File(qrcodeSavePath));
 
             //获取海报
-            BusParameterSettings posterSetting = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_TG_POSTER, HostInterceptor.getCompanyId());
+            BusParameterSettings posterSetting = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_TG_POSTER, loginUser.getCompanyId());
             String posterPath=baseSavePath+"wxacode" + File.separatorChar+MD5Util.strToMD5(loginUser.getOpenId())+"poster.png";
             ImageUtil.downloadPicture(posterSetting.getParamValue(),posterPath);
             BufferedImage posterImgBuf = ImageIO.read(new File(posterPath));
@@ -173,7 +173,6 @@
             BufferedImage backgroundImgBuf = new BufferedImage(700, 900, BufferedImage.TYPE_4BYTE_ABGR);
             //绘制背景+产品
             Graphics2D g = backgroundImgBuf.createGraphics();
-            //g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, 1));
             g.setColor(Color.WHITE);
             g.fillRect(0,0,700,900);
             g.drawImage(posterImgBuf,0,0,700, 700,null);

--
Gitblit v1.9.1