fix：“优化优惠码导出接口，添加优惠码类型和折扣/抵扣值”

src/main/java/com/szwl/controller/TPromoCodeController.java

@@ -580,7 +580,7 @@ public class TPromoCodeController {
         if (workbook != null) {
             OutputStream os = null;
             try {
-                    os = response.getOutputStream();
+                os = response.getOutputStream();
                 SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
                 response.setContentType("application/vnd.ms-excel;charset=utf-8");
                 response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("优惠码数据" + format.format(new Date()) + ".xls", "UTF-8"));

src/main/java/com/szwl/model/dto/PromoCodeTarget.java

@@ -14,10 +14,16 @@ public class PromoCodeTarget {
     private Long code;
 
     /**
-     * 商家id
+     * 优惠码类型
      */
-    @Excel(name = "商家id", width = 20.0D)
-    private String adminId;
+    @Excel(name = "优惠码类型", width = 20.0D)
+    private String type;
+
+    /**
+     * 优惠码类型
+     */
+    @Excel(name = "优惠码折扣/抵扣", width = 20.0D)
+    private Float discount;
 
 
     /**
@@ -30,8 +36,7 @@ public class PromoCodeTarget {
      * 添加时间
      */
     @Excel(name = "添加时间", width = 20.0D)
-    private Date createDate;
-
+    private String createDate;
 
 
     /**
@@ -60,14 +65,6 @@ public class PromoCodeTarget {
         this.code = code;
     }
 
-    public String getAdminId() {
-        return adminId;
-    }
-
-    public void setAdminId(String adminId) {
-        this.adminId = adminId;
-    }
-
     public String getUserName() {
         return userName;
     }
@@ -76,14 +73,6 @@ public class PromoCodeTarget {
         this.userName = userName;
     }
 
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
     public String getIsUse() {
         return isUse;
     }
@@ -107,4 +96,28 @@ public class PromoCodeTarget {
     public void setUseBy(String useBy) {
         this.useBy = useBy;
     }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Float getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(Float discount) {
+        this.discount = discount;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
 }

src/main/java/com/szwl/service/impl/TPromoCodeServiceImpl.java

@@ -3,8 +3,10 @@ package com.szwl.service.impl;
 import com.szwl.model.dto.PromoCodeTarget;
 import com.szwl.model.entity.TPromoCode;
 import com.szwl.mapper.TPromoCodeMapper;
+import com.szwl.model.utils.DateUtils;
 import com.szwl.service.TPromoCodeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -27,8 +29,17 @@ public class TPromoCodeServiceImpl extends ServiceImpl<TPromoCodeMapper, TPromoC
         for(TPromoCode promoCode : list){
             PromoCodeTarget promoCodeTarget = new PromoCodeTarget();
             promoCodeTarget.setCode(promoCode.getCode());
-            promoCodeTarget.setAdminId(promoCode.getAdminId());
-            promoCodeTarget.setCreateDate(promoCode.getCreateDate());
+            if(StringUtils.isNotEmpty(promoCode.getType()) && promoCode.getType().equals("1")){
+                promoCodeTarget.setType("抵扣券");
+            }else {
+                promoCodeTarget.setType("折扣券");
+            }
+            promoCodeTarget.setDiscount(promoCode.getDiscount());
+            // 格式化时间
+            if(promoCode.getCreateDate()!=null) {
+                String formatPayDate = DateUtils.formatDate(promoCode.getCreateDate(), DateUtils.PATTERN_yyyy_MM_dd_HH_mm_ss);
+                promoCodeTarget.setCreateDate(formatPayDate);
+            }
             if(promoCode.getIsUse().equals("0")){
                 promoCodeTarget.setIsUse("未使用");
             }else {