From 48655a0d8a6f61ddf6ddae5488f15bb7b1c385bd Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 1 Aug 2024 21:28:51 +0800 Subject: [PATCH] fix --- .../contract/WxRentContractController.java | 5 +++ .../db/migration/V202408000000001.sql | 3 +- .../iformall/domain/po/WxRentContract.java | 2 + .../service/WxPropertyContractService.java | 2 + .../service/WxRentContractService.java | 2 + .../impl/WxPropertyContractServiceImpl.java | 6 +++ .../impl/WxRentContractServiceImpl.java | 40 +++++++++++++------ .../resources/mapper/WxRentContractMapper.xml | 8 +++- 8 files changed, 52 insertions(+), 16 deletions(-) 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 1adfe73ca..762d34f97 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -446,6 +446,8 @@ public class WxRentContractController extends WxContractBaseController { contract.setUpdatetime(new Date()); contract.setUpdateBy(user.getId()); wxRentContractService.updateRentContract(contract); + //删除预览的账单 + wxRentContractService.deletePrewBill(contract); if(contract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { if (null != wxRentContract.getPropertyId()) { @@ -455,6 +457,9 @@ public class WxRentContractController extends WxContractBaseController { propertyContract.setUpdatetime(new Date()); propertyContract.setUpdateBy(user.getId()); wxPropertyContractService.updatePropertyContract(propertyContract); + + //删除预览的账单 + wxPropertyContractService.deletePreviewBill(propertyContract); } } return new ResultData(); diff --git a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql index bfdc75530..080953d09 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql @@ -1,4 +1,5 @@ ALTER TABLE wx_rent_contract ADD COLUMN day_price_calcute INT(1) NOT NULL DEFAULT 1 COMMENT '每天价格计算规则'; ALTER TABLE wx_rent_contract ADD COLUMN month_average_days INT(2) COMMENT '每月平均天数'; ALTER TABLE wx_property_contract ADD COLUMN day_price_calcute INT(1) NOT NULL DEFAULT 1 COMMENT '每天价格计算规则'; -ALTER TABLE wx_property_contract ADD COLUMN month_average_days INT(2) COMMENT '每月平均天数'; \ No newline at end of file +ALTER TABLE wx_property_contract ADD COLUMN month_average_days INT(2) COMMENT '每月平均天数'; +ALTER TABLE wx_rent_contract ADD COLUMN fixed_price INT(1) NOT NULL DEFAULT 0 COMMENT '是否固定价格'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 7e0ec2c46..ae9a29022 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -229,6 +229,8 @@ public class WxRentContract extends TenantEntity { private String price; @TableField(exist = false) private String priceTwoDecimal;//2位小数 + @io.swagger.annotations.ApiModelProperty(value = "是否固定租金", name = "fixedPrice") + private Integer fixedPrice; @io.swagger.annotations.ApiModelProperty(value = "起租开始时间", name = "rentalStartDate") private Date rentalStartDate; @io.swagger.annotations.ApiModelProperty(value = "", name = "rentalEndDate") diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 8ecf6288e..959af9a55 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -92,6 +92,8 @@ public interface WxPropertyContractService { void updatePropertyContract(WxPropertyContract record); + void deletePreviewBill(WxPropertyContract record); + void setEndContractTime(WxPropertyContract proertyContract); List findToEndContractList(WxPropertyContract record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 168972fd9..403611cce 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -145,4 +145,6 @@ public interface WxRentContractService { void calcuteByTradeDaily(WxRentContract wxRentContract); + void deletePrewBill(WxRentContract wxRentContract); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 4afd7ed71..1984f014e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -448,6 +448,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService return new ResultData(Result.SUCCESS, "更新物业合同信息成功", record); } + @Override + public void deletePreviewBill(WxPropertyContract record) { + wxBillPropertyMapper.deleteBillByContract(record); + } + + @Override //@Transactional(rollbackFor = {Exception.class}) public ResultData updateFile(WxPropertyContract record, MallUserInfo user, String userName,boolean writeComplate) { 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 7cfed0803..5fec9ec86 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -602,19 +602,18 @@ public class WxRentContractServiceImpl implements WxRentContractService { if(CollectionUtils.isEmpty(record.getPreviewBillRentList())) { if (record.getReceivePeriod() != null && record.getLease() != null && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0)) { - //删除预账单,重新生成 - wxBillRentMapper.deleteBillByContract(record); - //删除商业管理费账单 - WxBillRentManage wxBillRentManage = new WxBillRentManage(); - wxBillRentManage.setRentContractId(record.getId()); - wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()); - wxBillRentManage.updateTenantInfo(record); - wxBillRentManageMapper.deletePreviewBill(wxBillRentManage); - //删除营业管理费账单 - wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()); - wxBillRentManageMapper.deletePreviewBill(wxBillRentManage); - - + deletePrewBill(record); +// //删除预账单,重新生成 +// wxBillRentMapper.deleteBillByContract(record); +// //删除商业管理费账单 +// WxBillRentManage wxBillRentManage = new WxBillRentManage(); +// wxBillRentManage.setRentContractId(record.getId()); +// wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()); +// wxBillRentManage.updateTenantInfo(record); +// wxBillRentManageMapper.deletePreviewBill(wxBillRentManage); +// //删除营业管理费账单 +// wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()); +// wxBillRentManageMapper.deletePreviewBill(wxBillRentManage); //联营扣点,不设置保底营业额,不生成账单 //if (EnumRentContractType.RENT_BY_JOINT.getCode().equals(record.getType()) && record.getRevenueRatio().equals(0)) { @@ -3480,4 +3479,19 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new BigDecimal(sumMoney); } } + + @Override + public void deletePrewBill(WxRentContract record) { + //删除预账单,重新生成 + wxBillRentMapper.deleteBillByContract(record); + //删除商业管理费账单 + WxBillRentManage wxBillRentManage = new WxBillRentManage(); + wxBillRentManage.setRentContractId(record.getId()); + wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode()); + wxBillRentManage.updateTenantInfo(record); + wxBillRentManageMapper.deletePreviewBill(wxBillRentManage); + //删除营业管理费账单 + wxBillRentManage.setManageFeeType(EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE.getCode()); + wxBillRentManageMapper.deletePreviewBill(wxBillRentManage); + } } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 2b778ee86..3acf6f8a4 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -130,6 +130,7 @@ + @@ -142,7 +143,7 @@ `deposit`,cashtype_content_lsit,cashtype_lsit,`pay_date`,`is_del`,`merchant_name`, `brand`,`business_id`,`shop_type`,`shop_type_str`,`updatetime`,`createtime`,`link_person`,`link_phone`,`link_address`, `pay_account`,`filename`,`lease`,`type`,`revenue`,`revenue_ratio`,`revenue_year`,`revenue_ratio_way`,`revenue_ratio_set`,`adjust_ratio`,`adjust_period`,`pay_ratio`, - `start_date`,`end_date`,`shop_name`,`from_id`,`end_contract_time`, + `start_date`,`end_date`,`shop_name`,`from_id`,`end_contract_time`,`fixed_price`, `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`, `business_type`,`rent_info`, `file_names`,price_unit,rent_price,other_rent_price_info,`subject_name`,rent_start_type, `rent_input_way`,`adjust_ratio_way`,`operation_type`,late_pay_ratio,late_pay_day,bus_discount_ratio,bus_discount_time, @@ -195,6 +196,7 @@ and json_contains(json_extract(rent_info,'$[*].id'),concat('"',#{queryShopId},'"')) and `day_price_calcute` = #{dayPriceCalcute} and `month_average_days` = #{monthAverageDays} + and `fixed_price` = #{fixedPrice} and shop_name like concat('%',#{shopNumber},'%') @@ -378,12 +380,13 @@ +