Browse Source

feat:修改收银导出字段

release_toaliyun_real
xmzhao71 2 years ago
parent
commit
cf8d61460d
4 changed files with 6 additions and 9 deletions
  1. +2
    -6
      mallinkService/src/main/java/com/iformall/domain/vo/ExportMerchantMicroPayVO.java
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/PageMerchantMicroPayVO.java
  3. +4
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumCouponValidType.java
  4. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java

+ 2
- 6
mallinkService/src/main/java/com/iformall/domain/vo/ExportMerchantMicroPayVO.java View File

@@ -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;
}

+ 0
- 1
mallinkService/src/main/java/com/iformall/domain/vo/PageMerchantMicroPayVO.java View File

@@ -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;
}


+ 4
- 1
mallinkService/src/main/java/com/iformall/enums/EnumCouponValidType.java View File

@@ -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;


+ 0
- 1
mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java View File

@@ -646,7 +646,6 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
List<ExportMerchantMicroPayVO> 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);


Loading…
Cancel
Save