From 68defbe491894e01c4402922de33c39633fca091 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Mar 2022 14:25:54 +0800
Subject: [PATCH] 系统名称

---
 zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShopInfoController.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShopInfoController.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShopInfoController.java
index 97fdc58..8d92ccc 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShopInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShopInfoController.java
@@ -7,15 +7,16 @@
 import com.matrix.core.pojo.PaginationVO;
 import com.matrix.core.tools.LogUtil;
 import com.matrix.core.tools.MD5Util;
-import com.matrix.core.tools.PropertiesUtil;
 import com.matrix.system.common.bean.SysUsers;
 import com.matrix.system.common.constance.AppConstance;
 import com.matrix.system.constance.Dictionary;
-import com.matrix.system.constance.SystemConstance;
 import com.matrix.system.hive.action.BaseController;
 import com.matrix.system.hive.action.util.QueryUtil;
 import com.matrix.system.hive.bean.SysShopInfo;
 import com.matrix.system.hive.service.SysShopInfoService;
+import com.matrix.system.shopXcx.api.WeChatApiTools;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -36,9 +37,21 @@
 @Controller
 @RequestMapping("hiveErp/shopInfo")
 public class ErpShopInfoController extends BaseController {
+
+
+    @Autowired
+    WxacodeUtil wxacodeUtil;
+
     @Resource
     private SysShopInfoService shopInfoService; // 店铺Service
+    @Value("${file_storage_path}")
+    private String fileStoragePath;
 
+    @Value("${static_resource_url}")
+    private String staticResourceUrl;
+
+    @Autowired
+    WeChatApiTools weChatApiTools;
 
     @RequestMapping(value = "/showList")
     @ResponseBody
@@ -82,6 +95,7 @@
         return "admin/hive-erp/shop/shopInfo-form";
     }
 
+
     /**
      * 生成门店二维码
      */
@@ -91,12 +105,13 @@
     AjaxResult creteSohopQrcode(@PathVariable("shopId") Long shopId) {
         SysShopInfo shopInfo = shopInfoService.findById(shopId);
         try {
-            String qrcodeSavePath = WxacodeUtil.getWxacode(shopId + "", "pages/index/index", MD5Util.strToMD5(shopId + ""));
+            String qrcodeSavePath = wxacodeUtil.getWxacode(shopId + "", "pages/index/index", MD5Util.strToMD5(shopId + "")
+                    ,weChatApiTools.getAppid(shopInfo.getCompanyId()),weChatApiTools.getSecret(shopInfo.getCompanyId()));
             LogUtil.debug("qrcodeSavePath={}", qrcodeSavePath);
             // 图片保存目录路径
-            String baseSavePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+            String baseSavePath = fileStoragePath;
             // 图片访问URL
-            String baseSaveUrl = PropertiesUtil.getString(AppConstance.NGINX_URL);
+            String baseSaveUrl = staticResourceUrl;
             String qrcodeImgUrl = qrcodeSavePath.replace(baseSavePath, baseSaveUrl);
             shopInfo.setQrcode(qrcodeImgUrl);
             shopInfoService.modify(shopInfo);

--
Gitblit v1.9.1