|
|
|
@@ -145,6 +145,9 @@ public class WxFinanceReceiveVo implements Serializable { |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "是否已删除", name = "isDel") |
|
|
|
private Integer isDel; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "是否已结账完成", name = "isFinish") |
|
|
|
private Integer isFinish; |
|
|
|
|
|
|
|
|
|
|
|
public void initByReceive(WxFinanceReceive receive,WxFinanceReceiveBill receiveBill) { |
|
|
|
@@ -164,7 +167,7 @@ public class WxFinanceReceiveVo implements Serializable { |
|
|
|
this.merchantId = receive.getMerchantId(); |
|
|
|
this.remark = receive.getRemark(); |
|
|
|
this.isPrint = receive.getIsPrint(); |
|
|
|
|
|
|
|
this.isFinish = receive.getIsFinish(); |
|
|
|
if (null != receiveBill) { |
|
|
|
this.rid = receiveBill.getId(); |
|
|
|
this.receiveId = receiveBill.getReceiveId(); |
|
|
|
|