From ba4d2cb0f1f026da2c1095090a1ba54442a4088e Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 24 Nov 2023 15:34:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E5=93=81=E5=8D=A1=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/yyth/api/lpkgiftcard/LpkGiftCard.java  |  1 -
 .../yyth/api/lpkgiftcard/LpkGiftCardDto.java   |  2 +-
 .../api/lpkgiftcard/LpkGiftCardListVo.java     |  2 +-
 .../yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml |  3 +--
 .../biz/lpkgiftcard/LpkGiftCardService.java    | 18 ++----------------
 5 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java
index 8e41ab2..1ab2b58 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java
@@ -32,7 +32,6 @@ public class LpkGiftCard {
     private Date grantDate;
     private String customerMobile;
     private String customerSid;
-    private String picUrl;
 
 
 }
diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardDto.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardDto.java
index ccd874e..274aba0 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardDto.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardDto.java
@@ -11,6 +11,6 @@ import lombok.Data;
 @ApiModel(value = "礼品卡信息 数据传输对象", description = "礼品卡信息 数据传输对象")
 @Data
 public class LpkGiftCardDto implements Dto {
-    private String giftbagSid;
+    private String bagSid;
     private String num;
 }
diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java
index fd53be6..52ad772 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java
@@ -25,5 +25,5 @@ public class LpkGiftCardListVo implements Vo {
     private String grantDate;
     private String customerMobile;
     private String customerSid;
-    private String picUrl;
+  //  private String picUrl;
 }
diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
index e346d98..77c7959 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
@@ -42,8 +42,7 @@
         grantName,
         date_format(grantDate, '%Y-%m-%d') as grantDate,
         customerMobile,
-        customerSid,
-        picUrl
+        customerSid
         FROM
         lpk_giftcard
         <where>
diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
index 1a9e612..ec7960d 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
@@ -151,7 +151,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
 
     public ResultBean generateCard(LpkGiftCardDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(dto.getGiftbagSid())) {
+        if (StringUtils.isBlank(dto.getBagSid())) {
             return rb.setMsg("请添加礼包");
         }
         if (StringUtils.isBlank(dto.getNum())) {
@@ -162,18 +162,12 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
             LpkGiftCard card = new LpkGiftCard();
             card.setState("1");
             card.setCreateTime(new DateTime());
-            card.setGiftbagSid(dto.getGiftbagSid());
+            card.setGiftbagSid(dto.getBagSid());
             String uuid = UniqueIdGenerator.generateUniqueID();
             int randomNumber = new Random().nextInt(900000) + 100000;
             card.setCodeKey(String.valueOf(randomNumber));
             card.setCode(uuid);
             String maxSerNum = baseMapper.selctMaxSerNum();
-            try {
-                String s = genarateQRCode(uuid);
-                card.setPicUrl(s);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
             if (StringUtils.isBlank(maxSerNum)) {
                 card.setSerialNumber("00000001");
             } else {
@@ -208,14 +202,6 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         qw.orderByDesc("id");
         IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
         IPage<LpkGiftCardListVo> pagging = baseMapper.cardList(page, qw);
-        List<LpkGiftCardListVo> records = pagging.getRecords();
-        if (!records.isEmpty()) {
-            for (LpkGiftCardListVo record : records) {
-                if (StringUtils.isNotBlank(record.getPicUrl())) {
-                    record.setPicUrl(fileUploadComponent.getUrlPrefix() + record.getPicUrl());
-                }
-            }
-        }
         PagerVo<LpkGiftCardListVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }