|
|
|
@@ -95,6 +95,9 @@ public class WxFinanceReceiveVo implements Serializable { |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "收款编号", name = "receiveId") |
|
|
|
private Long receiveId; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value="支付时间",name="receiveDate") |
|
|
|
private Date receiveDate; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "账单编号", name = "billId") |
|
|
|
private Long billId; |
|
|
|
|
|
|
|
@@ -156,6 +159,7 @@ public class WxFinanceReceiveVo implements Serializable { |
|
|
|
this.isFinish = receive.getIsFinish(); |
|
|
|
this.merchantName = receive.getMerchantName(); |
|
|
|
this.payMoney = receive.getPayMoney(); |
|
|
|
this.receiveDate = receive.getReceiveDate(); |
|
|
|
if (null != receiveBill) { |
|
|
|
this.rid = receiveBill.getId(); |
|
|
|
this.receiveId = receiveBill.getReceiveId(); |
|
|
|
|