Sfoglia il codice sorgente

//sharing

release_toaliyun_real
xhxu 3 anni fa
parent
commit
5cecb90f34
1 ha cambiato i file con 6 aggiunte e 7 eliminazioni
  1. +6
    -7
      mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java

+ 6
- 7
mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java Vedi File

@@ -30,10 +30,9 @@ public class WxProfitSharingOrderVo extends TenantEntity {
@Excel(name="商户名称",width = 20,orderNum = "2") @Excel(name="商户名称",width = 20,orderNum = "2")
private String merchantName; private String merchantName;


@Excel(name="收款商户",width = 20,orderNum = "3")
private String payMerchantName; private String payMerchantName;


@Excel(name="到账商户",width = 20,orderNum = "4")
@Excel(name="到账商户",width = 20,orderNum = "3")
private String sharingMerchantName; private String sharingMerchantName;


public String getSharingMerchantName(){ public String getSharingMerchantName(){
@@ -45,7 +44,7 @@ public class WxProfitSharingOrderVo extends TenantEntity {
return sharingMerchantName; return sharingMerchantName;
} }


@Excel(name="交易金额(分)",width = 20,orderNum = "5")
@Excel(name="交易金额(分)",width = 20,orderNum = "4")
private Integer payAmount; private Integer payAmount;


@io.swagger.annotations.ApiModelProperty(value="订单ID",name="singleOrderId") @io.swagger.annotations.ApiModelProperty(value="订单ID",name="singleOrderId")
@@ -53,23 +52,23 @@ public class WxProfitSharingOrderVo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="单个订单分账总金额(分)",name="singleOrderAmount") @io.swagger.annotations.ApiModelProperty(value="单个订单分账总金额(分)",name="singleOrderAmount")
private Integer singleOrderAmount; private Integer singleOrderAmount;
@Excel(name="交易结束时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "7")
// @Excel(name="交易结束时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "5")
private Date payTimeEnd; private Date payTimeEnd;
@Excel(name="交易开始时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "6")
@Excel(name="核销时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "6")
private Date payTimeStart; private Date payTimeStart;
private String transactionId; private String transactionId;
private String sharingOrderNo; private String sharingOrderNo;
@Excel(name="分账类型",width = 20,replace = { "单次分账_0", "多次分账_1", "完结分账(多次)_2", "完结分账(单次)_3"},orderNum = "8")
@Excel(name="分账类型",width = 20,replace = { "单次分账_0", "多次分账_1", "完结分账(多次)_2", "完结分账(单次)_3"},orderNum = "7")
private Integer type; private Integer type;
private String pointDeduction; private String pointDeduction;
private String receivers; private String receivers;
private String errorMsg; private String errorMsg;
@Excel(name="分账状态",width = 20,replace = { "未知_0", "提交订单失败_1", "提交业务失败_2", "受理成功_3", "处理中_4", "处理完成_5", "处理失败_6"},orderNum = "9")
@Excel(name="分账状态",width = 20,replace = { "未知_0", "提交订单失败_1", "提交业务失败_2", "受理成功_3", "处理中_4", "处理完成_5", "处理失败_6"},orderNum = "8")
private Integer sharingStatus; private Integer sharingStatus;
private Date updateTime; private Date updateTime;
private Date createTime; private Date createTime;


Caricamento…
Annulla
Salva