Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
36dd25b43a
3 changed files with 8 additions and 0 deletions
  1. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java
  2. +5
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillNotify.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java

+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java View File

@@ -136,6 +136,7 @@ public class WxBillDailyController extends BillBaseController {
wxBillDaily.setPayWay(null);
wxBillDaily.setPayDate(null);
wxBillDaily.setReceiveDate(wxBillDaily.getStarttime());
wxBillDaily.setRemark(wxBillDaily.getBillRemark());
return wxBillDailyService.saveOrUpdate(wxBillDaily, user);
}

@@ -147,6 +148,7 @@ public class WxBillDailyController extends BillBaseController {
wxBillDaily.setPayWay(null);
wxBillDaily.setPayDate(null);
wxBillDaily.setReceiveDate(wxBillDaily.getStarttime());
wxBillDaily.setRemark(wxBillDaily.getBillRemark());
return wxBillDailyService.saveOrUpdate(wxBillDaily, user);
}



+ 5
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxBillNotify.java View File

@@ -21,6 +21,11 @@ public class WxBillNotify implements Serializable {
private Date endtime;
private String receivePay;
private String pay;
private String owe;
private Long merchantId;
private String merchantName;
public String getOwe() {
return new BigDecimal(receivePay).subtract(new BigDecimal(pay)).toPlainString();
}
}

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java View File

@@ -297,6 +297,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
return new ResultData(ErrorCode.BILL_IS_FOUND.getCode(),"商户已存在其他包含该时间端的费用账单");
}
wxBillDaily.setUpdatetime(date);
wxBillDaily.setRemark(record.getRemark());
wxBillDailyMapper.updateById(wxBillDaily);
return new ResultData(Result.SUCCESS, "更新日常账单成功");
}


Loading…
Cancel
Save