| @@ -136,6 +136,7 @@ public class WxBillDailyController extends BillBaseController { | |||||
| wxBillDaily.setPayWay(null); | wxBillDaily.setPayWay(null); | ||||
| wxBillDaily.setPayDate(null); | wxBillDaily.setPayDate(null); | ||||
| wxBillDaily.setReceiveDate(wxBillDaily.getStarttime()); | wxBillDaily.setReceiveDate(wxBillDaily.getStarttime()); | ||||
| wxBillDaily.setRemark(wxBillDaily.getBillRemark()); | |||||
| return wxBillDailyService.saveOrUpdate(wxBillDaily, user); | return wxBillDailyService.saveOrUpdate(wxBillDaily, user); | ||||
| } | } | ||||
| @@ -147,6 +148,7 @@ public class WxBillDailyController extends BillBaseController { | |||||
| wxBillDaily.setPayWay(null); | wxBillDaily.setPayWay(null); | ||||
| wxBillDaily.setPayDate(null); | wxBillDaily.setPayDate(null); | ||||
| wxBillDaily.setReceiveDate(wxBillDaily.getStarttime()); | wxBillDaily.setReceiveDate(wxBillDaily.getStarttime()); | ||||
| wxBillDaily.setRemark(wxBillDaily.getBillRemark()); | |||||
| return wxBillDailyService.saveOrUpdate(wxBillDaily, user); | return wxBillDailyService.saveOrUpdate(wxBillDaily, user); | ||||
| } | } | ||||
| @@ -21,6 +21,11 @@ public class WxBillNotify implements Serializable { | |||||
| private Date endtime; | private Date endtime; | ||||
| private String receivePay; | private String receivePay; | ||||
| private String pay; | private String pay; | ||||
| private String owe; | |||||
| private Long merchantId; | private Long merchantId; | ||||
| private String merchantName; | private String merchantName; | ||||
| public String getOwe() { | |||||
| return new BigDecimal(receivePay).subtract(new BigDecimal(pay)).toPlainString(); | |||||
| } | |||||
| } | } | ||||
| @@ -297,6 +297,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||||
| return new ResultData(ErrorCode.BILL_IS_FOUND.getCode(),"商户已存在其他包含该时间端的费用账单"); | return new ResultData(ErrorCode.BILL_IS_FOUND.getCode(),"商户已存在其他包含该时间端的费用账单"); | ||||
| } | } | ||||
| wxBillDaily.setUpdatetime(date); | wxBillDaily.setUpdatetime(date); | ||||
| wxBillDaily.setRemark(record.getRemark()); | |||||
| wxBillDailyMapper.updateById(wxBillDaily); | wxBillDailyMapper.updateById(wxBillDaily); | ||||
| return new ResultData(Result.SUCCESS, "更新日常账单成功"); | return new ResultData(Result.SUCCESS, "更新日常账单成功"); | ||||
| } | } | ||||