diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java index ce8b906b2..6c106f8ec 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java @@ -107,7 +107,7 @@ public class WxBillRentController extends BaseController { @SystemControllerLog(description = "租赁押金账单-更新营业额") public ResultData updateRevenue(@RequestBody WxBillRent wxBillRent) { logger.debug("[" + getIpAddr() + "] WxBillRentController::updateRevenue"); - return wxBillRentService.updateRevenue(wxBillRent); + return wxBillRentService.updateRevenue(wxBillRent, getUser()); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index 900a4ecc1..8075e7921 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -4,7 +4,6 @@ import java.util.*; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxBillRent; /** @@ -54,7 +53,7 @@ public interface WxBillRentService { Object detail(Long id); - ResultData updateRevenue(WxBillRent wxBillRent); + ResultData updateRevenue(WxBillRent wxBillRent, MallUserInfo user); ResultData updateLatePayStatus(WxBillRent wxBillRent); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index aa64f95cd..b70ec80d0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -222,11 +222,14 @@ public class WxBillRentServiceImpl implements WxBillRentService { return result; } + @Transactional(rollbackFor = {Exception.class}) @Override - public ResultData updateRevenue(WxBillRent record) { + public ResultData updateRevenue(WxBillRent record, MallUserInfo user) { WxBillRent wxBillRent = wxBillRentMapper.selectByPrimaryKey(record.getId()); + Long oldPrice = wxBillRent.getReceivePay(); + Long newPrice = record.getReceivePay(); wxBillRent.setRevenue(record.getRevenue()); - wxBillRent.setReceivePay(record.getReceivePay()); + wxBillRent.setReceivePay(oldPrice.equals(newPrice) ? oldPrice : newPrice); wxBillRent.setUpdatetime(new Date()); try { wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); @@ -234,6 +237,23 @@ public class WxBillRentServiceImpl implements WxBillRentService { logger.error("修改营业额失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "修改营业额失败"); } + if (!oldPrice.equals(newPrice)) { + //日志 + WxBillAction wxBillAction = new WxBillAction(); + wxBillAction.setBillId(wxBillRent.getId()); + wxBillAction.setDetails("录入营业额时应收金额" + oldPrice + "元变更成" + newPrice + "元"); + wxBillAction.setAction(EnumBillAction.UPDATE_BILL.getCode()); + wxBillAction.setUserId(user.getId()); + wxBillAction.setUserName(user.getName()); + wxBillAction.setPhone(user.getPhone()); + wxBillAction.setTenantId(wxBillRent.getTenantId()); + try { + wxBillActionService.save(wxBillAction); + } catch (Exception e) { + logger.error("添加租赁账单行为日志,e:" + e.getMessage()); + throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "修改营业额失败"); + } + } return new ResultData(Result.SUCCESS, "修改营业额成功", wxBillRent); }