From 6be75e3e37ecce6dc384bae2ae0b6386c2e5f8e8 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 22 May 2024 17:44:00 +0800 Subject: [PATCH] fix --- .../main/java/com/iformall/domain/po/WxRentContract.java | 3 ++- .../java/com/iformall/mapper/WxBillRentManageMapper.java | 2 +- .../main/java/com/iformall/mapper/WxBillRentMapper.java | 2 +- .../iformall/service/impl/WxRentContractServiceImpl.java | 8 ++++---- .../src/main/resources/mapper/WxBillRentManageMapper.xml | 2 +- .../src/main/resources/mapper/WxBillRentMapper.xml | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) 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 b9a945c80..ae1566c09 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -10,6 +10,7 @@ import com.iformall.enums.EnumPriceUnit; import com.iformall.enums.EnumRentContractAdjustPeriod; import com.iformall.enums.EnumRentContractDepositType; import com.iformall.enums.EnumRentContractType; +import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; @@ -458,7 +459,7 @@ public class WxRentContract extends TenantEntity { //如果是按铺位数算,price不用计算,是填写的值 if (!this.type.equals(EnumRentContractType.RENT_BY_COUNT.getCode())) { if (StringUtils.isNoneBlank(this.rentArea) && StringUtils.isNotBlank(this.rentPrice)) { - this.price = new BigDecimal(this.rentArea).multiply(new BigDecimal(this.rentPrice)).setScale(this.decimalSize, RoundingMode.HALF_UP).toPlainString(); + this.price = new BigDecimal(this.rentArea).multiply(new BigDecimal(this.rentPrice)).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString(); } } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java index b026ab435..19cde6907 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java @@ -31,7 +31,7 @@ public interface WxBillRentManageMapper extends CommonMapper resultList); + void insertBills(@Param("tenantId")String tenantId, @Param("list")List resultList); WxBillSum getBillMonthSum(WxBillRentManage wxBillRentManage); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index 821df61a2..ab0e1ec0a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -42,7 +42,7 @@ public interface WxBillRentMapper extends CommonMapper { Long oweBillCount(Long contractId); - void insertBills(List resultList); + void insertBills(@Param("tenantId")String tenantId, @Param("list")List resultList); void updateBills(@Param("bills") List resultList); 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 f82b12bc5..be805a554 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -692,7 +692,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //bill.setOwe(bill.getReceivePay()); count++; } - wxBillRentMapper.insertBills(record.getPreviewBillRentList()); + wxBillRentMapper.insertBills(record.getTenantId(),record.getPreviewBillRentList()); } /** @@ -761,7 +761,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { billList.add(bill); } if (billList.size() > 0 ) { - wxBillRentManageMapper.insertBills(billList); + wxBillRentManageMapper.insertBills(record.getTenantId(),billList); } } @@ -1632,9 +1632,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { //批量插入账单 if(saveDb) { - wxBillRentMapper.insertBills(resultList); + wxBillRentMapper.insertBills(wxRentContract.getTenantId(),resultList); if (manageList.size() > 0 ) { - wxBillRentManageMapper.insertBills(manageList); + wxBillRentManageMapper.insertBills(wxRentContract.getTenantId(),manageList); } } resultMap.put("billcount",billcount); diff --git a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml index 3cc455e8b..e1d39713c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml @@ -245,7 +245,7 @@ and br.status = 1 and c.id = #{contractId} - + INSERT INTO wx_bill_rent_manage (id,tenant_id,parent_tenant_id, rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index bea5a7af5..c14f13ca5 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -316,7 +316,7 @@ and br.status = 1 and c.id = #{contractId} - + INSERT INTO wx_bill_rent (id,tenant_id,parent_tenant_id, rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day, status, is_del, contract_need_pay,rent_price_info,need_pay,bussiness_manage_fee_need_pay,operating_manage_fee_need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime,