Bläddra i källkod

[Bug][修改][dev version:.1486.1952 :商铺租赁合同:生成物业账单切换生成账单周期时间不对]

release_toaliyun_real
gongbiao 7 år sedan
förälder
incheckning
e741aa26a9
3 ändrade filer med 26 tillägg och 7 borttagningar
  1. +17
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java
  3. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 17
- 5
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Visa fil

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.Map; import java.util.Map;


/** /**
@@ -59,11 +60,12 @@ public class WxPropertyContractController extends BaseController {
MallUserInfo user = getUser(); MallUserInfo user = getUser();
wxPropertyContract.setTenantId(user.getTenantId()); wxPropertyContract.setTenantId(user.getTenantId());
wxPropertyContract.setAdjustPeriodHandle(); wxPropertyContract.setAdjustPeriodHandle();
Date oldDate = wxPropertyContract.getRentalStartDate();


if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate());
} }
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName());
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate);
} }


@PostMapping("updateRentStartTime") @PostMapping("updateRentStartTime")
@@ -72,6 +74,7 @@ public class WxPropertyContractController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime");
WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId());
propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate()); propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate());
Date oldDate = wxPropertyContract.getRentalStartDate();


if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
propertyContract.setRentalStartDate(propertyContract.getStartDate()); propertyContract.setRentalStartDate(propertyContract.getStartDate());
@@ -81,7 +84,7 @@ public class WxPropertyContractController extends BaseController {
propertyContract.setTenantId(user.getTenantId()); propertyContract.setTenantId(user.getTenantId());
propertyContract.setAdjustPeriodHandle(); propertyContract.setAdjustPeriodHandle();
propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); propertyContract.setRentStartType(wxPropertyContract.getRentStartType());
return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName());
return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(), oldDate);
} }




@@ -89,11 +92,20 @@ public class WxPropertyContractController extends BaseController {
@SystemControllerLog(description = "物业合同-修改") @SystemControllerLog(description = "物业合同-修改")
public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update"); logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update");
WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId());
propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate());
Date oldDate = wxPropertyContract.getRentalStartDate();

if (wxPropertyContract.getRentStartType() != null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) {
propertyContract.setRentalStartDate(propertyContract.getStartDate());
}

MallUserInfo user = getUser(); MallUserInfo user = getUser();
wxPropertyContract.setTenantId(user.getTenantId());
wxPropertyContract.setAdjustPeriodHandle();
propertyContract.setTenantId(user.getTenantId());
propertyContract.setAdjustPeriodHandle();
propertyContract.setRentStartType(wxPropertyContract.getRentStartType());
//第三步提交 SWITCH //第三步提交 SWITCH
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName());
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate);
} }


@GetMapping("/del") @GetMapping("/del")


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java Visa fil

@@ -6,6 +6,7 @@ import com.iformall.domain.po.WxPropertyContract;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;


@@ -36,9 +37,10 @@ public interface WxPropertyContractService {
* 保存或更新实体 * 保存或更新实体
* @param record * @param record
* @param userId * @param userId
* @param oldDate
* @return * @return
*/ */
ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName);
ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName, Date oldDate);


/** /**
* 根据Id删除实体 * 根据Id删除实体


+ 6
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Visa fil

@@ -211,7 +211,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService


@Override @Override
@Transactional(rollbackFor = {Exception.class}) @Transactional(rollbackFor = {Exception.class})
public ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName) {
public ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName, Date oldDate) {
// 保存调整金额(预账单调整) // 保存调整金额(预账单调整)
boolean haspreview = false; boolean haspreview = false;
if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){
@@ -318,6 +318,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
if (wxPropertyContract == null) { if (wxPropertyContract == null) {
return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND); return new ResultData(ErrorCode.PROPERTY_CONTRACT_IS_NOT_FOUND);
} }

record.setRentalStartDate(wxPropertyContract.getRentalStartDate()); record.setRentalStartDate(wxPropertyContract.getRentalStartDate());
record.setRentalEndDate(wxRentContract.getRentalEndDate()); record.setRentalEndDate(wxRentContract.getRentalEndDate());
record.setStartDate(wxRentContract.getStartDate()); record.setStartDate(wxRentContract.getStartDate());
@@ -707,6 +708,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
int receivePeriod = wxPropertyContract.getReceivePeriod().intValue(); int receivePeriod = wxPropertyContract.getReceivePeriod().intValue();
Integer lease = wxPropertyContract.getLease(); Integer lease = wxPropertyContract.getLease();
Date rentalStartDate = propertyContract.getRentalStartDate(); Date rentalStartDate = propertyContract.getRentalStartDate();
if (propertyContract.getRentShopType().equals(EnumRentStartType.STARTTIME.getCode())) {
rentalStartDate = propertyContract.getStartDate();
}
propertyContract.setRentalStartDate(rentalStartDate);
Long price = propertyContract.getPrice(); Long price = propertyContract.getPrice();


//按月计租 //按月计租


Laddar…
Avbryt
Spara