diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index cd59c22db..14f0498e7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -167,7 +167,6 @@ public class WxRentContractController extends WxContractBaseController { * @return */ @PostMapping("add") - @SystemControllerLog(description = "租赁合同-添加") public ResultData add(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::add"); Integer contractType = wxRentPropertyContractService.getContractType(wxRentContract.getRentShopType(), wxRentContract.getOperationType(), EnumContractType.RENT.getCode()); @@ -191,6 +190,15 @@ public class WxRentContractController extends WxContractBaseController { return wxRentContractService.save(wxRentContract, user.getId(),user.getName(),oldDate); } + + /** + * 计算价格 + */ + @PostMapping("calcutePrice") + public ResultData calcutePrice(@RequestBody WxRentContract wxRentContract) { + wxRentContract.calcutePrice(); + return new ResultData(wxRentContract.getPrice()); + } /** * 新增第二步 防止前端3秒重复提交 @@ -198,7 +206,6 @@ public class WxRentContractController extends WxContractBaseController { * @return */ @PostMapping("updateMoney") - @SystemControllerLog(description = "租赁合同-更新金额") public ResultData updateMoney(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateMoney"); if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ @@ -222,7 +229,6 @@ public class WxRentContractController extends WxContractBaseController { * @return */ @PostMapping("updateFile") - @SystemControllerLog(description = "租赁合同-更新文件") public ResultData updateFile(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::updateFile"); if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 9e3c96dec..d33d368a8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -675,7 +675,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { bill.setShopId(shopIds.get(0)); } setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); - if (bill.getReceivePay().equals(0L)) { + if (bill.getReceivePay().equals("0")) { bill.setStatus(EnumBillRentStatus.PAID.getCode()); bill.setPayDate(date); }