From c01ff160c36b056773e0cbbd0d5b68f661d9f29a Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Wed, 21 May 2025 16:47:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=EF=BC=8C=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/mobile/impl/GoodsServiceImpl.java   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
index a1af345..9f76f0a 100644
--- a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java
@@ -19,10 +19,12 @@ import com.ycwl.basic.mapper.*;
 import com.ycwl.basic.model.mobile.goods.*;
 import com.ycwl.basic.model.mobile.order.IsBuyRespVO;
 import com.ycwl.basic.model.mobile.order.PriceObj;
+import com.ycwl.basic.model.pc.device.entity.DeviceEntity;
 import com.ycwl.basic.model.pc.face.entity.FaceEntity;
 import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
 import com.ycwl.basic.model.pc.mp.MpConfigEntity;
 import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
+import com.ycwl.basic.model.pc.source.entity.SourceEntity;
 import com.ycwl.basic.model.pc.source.entity.SourceWatermarkEntity;
 import com.ycwl.basic.model.pc.source.req.SourceReqQuery;
 import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
@@ -31,6 +33,7 @@ import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
 import com.ycwl.basic.model.pc.video.entity.MemberVideoEntity;
 import com.ycwl.basic.model.pc.video.req.VideoReqQuery;
 import com.ycwl.basic.model.pc.video.resp.VideoRespVO;
+import com.ycwl.basic.repository.DeviceRepository;
 import com.ycwl.basic.repository.FaceRepository;
 import com.ycwl.basic.repository.OrderRepository;
 import com.ycwl.basic.repository.ScenicRepository;
@@ -90,6 +93,8 @@ public class GoodsServiceImpl implements GoodsService {
     private FaceRepository faceRepository;
     @Autowired
     private TaskStatusBiz taskStatusBiz;
+    @Autowired
+    private DeviceRepository deviceRepository;
 
     public ApiResponse<List<GoodsPageVO>> goodsList(GoodsReqQuery query) {
         //查询原素材
@@ -662,6 +667,16 @@ public class GoodsServiceImpl implements GoodsService {
                         item.setUrl(any.get().getWatermarkUrl());
                     } else {
                         // 生成
+                        String text = scenicConfig.getWatermarkScenicText();
+                        if (StringUtils.isBlank(text)) {
+                            SourceEntity entity = sourceMapper.getEntity(item.getGoodsId());
+                            if (entity != null) {
+                                DeviceEntity device = deviceRepository.getDevice(entity.getDeviceId());
+                                if (device != null) {
+                                    text = device.getName();
+                                }
+                            }
+                        }
                         File dstFile = new File(item.getGoodsId() + ".jpg");
                         File watermarkedFile = new File(item.getGoodsId() + "_" + type.getType() + "." + type.getPreferFileType());
                         try {
@@ -674,7 +689,7 @@ public class GoodsServiceImpl implements GoodsService {
                         WatermarkInfo info = new WatermarkInfo();
                         info.setOriginalFile(dstFile);
                         info.setQrcodeFile(qrcode);
-                        info.setScenicLine(scenicConfig.getWatermarkScenicText());
+                        info.setScenicLine(text);
                         info.setDatetime(item.getCreateTime());
                         info.setDtFormat(scenicConfig.getWatermarkDtFormat());
                         info.setWatermarkedFile(watermarkedFile);