From da9d8429de3ed0cb809026d25aba481a390f5981 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 27 Nov 2023 10:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E5=93=81=E5=8D=A1=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E8=A7=84=E5=88=99+=E7=A4=BC=E5=93=81=E5=8D=A1=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../LpkCardBuildRecord.java | 2 +-
.../yyth/api/lpkcustomer/LpkCustomerVo.java | 1 +
.../yyth/api/lpkgiftcard/LpkGiftCardDto.java | 1 +
.../api/lpkgiftcard/LpkGiftCardExport.java | 22 ++++++
.../api/lpkgiftcard/LpkGiftCardListQuery.java | 2 +-
.../biz/lpkcustomer/LpkCustomerMapper.xml | 1 +
.../biz/lpkgiftcard/LpkGiftCardMapper.java | 9 +--
.../biz/lpkgiftcard/LpkGiftCardMapper.xml | 27 ++++++-
.../yyth/biz/lpkgiftcard/LpkGiftCardRest.java | 8 ++
.../biz/lpkgiftcard/LpkGiftCardService.java | 76 +++++++++++++++----
10 files changed, 126 insertions(+), 23 deletions(-)
create mode 100644 src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardExport.java
diff --git a/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecord.java b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecord.java
index fd46513..c3a4dd2 100644
--- a/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecord.java
+++ b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecord.java
@@ -29,5 +29,5 @@ public class LpkCardBuildRecord {
private String countNumber;
private String startNumber;
private String endNumber;
-
+ private String cardArea;
}
diff --git a/src/main/java/com/yxt/yyth/api/lpkcustomer/LpkCustomerVo.java b/src/main/java/com/yxt/yyth/api/lpkcustomer/LpkCustomerVo.java
index e287f8b..5b889f3 100644
--- a/src/main/java/com/yxt/yyth/api/lpkcustomer/LpkCustomerVo.java
+++ b/src/main/java/com/yxt/yyth/api/lpkcustomer/LpkCustomerVo.java
@@ -20,4 +20,5 @@ public class LpkCustomerVo implements Vo {
private String nick;
private String photo;
private String wxMpOpenid;
+ private String createTime;
}
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 274aba0..6985432 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardDto.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardDto.java
@@ -13,4 +13,5 @@ import lombok.Data;
public class LpkGiftCardDto implements Dto {
private String bagSid;
private String num;
+ private String cardArea;
}
diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardExport.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardExport.java
new file mode 100644
index 0000000..c6973fb
--- /dev/null
+++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardExport.java
@@ -0,0 +1,22 @@
+package com.yxt.yyth.api.lpkgiftcard;
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/11/27 10:34
+ */
+@Data
+public class LpkGiftCardExport {
+ @ExportEntityMap(CnName = "提货二维码", EnName = "pic")
+ private String pic;
+ @ExportEntityMap(CnName = "提货编码", EnName = "code")
+ private String code;
+ @ExportEntityMap(CnName = "提货密码", EnName = "codeKey")
+ private String codeKey;
+ @ExportEntityMap(CnName = "序列号", EnName = "serialNumber")
+ private String serialNumber;
+
+}
diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java
index 26f4ce5..5411cdb 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java
@@ -14,5 +14,5 @@ public class LpkGiftCardListQuery implements Query {
private String noStart; //序列号开始
private String noEnd; //序列号结束
private String sid;
- private String serialNumber;
+ private String number;
}
diff --git a/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerMapper.xml
index 74d98d6..6c5c184 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerMapper.xml
@@ -7,6 +7,7 @@
+
\ No newline at end of file
diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java
index 742486f..38e7275 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java
@@ -73,4 +73,12 @@ public class LpkGiftCardRest {
return lpkGiftCardService.recordDetails(pq);
}
+
+ @ApiOperation(value = "礼包卡信息列表导出")
+ @PostMapping("/exportExcel")
+ public ResultBean exportExcel(@RequestBody LpkGiftCardListQuery query) {
+ return lpkGiftCardService.exportExcel(query);
+ };
+
+
}
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 ff3ecc2..450ebe6 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
@@ -33,10 +34,13 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -58,6 +62,8 @@ public class LpkGiftCardService extends MybatisBaseService getGifCardBySid(String sid) {
ResultBean rb = new ResultBean().fail();
AppletVo vo = baseMapper.getGifCardBySid(sid);
@@ -133,9 +140,9 @@ public class LpkGiftCardService extends MybatisBaseService page = PagerUtil.queryToPage(pq);
@@ -273,11 +286,46 @@ public class LpkGiftCardService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
- public ResultBean changState(String cardSid,String state) {
- ResultBean rb=new ResultBean().fail();
- LpkGiftCard card=baseMapper.selectOne(new QueryWrapper().eq("sid",cardSid));
+
+ public ResultBean changState(String cardSid, String state) {
+ ResultBean rb = new ResultBean().fail();
+ LpkGiftCard card = baseMapper.selectOne(new QueryWrapper().eq("sid", cardSid));
card.setState(state);
baseMapper.updateById(card);
return rb.success().setData("成功");
}
+
+ public ResultBean exportExcel(LpkGiftCardListQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ String finUrl = "https://supervise.yxtsoft.com/lpkapi?code=";
+ QueryWrapper qw = new QueryWrapper<>();
+ qw.eq("1", "1");
+ if (StringUtils.isNotBlank(query.getState())) {
+ qw.eq("state", query.getState());
+ }
+ if (StringUtils.isNotBlank(query.getNumber())) {
+ qw.like("serialNumber", query.getNumber());
+ }
+ qw.eq("recordSid", query.getSid());
+ //得到所有要导出的数据
+ List exportList = baseMapper.exportExcel(qw);
+ if (!exportList.isEmpty()) {
+ for (LpkGiftCardExport lpkGiftCardExport : exportList) {
+ if (StringUtils.isNotBlank(lpkGiftCardExport.getCode())) {
+ lpkGiftCardExport.setPic(finUrl + lpkGiftCardExport.getCode());
+ }
+ }
+ }
+ //定义导出的excel名字
+ String excelName = "提货卡信息列表";
+ String fileNameURL = "";
+ try {
+ fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ //导出提货卡信息列表
+ ExportExcelUtils.export(fileNameURL, exportList, LpkGiftCardExport.class, response);
+ return rb.success();
+ }
}