xhxu 3 лет назад
Родитель
Сommit
2ff2c186a0
2 измененных файлов: 10 добавлений и 9 удалений
  1. +8
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java

+ 8
- 7
mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java Просмотреть файл

@@ -19,6 +19,7 @@ public class WxCardSpend extends TenantEntity {
protected Long id;

@Excel(name = "订单类型", width = 20, orderNum = "8", replace = {"付款_0", "退款_1"})
@io.swagger.annotations.ApiModelProperty(value="EnumPayType",name="payType")
private Integer payType;

@@ -34,7 +35,7 @@ public class WxCardSpend extends TenantEntity {
private Long merchantId;
@TableField(exist = false)
private List<Long> merchantIdList;
@Excel(name = "订单号", width = 20, orderNum = "5")
@Excel(name = "订单号", width = 20, orderNum = "7")
@io.swagger.annotations.ApiModelProperty(value="订单账号",name="orderId")
private Long orderId;
@TableField(exist = false)
@@ -60,14 +61,14 @@ public class WxCardSpend extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="卡支付前总金额",name="cardBeforeRealAmount")
private Integer cardBeforeRealAmount;

@Excel(name="交易时间",width = 20,orderNum = "6",format="yyyy-MM-dd HH:mm")
@Excel(name="交易时间",width = 20,orderNum = "9",format="yyyy-MM-dd HH:mm")
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;

//@Excel(name = "支付状态", width = 20, orderNum = "11", replace = {"未支付_0", "已分账_1", "已人工分账_2"})
@Excel(name = "支付状态", width = 20, orderNum = "11", replace = {"未线上分账_0", "已线上分账_1", "已线下结算_2"})
@Excel(name = "支付状态", width = 20, orderNum = "14", replace = {"未线上分账_0", "已线上分账_1", "已线下结算_2", "退款中_3", "已退款_4"})
@io.swagger.annotations.ApiModelProperty(value="支付状态(0:未分帐, 1:已分账, 2:已人工分账, 10:预支付(POS))",name="payStatus")
private Integer payStatus;

@@ -84,15 +85,15 @@ public class WxCardSpend extends TenantEntity {
private String refundRemark;

@TableField(exist = false)
@Excel(name = "消费金额(元)", width = 20, orderNum = "7")
@Excel(name = "消费金额(元)", width = 20, orderNum = "10")
private String deductionAmountStr;

@TableField(exist = false)
@Excel(name = "应付金额(元)", width = 20, orderNum = "9")
@Excel(name = "应付金额(元)", width = 20, orderNum = "11")
private String paymentStr;

@TableField(exist = false)
@Excel(name = "实付金额(扣除手续费/元)", width = 20, orderNum = "8")
@Excel(name = "实付金额(扣除手续费/元)", width = 20, orderNum = "12")
private String realPaymentStr;


@@ -124,7 +125,7 @@ public class WxCardSpend extends TenantEntity {
}

@TableField(exist = false)
@Excel(name = "卡余额(元) ", width = 20, orderNum = "10")
@Excel(name = "卡余额(元) ", width = 20, orderNum = "13")
private String cardRemainAmountStr;

public String getDeductionAmountStr() {


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java Просмотреть файл

@@ -36,10 +36,10 @@ public class WxCardSpendVo extends WxCardSpend {
@io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName")
@Excel(name = "消费商户", width = 20, orderNum = "6")
private String merchantName;
@Excel(name = "补贴额(包含通道费)", width = 20, orderNum = "6")
@Excel(name = "补贴额(包含通道费)", width = 20, orderNum = "15")
@io.swagger.annotations.ApiModelProperty(value="补贴额(包含通道费)",name="subsidy")
private Integer subsidy;
@Excel(name = "线上补贴额/实收补贴额(通道费扣除)", width = 20, orderNum = "7")
@Excel(name = "线上补贴额/实收补贴额(通道费扣除)", width = 20, orderNum = "16")
@io.swagger.annotations.ApiModelProperty(value="线上补贴额/实收补贴额(通道费扣除)",name="realSubsidy")
private Integer realSubsidy;
@io.swagger.annotations.ApiModelProperty(value="补贴状态(0:未补贴, 1:已补贴)",name="status")


Загрузка…
Отмена
Сохранить