From f253ab2413218de57fbcab1dc7c12ef44232c836 Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Fri, 10 Oct 2025 18:06:50 +0800
Subject: [PATCH] Changes

---
 .../java/org/jeecg/modules/cityShop/entity/CityShop.java  |  8 ++++++++
 .../modules/api/service/impl/YaoDuShopServiceImpl.java    | 15 +++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/entity/CityShop.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/entity/CityShop.java
index 5622d8d..3dedd05 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/entity/CityShop.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/entity/CityShop.java
@@ -131,4 +131,12 @@ public class CityShop implements Serializable {
     @Excel(name = "二维码背景图片", width = 15)
     @ApiModelProperty(value = "二维码背景图片")
     private java.lang.String qrCodeBg;
+    /**二维码位置x*/
+    @Excel(name = "二维码位置x", width = 15)
+    @ApiModelProperty(value = "二维码位置x")
+    private java.lang.Integer qrCodeX;
+    /**二维码位置x*/
+    @Excel(name = "二维码位置x", width = 15)
+    @ApiModelProperty(value = "二维码位置x")
+    private java.lang.Integer qrCodeY;
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuShopServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuShopServiceImpl.java
index 1ef779e..c2e239e 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuShopServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuShopServiceImpl.java
@@ -65,9 +65,12 @@ public class YaoDuShopServiceImpl implements YaoDuShopService {
             return null;
         }
 
+        int x = byId.getQrCodeX() != null ? byId.getQrCodeX() : 0;
+        int y = byId.getQrCodeY() != null ? byId.getQrCodeY() : 0;
+
         if (StringUtil.isNotEmpty(byId.getQrCodeBg())){
-            String finalPath = String.format("gourmet/gourmetDetail/final/%s_%s.jpg",
-                    id, byId.getQrCodeBg().hashCode());
+            String finalPath = String.format("gourmet/gourmetDetail/final/%s_%s_%s_%s.jpg",
+                    id, byId.getQrCodeBg().hashCode(), x, y);
             try {
                 InputStream ossFile = OssBootUtil.getOssFile(finalPath, null);
                 if (ossFile != null) {
@@ -97,16 +100,16 @@ public class YaoDuShopServiceImpl implements YaoDuShopService {
         try {
             byte[] qrCodeBytes = generateWxQrCode("1", "pages_order/gourmet/gourmetDetail?id=" + id, "release");
 
-            if (StringUtil.isNotEmpty(byId.getQrCodeBg())){
+            if (StringUtil.isEmpty(byId.getQrCodeBg())){
                 return qrCodeBytes;
             }
 
             // 生成最终合成图片，传递已获取的配置参数避免重复调用
-            byte[] finalImage = this.generateAndCombineImagesFromUrl2(qrCodeBytes, byId.getQrCodeBg(), 0, 0);
+            byte[] finalImage = this.generateAndCombineImagesFromUrl2(qrCodeBytes, byId.getQrCodeBg(), x, y);
 
             // 异步上传到OSS（移除Redis缓存）
-            uploadToOssAsync(finalImage, String.format("gourmet/gourmetDetail/final/%s_%s.jpg",
-                    id, byId.getQrCodeBg().hashCode()));
+            uploadToOssAsync(finalImage, String.format("gourmet/gourmetDetail/final/%s_%s_%s_%s.jpg",
+                    id, byId.getQrCodeBg().hashCode(), x, y));
 
             return finalImage;
         } catch (Exception e) {