diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index 250fccb07..dc08b2d71 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -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); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillNotify.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillNotify.java index b886deb21..365225e78 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillNotify.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillNotify.java @@ -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(); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index d45f9030a..e2f4ae0a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -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, "更新日常账单成功"); }