diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java index ee944d3cd..cce99527c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java @@ -24,13 +24,28 @@ public class WxProfitSharingOrderVo extends TenantEntity { private String mchId; private Long sharingMerchantId; - @Excel(name="商户名称",width = 20,orderNum = "2") - private String merchantName; - @Excel(name="商户单号",width = 20,orderNum = "1") private Long orderId; - @Excel(name="交易金额(分)",width = 20,orderNum = "3") + @Excel(name="商户名称",width = 20,orderNum = "2") + private String merchantName; + + @Excel(name="收款商户",width = 20,orderNum = "3") + private String payMerchantName; + + @Excel(name="到账商户",width = 20,orderNum = "4") + private String sharingMerchantName; + + public String getSharingMerchantName(){ + if(this.sharingMerchantId != null && this.sharingMerchantId.equals(this.merchantId)){ + this.sharingMerchantName = this.merchantName; + }else if(this.sharingMerchantId != null && this.sharingMerchantId.equals(this.payMerchantId)){ + this.sharingMerchantName = this.payMerchantName; + } + return sharingMerchantName; + } + + @Excel(name="交易金额(分)",width = 20,orderNum = "5") private Integer payAmount; @io.swagger.annotations.ApiModelProperty(value="订单ID",name="singleOrderId") @@ -38,23 +53,23 @@ public class WxProfitSharingOrderVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="单个订单分账总金额(分)",name="singleOrderAmount") private Integer singleOrderAmount; - @Excel(name="交易结束时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "5") + @Excel(name="交易结束时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "7") private Date payTimeEnd; - @Excel(name="交易开始时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "4") + @Excel(name="交易开始时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 20,orderNum = "6") private Date payTimeStart; private String transactionId; private String sharingOrderNo; - @Excel(name="分账类型",width = 20,replace = { "单次分账_0", "多次分账_1", "完结分账(多次)_2", "完结分账(单次)_3"},orderNum = "6") + @Excel(name="分账类型",width = 20,replace = { "单次分账_0", "多次分账_1", "完结分账(多次)_2", "完结分账(单次)_3"},orderNum = "8") private Integer type; private String pointDeduction; private String receivers; private String errorMsg; - @Excel(name="分账状态",width = 20,replace = { "未知_0", "提交订单失败_1", "提交业务失败_2", "受理成功_3", "处理中_4", "处理完成_5", "处理失败_6"},orderNum = "7") + @Excel(name="分账状态",width = 20,replace = { "未知_0", "提交订单失败_1", "提交业务失败_2", "受理成功_3", "处理中_4", "处理完成_5", "处理失败_6"},orderNum = "9") private Integer sharingStatus; private Date updateTime; private Date createTime; diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml index 89910be78..5733c25b6 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml @@ -154,9 +154,7 @@ from wx_profit_sharing_order - - - + @@ -168,6 +166,7 @@ + @@ -184,11 +183,13 @@ +