|
|
|
@@ -1,15 +1,15 @@ |
|
|
|
package com.iformall.domain.po; |
|
|
|
|
|
|
|
import cn.afterturn.easypoi.excel.annotation.Excel; |
|
|
|
import io.swagger.models.auth.In; |
|
|
|
import lombok.Data; |
|
|
|
import javax.persistence.*; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.*; |
|
|
|
import javax.persistence.Transient; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
import javax.persistence.Id; |
|
|
|
import javax.persistence.Table; |
|
|
|
import javax.persistence.Transient; |
|
|
|
import java.io.Serializable; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
@Table(name = "wx_card_spend") |
|
|
|
@Data |
|
|
|
@@ -17,7 +17,6 @@ public class WxCardSpend implements Serializable { |
|
|
|
private static final long serialVersionUID = 1L; |
|
|
|
|
|
|
|
@Id |
|
|
|
@Excel(name="交易编号",width = 20,orderNum = "1") |
|
|
|
protected Long id; |
|
|
|
|
|
|
|
@Transient |
|
|
|
@@ -33,6 +32,8 @@ public class WxCardSpend implements Serializable { |
|
|
|
private Long ownerId; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") |
|
|
|
private Long merchantId; |
|
|
|
|
|
|
|
@Excel(name = "订单号", width = 20, orderNum = "5") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="订单账号",name="orderId") |
|
|
|
private Long orderId; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") |
|
|
|
@@ -43,6 +44,7 @@ public class WxCardSpend implements Serializable { |
|
|
|
private Integer payment; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="实收金额(不包含通道费)",name="realPayment") |
|
|
|
private Integer realPayment; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value="卡剩余总金额",name="cardRemainAmount") |
|
|
|
private Integer cardRemainAmount; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="卡支付前总金额",name="cardBeforeAmount") |
|
|
|
@@ -58,20 +60,20 @@ public class WxCardSpend implements Serializable { |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") |
|
|
|
private Date updateDate; |
|
|
|
|
|
|
|
@Excel(name="补贴状态",width = 20,orderNum = "10",replace = { "未支付_0", "已分账_1","已人工分账_2"}) |
|
|
|
@Excel(name = "支付状态", width = 20, orderNum = "11", replace = {"未支付_0", "已分账_1", "已人工分账_2"}) |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="支付状态(0:未分帐, 1:已分账, 2:已人工分账)",name="payStatus") |
|
|
|
private Integer payStatus; |
|
|
|
|
|
|
|
@Transient |
|
|
|
@Excel(name="消费金额",width = 20,orderNum = "7") |
|
|
|
@Excel(name = "消费金额(元)", width = 20, orderNum = "7") |
|
|
|
private String deductionAmountStr; |
|
|
|
|
|
|
|
@Transient |
|
|
|
@Excel(name="收款金额",width = 20,orderNum = "8") |
|
|
|
@Excel(name = "应付金额(元)", width = 20, orderNum = "9") |
|
|
|
private String paymentStr; |
|
|
|
|
|
|
|
@Transient |
|
|
|
@Excel(name="收款实际金额",width = 20,orderNum = "9") |
|
|
|
@Excel(name = "实付金额(扣除手续费/元)", width = 20, orderNum = "8") |
|
|
|
private String realPaymentStr; |
|
|
|
|
|
|
|
|
|
|
|
@@ -98,6 +100,14 @@ public class WxCardSpend implements Serializable { |
|
|
|
@Transient |
|
|
|
private Integer subBusinessId; |
|
|
|
|
|
|
|
public String getCardRemainAmountStr() { |
|
|
|
return new BigDecimal(cardRemainAmount == null ? 0 : cardRemainAmount).divide(new BigDecimal(100)).toPlainString(); |
|
|
|
} |
|
|
|
|
|
|
|
@Transient |
|
|
|
@Excel(name = "卡余额(元) ", width = 20, orderNum = "10") |
|
|
|
private String cardRemainAmountStr; |
|
|
|
|
|
|
|
public String getDeductionAmountStr() { |
|
|
|
if(getDeductionAmount()!=null) { |
|
|
|
deductionAmountStr = new BigDecimal(getDeductionAmount()).divide(new BigDecimal(100)).toString(); |
|
|
|
|