Bladeren bron

fix

release_toaliyun_real
winter 2 jaren geleden
bovenliggende
commit
96f319e4c9
2 gewijzigde bestanden met toevoegingen van 10 en 4 verwijderingen
  1. +9
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 9
- 3
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Bestand weergeven

@@ -167,7 +167,6 @@ public class WxRentContractController extends WxContractBaseController {
* @return * @return
*/ */
@PostMapping("add") @PostMapping("add")
@SystemControllerLog(description = "租赁合同-添加")
public ResultData add(@RequestBody WxRentContract wxRentContract) { public ResultData add(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::add"); logger.debug("[" + getIpAddr() + "] WxRentContractController::add");
Integer contractType = wxRentPropertyContractService.getContractType(wxRentContract.getRentShopType(), wxRentContract.getOperationType(), EnumContractType.RENT.getCode()); 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); 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秒重复提交 * 新增第二步 防止前端3秒重复提交
@@ -198,7 +206,6 @@ public class WxRentContractController extends WxContractBaseController {
* @return * @return
*/ */
@PostMapping("updateMoney") @PostMapping("updateMoney")
@SystemControllerLog(description = "租赁合同-更新金额")
public ResultData updateMoney(@RequestBody WxRentContract wxRentContract) { public ResultData updateMoney(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateMoney"); logger.debug("[" + getIpAddr() + "] WxRentContractController::updateMoney");
if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){
@@ -222,7 +229,6 @@ public class WxRentContractController extends WxContractBaseController {
* @return * @return
*/ */
@PostMapping("updateFile") @PostMapping("updateFile")
@SystemControllerLog(description = "租赁合同-更新文件")
public ResultData updateFile(@RequestBody WxRentContract wxRentContract) { public ResultData updateFile(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateFile"); logger.debug("[" + getIpAddr() + "] WxRentContractController::updateFile");
if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){ if(StringUtils.isBlank(wxRentContract.getBusDiscountRatio())){


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Bestand weergeven

@@ -675,7 +675,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bill.setShopId(shopIds.get(0)); bill.setShopId(shopIds.get(0));
} }
setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod()); setExpiredDay(bill,Calendar.MONTH,record.getReceivePeriod());
if (bill.getReceivePay().equals(0L)) {
if (bill.getReceivePay().equals("0")) {
bill.setStatus(EnumBillRentStatus.PAID.getCode()); bill.setStatus(EnumBillRentStatus.PAID.getCode());
bill.setPayDate(date); bill.setPayDate(date);
} }


Laden…
Annuleren
Opslaan