|
|
|
@@ -148,6 +148,9 @@ public class WxFinanceReceiveVo implements Serializable { |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "是否已结账完成", name = "isFinish") |
|
|
|
private Integer isFinish; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "支付给商户金额", name = "payMoney") |
|
|
|
private String payMoney; |
|
|
|
|
|
|
|
|
|
|
|
public void initByReceive(WxFinanceReceive receive,WxFinanceReceiveBill receiveBill) { |
|
|
|
@@ -169,6 +172,7 @@ public class WxFinanceReceiveVo implements Serializable { |
|
|
|
this.isPrint = receive.getIsPrint(); |
|
|
|
this.isFinish = receive.getIsFinish(); |
|
|
|
this.merchantName = receive.getMerchantName(); |
|
|
|
this.payMoney = receive.getPayMoney(); |
|
|
|
if (null != receiveBill) { |
|
|
|
this.rid = receiveBill.getId(); |
|
|
|
this.receiveId = receiveBill.getReceiveId(); |
|
|
|
|