From cf8d61460dab21787835f79b4120eeb4ef4b07b1 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Tue, 19 Sep 2023 13:37:00 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=94=B6?= =?UTF-8?q?=E9=93=B6=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/ExportMerchantMicroPayVO.java | 8 ++------ .../com/iformall/domain/vo/PageMerchantMicroPayVO.java | 1 - .../main/java/com/iformall/enums/EnumCouponValidType.java | 5 ++++- .../service/impl/MarkingDataReportServiceImpl.java | 1 - 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/ExportMerchantMicroPayVO.java b/mallinkService/src/main/java/com/iformall/domain/vo/ExportMerchantMicroPayVO.java index 5a2d41a31..eb9f92df6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/ExportMerchantMicroPayVO.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/ExportMerchantMicroPayVO.java @@ -9,15 +9,11 @@ import java.util.Date; public class ExportMerchantMicroPayVO { @Excel(name = "订单编号", width = 20, orderNum = "1") private Long orderNumber; - @Excel(name = "订单金额(元)", width = 20, orderNum = "2") + @Excel(name = "收银金额", width = 20, orderNum = "2") private String paymentStr; - @Excel(name = "交易时间", width = 20, orderNum = "3", format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "收银时间", width = 20, orderNum = "3", format = "yyyy-MM-dd HH:mm:ss") private Date paymentTime; - @Excel(name = "订单状态", width = 20, orderNum = "4", replace = {"待付款_0", "已支付_1", "已取消_2", "待退款_3", "已退款_4", "退款失败_5", " _-1"}) - private Integer orderStatus; @Excel(name = "商户名称", width = 20, orderNum = "5") private String merchantName; - @Excel(name = "商户手机号", width = 20, orderNum = "6") - private String merchantPhone; private Long merchantId; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/PageMerchantMicroPayVO.java b/mallinkService/src/main/java/com/iformall/domain/vo/PageMerchantMicroPayVO.java index 630908d01..fd8e126fe 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/PageMerchantMicroPayVO.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/PageMerchantMicroPayVO.java @@ -21,7 +21,6 @@ public class PageMerchantMicroPayVO extends WxOrder { vo.setOrderNumber(data.getOrderNumber()); vo.setPaymentStr(data.getPaymentStr()); vo.setPaymentTime(data.getPaymentTime()); - vo.setOrderStatus(data.getOrderStatus()); vo.setMerchantId(data.getMerchantId()); return vo; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponValidType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponValidType.java index d2ed6aad5..a25b56370 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponValidType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponValidType.java @@ -1,5 +1,8 @@ package com.iformall.enums; +import com.iformall.common.ErrorCode; +import com.iformall.exception.BizException; + /** * Created by Stormeye on 2018/08/09. */ @@ -18,7 +21,7 @@ public enum EnumCouponValidType { return value; } } - return null; + throw new BizException(ErrorCode.SYS_PARAMETER_ERROR); } private Integer code; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 31bf910e5..a860f8585 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -646,7 +646,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { List result = vos.stream().map(PageMerchantMicroPayVO::mapping).map(x -> { ListMerchantVO vo = merchantMap.get(x.getMerchantId()); x.setMerchantName(vo.getMerchantName()); - x.setMerchantPhone(vo.getPhone()); return x; }).collect(Collectors.toList()); excelService.exportExcel(result, null, "收银记录", ExportMerchantMicroPayVO.class, "收银记录.xlsx", response, false);