Просмотр исходного кода

Merge branch 'release_toaliyun_real' into release_toaliyun_real_offline_activity

release_toaliyun_real
winter 1 год назад
Родитель
Сommit
aa881596dd
1 измененных файлов: 4 добавлений и 0 удалений
  1. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveVo.java

+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveVo.java Просмотреть файл

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


Загрузка…
Отмена
Сохранить