| @@ -35,68 +35,65 @@ public class WxMerchantSubsidy extends BaseEntity { | |||
| super.setSortColumns(this.sortColumns); | |||
| return super.getSortColumns(); | |||
| } | |||
| /**租户ID**/ | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| /**订单ID*/ | |||
| @Excel(name="交易单号",width = 20,orderNum = "1") | |||
| @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") | |||
| private Long orderId; | |||
| /**订单支付类型(0:券1:付款码支付,2:C扫码支付,3,储值卡)*/ | |||
| @io.swagger.annotations.ApiModelProperty(value="订单支付类型(0:券1:付款码支付,2:C扫码支付,3,储值卡)",name="orderType") | |||
| private Integer orderType; | |||
| /**商户ID*/ | |||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | |||
| private Long merchantId; | |||
| /**券包ID/存储卡ID*/ | |||
| @io.swagger.annotations.ApiModelProperty(value="券包ID/存储卡ID",name="couponOrderId") | |||
| private Long couponOrderId; | |||
| /**券包类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)*/ | |||
| @io.swagger.annotations.ApiModelProperty(value="券包类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)",name="couponType") | |||
| private Integer couponType; | |||
| /**订单金额*/ | |||
| @io.swagger.annotations.ApiModelProperty(value="订单金额",name="orderPayment") | |||
| @SortColumn(column = "order_payment") | |||
| private Integer orderPayment; | |||
| /**接收金额(包含通道费)*/ | |||
| @io.swagger.annotations.ApiModelProperty(value="接收金额(包含通道费)",name="receiverPayment") | |||
| @SortColumn(column = "receiver_payment") | |||
| private Integer receiverPayment; | |||
| /**订单金额*/ | |||
| @Transient | |||
| @Excel(name="本次消费(元)",width = 20,orderNum = "4") | |||
| @io.swagger.annotations.ApiModelProperty(value="订单金额",name="orderPaymentStr") | |||
| private String orderPaymentStr; | |||
| /**接收金额(包含通道费)*/ | |||
| @Transient | |||
| @Excel(name="商户应收(元)",width = 20,orderNum = "5") | |||
| @io.swagger.annotations.ApiModelProperty(value="接收金额(包含通道费)",name="receiverPaymentStr") | |||
| private String receiverPaymentStr; | |||
| @Transient | |||
| @Excel(name="补贴(元)",width = 20,orderNum = "6") | |||
| @io.swagger.annotations.ApiModelProperty(value="补贴额(包含通道费)",name="subsidyStr") | |||
| private String subsidyStr; | |||
| /** 实收金额(不包含通道费)*/ | |||
| @io.swagger.annotations.ApiModelProperty(value=" 实收金额(不包含通道费)",name="realPayment") | |||
| private Integer realPayment; | |||
| @io.swagger.annotations.ApiModelProperty(value="补贴额(包含通道费)",name="subsidy") | |||
| private Integer subsidy; | |||
| /**线上补贴额/实收补贴额(通道费扣除)*/ | |||
| @io.swagger.annotations.ApiModelProperty(value="线上补贴额/实收补贴额(通道费扣除)",name="realSubsidy") | |||
| private Integer realSubsidy; | |||
| /**状态(0:未补贴, 1:已自动补贴, 2:已手工补贴)*/ | |||
| @Excel(name="补贴状态",width = 20,orderNum = "7",replace = { "未补贴_0", "已自动补贴_1","已手工补贴_2"}) | |||
| @io.swagger.annotations.ApiModelProperty(value="状态(0:未补贴, 1:已补贴, 2:已手工补贴)",name="status") | |||
| private Integer status; | |||
| /**创建时间*/ | |||
| @Excel(name="交易时间",width = 20,orderNum = "3",format="yyyy-MM-dd HH:mm") | |||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | |||
| private Date createDate; | |||
| /**更新时间*/ | |||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | |||
| @SortColumn(column = "update_date") | |||
| private Date updateDate; | |||