From 76e1a578ba88a2a16f8e45d69cbca64978836943 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Wed, 21 Feb 2024 17:59:58 +0800
Subject: [PATCH] bug

---
 fuintAdmin/src/api/staff/qrcode.js            |  4 +--
 .../src/views/staff/storeInfo/index.vue       | 26 ++++++++++++-------
 .../business/member/utils/QrCodeUtils.java    |  2 +-
 .../controller/QRCodeController.java          |  3 +--
 .../service/IQRCodeService.java               |  2 +-
 .../service/impl/QRCodeServiceImpl.java       |  6 +++--
 6 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/fuintAdmin/src/api/staff/qrcode.js b/fuintAdmin/src/api/staff/qrcode.js
index ea8f9db99..7e593b185 100644
--- a/fuintAdmin/src/api/staff/qrcode.js
+++ b/fuintAdmin/src/api/staff/qrcode.js
@@ -13,8 +13,8 @@ export function listQRCode(query) {
 export function QRCodeByStoreId(query) {
   return request({
     url: '/business/storeInformation/qrCode/createStoreQrCode',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
 
diff --git a/fuintAdmin/src/views/staff/storeInfo/index.vue b/fuintAdmin/src/views/staff/storeInfo/index.vue
index 90eadf8c7..17f487848 100644
--- a/fuintAdmin/src/views/staff/storeInfo/index.vue
+++ b/fuintAdmin/src/views/staff/storeInfo/index.vue
@@ -34,7 +34,9 @@
       <div slot="header" class="clearfix">
         <span>油站二维码</span>
       </div>
-      <img id="collection" class="qrcode" :src="collectionImg" /><br/>
+      <el-button style="margin-left: 200px" type="text" v-if="type==0" @click="getQRCodeInfoByStoreId(1)">切换样式</el-button><br/>
+      <el-button style="margin-left: 200px" type="text" v-if="type==1" @click="getQRCodeInfoByStoreId(0)">切换样式</el-button><br/>
+      <img id="collection" class="qrcode" :src="baseUrl + collectionImg" /><br/>
       <el-button class="but" type="primary"
                  icon="el-icon-download"
                  @click="handleDownloadqrCode('collection')">
@@ -58,7 +60,7 @@
 <script>
 import QRCode from 'qrcode'
 import html2canvas from "html2canvas";
-import {listQRCode} from "@/api/staff/qrcode";
+import {listQRCode, QRCodeByStoreId} from "@/api/staff/qrcode";
 import {ljStoreInfo, updateStore} from "@/api/staff/store";
 import mapComponment from "@/components/map/mapComponent.vue";
 import imgUpload from "@/components/ImageUpload/index.vue"
@@ -114,10 +116,13 @@ export default {
       // 搜索提示信息
       options: [],
       welfare:[],
+      type:0,
+      baseUrl:process.env.VUE_APP_BASE_API,
     }
   },
   created() {
-    this.getQRCodeInfo();
+    // this.getQRCodeInfo();
+    this.getQRCodeInfoByStoreId(0);
     this.getStore();
     this.getForm()
   },
@@ -162,6 +167,7 @@ export default {
         }
         this.$refs.mapRef.initAMap();
         this.flag = true;
+
       })
     },
 
@@ -187,10 +193,10 @@ export default {
       })
     },
     // 获取二维码信息
-    getQRCodeInfoByStoreId(){
-      listQRCode().then(response => {
-        this.qrcode = response.data.records;
-        this.getQRcode();
+    getQRCodeInfoByStoreId(type){
+      this.type = type
+      QRCodeByStoreId({type:type}).then(response => {
+        this.collectionImg = response.data;
       })
     },
     // 根据字符串获取二维码图片url地址
@@ -252,12 +258,12 @@ export default {
     margin: 15px auto;
   }
   .qrcode{
-    width: 180px;
-    height: 180px;
+    width: 300px;
     margin-top: 15px;
   }
   .but{
-    margin-top: 15px;
+    margin-top: 20px;
+    margin-left: 50px;
     width: 180px;
   }
   .copy{
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java
index dbaca15ab..da2e8b6cb 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java
@@ -65,7 +65,7 @@ public class QrCodeUtils {
             //使用工具类生成二维码
             Image image = createQrCode(logoStream, url, 360, 360);
             //将小图片绘到大图片上,500,300 .表示你的小图片在大图片上的位置。
-            g.drawImage(image, 260, 320, null);
+            g.drawImage(image, (bufImg.getWidth()-360)/2, 320, null);
             // 设置字体，样式，字体大小
             g.setFont(new Font("TimesRoman", Font.BOLD, 40));
             //设置颜色。
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/QRCodeController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/QRCodeController.java
index 5293e18a4..6086a258a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/QRCodeController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/QRCodeController.java
@@ -38,8 +38,7 @@ public class QRCodeController extends BaseController {
     @PostMapping("/createStoreQrCode")
     public ResponseObject createStoreQrCode(HttpServletRequest request, @RequestBody Map<String,String> map) throws Exception {
         String type = map.get("type");
-        Integer storeId = Integer.valueOf(map.get("storeId"));
-        return getSuccessResult(iqrCodeService.createStoreQrCode(type,storeId,request));
+        return getSuccessResult(iqrCodeService.createStoreQrCode(type,request));
     }
 
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/IQRCodeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/IQRCodeService.java
index 836a6c426..034fc7d6e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/IQRCodeService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/IQRCodeService.java
@@ -21,7 +21,7 @@ public interface IQRCodeService  extends IService<QRCode> {
      */
     public IPage<QRCode> selectQRCodeList(Page page, QRCode qrCode);
 
-    String createStoreQrCode(String type,Integer storeId, HttpServletRequest request) throws Exception;
+    String createStoreQrCode(String type, HttpServletRequest request) throws Exception;
 
     /**
      * 根据店铺id查询二维码信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java
index f9efbc251..80b3ac02a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java
@@ -52,7 +52,9 @@ public class QRCodeServiceImpl extends ServiceImpl<QRCodeMapper, QRCode> impleme
     private BackendFileController backendFileController;
 
     @Override
-    public String createStoreQrCode(String type, Integer storeId, HttpServletRequest request) throws Exception {
+    public String createStoreQrCode(String type, HttpServletRequest request) throws Exception {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
         QRCode qrCode = selectQRCodeByStoreId(storeId);
         //        根据id查询员工信息和店铺信息
         LJStore store = storeService.selectStoreByStoreId(storeId);
@@ -61,7 +63,7 @@ public class QRCodeServiceImpl extends ServiceImpl<QRCodeMapper, QRCode> impleme
         if (type.equals("0")){
             backgroundImage = "static/qrCodeImg/laigeyouhui_bg.jpg";
         }else {
-            backgroundImage = "static/qrCodeImg/laigeyouhui_bg1.jpg";
+            backgroundImage = "static/qrCodeImg/laigeyouhui_bg1.png";
         }
 
         String logoImage = "static/qrCodeImg/logo.png";