Просмотр исходного кода

[铜锣湾][添加][预账单]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
116de800d4
3 измененных файлов: 12 добавлений и 7 удалений
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java
  3. +9
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java Просмотреть файл

@@ -85,9 +85,9 @@ public class WxPropertyContractController extends BaseController {
*/ */
@ApiOperation("生成预览账单") @ApiOperation("生成预览账单")
@GetMapping(value = "/buildBill") @GetMapping(value = "/buildBill")
public ResultData buildBill(@ModelAttribute WxRentContract wxRentContract) {
public ResultData buildBill(@ModelAttribute WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::buildBill"); logger.debug("[" + getIpAddr() + "] WxPropertyContractController::buildBill");
return new ResultData(wxPropertyContractService.buildBill(wxRentContract));
return new ResultData(wxPropertyContractService.buildBill(wxPropertyContract));
} }


@RequestMapping("/download") @RequestMapping("/download")


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java Просмотреть файл

@@ -64,5 +64,5 @@ public interface WxPropertyContractService {


ResultData updatePropertyContractStatus(Long id); ResultData updatePropertyContractStatus(Long id);


List<WxBillProperty> buildBill(WxRentContract wxRentContract);
List<WxBillProperty> buildBill(WxPropertyContract wxPropertyContract);
} }

+ 9
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Просмотреть файл

@@ -735,15 +735,20 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
} }


@Override @Override
public List<WxBillProperty> buildBill(WxRentContract wxRentContract) {
public List<WxBillProperty> buildBill(WxPropertyContract wxPropertyContract) {
//生成预览账单 //生成预览账单
//根据租赁合同找到对应的物业合同,生成物业账单 //根据租赁合同找到对应的物业合同,生成物业账单
WxPropertyContract propertyContract = wxPropertyContractMapper.findOneByRentId(wxRentContract);
WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId());
if(propertyContract != null) { if(propertyContract != null) {
if(!wxRentContract.getLease().equals(propertyContract.getLease())
||!wxRentContract.getPrice().equals(propertyContract.getPrice())){
if(!wxPropertyContract.getReceivePeriod().equals(propertyContract.getReceivePeriod())
||!wxPropertyContract.getPrice().equals(propertyContract.getPrice())
||!wxPropertyContract.getDeposit().equals(propertyContract.getDeposit())){
wxBillPropertyMapper.deletePreviewBill(propertyContract); wxBillPropertyMapper.deletePreviewBill(propertyContract);
//重新生成 //重新生成
propertyContract.setPrice(wxPropertyContract.getPrice());
propertyContract.setDeposit(wxPropertyContract.getDeposit());
propertyContract.setReceivePeriod(wxPropertyContract.getReceivePeriod());
propertyContract.setPayAccount(wxPropertyContract.getPayAccount());
List<WxBillProperty> billList = buildProperty(new WxMerchant(),propertyContract,EnumIsPreview.YES.getCode()); List<WxBillProperty> billList = buildProperty(new WxMerchant(),propertyContract,EnumIsPreview.YES.getCode());
return billList; return billList;
} }


Загрузка…
Отмена
Сохранить