From 0714af1b371e2038e9eca9ed766a44f3716aafc0 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 25 May 2024 12:30:19 +0800 Subject: [PATCH] fix --- .../main/java/com/iformall/domain/po/WxRentContract.java | 2 +- .../java/com/iformall/service/impl/WxBillBaseService.java | 2 -- .../iformall/service/impl/WxRentContractServiceImpl.java | 6 ++++++ .../src/main/java/com/iformall/utils/Constant.java | 1 + 4 files changed, 8 insertions(+), 3 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 ae1566c09..1d22bdca0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -222,7 +222,7 @@ public class WxRentContract extends TenantEntity { // private String taxpayerAdress; @io.swagger.annotations.ApiModelProperty(value = "金额小数点位数", name = "decimalSize") - private Integer decimalSize = 2 ; + private Integer decimalSize = Constant.default_short_decimal_size ; @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") private Long merchantId; @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(元)", name = "price") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillBaseService.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillBaseService.java index 5bf8d4a04..adc042860 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillBaseService.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillBaseService.java @@ -25,7 +25,6 @@ public class WxBillBaseService{ protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,String remark, MallUserInfo mallUserInfo) { WxBillAction wxBillAction = new WxBillAction(); - wxBillAction.updateTenantInfo(mallUserInfo); wxBillAction.setBillId(billId); wxBillAction.setBillType(billType); wxBillAction.setOldMoney(oldMoney); @@ -40,7 +39,6 @@ public class WxBillBaseService{ protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,String remark, WxMerchantBUser bUser) { WxBillAction wxBillAction = new WxBillAction(); - wxBillAction.updateTenantInfo(bUser); wxBillAction.setBillId(billId); wxBillAction.setBillType(billType); wxBillAction.setOldMoney(oldMoney); 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 be805a554..47e9c1afb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -652,6 +652,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { if(CollectionUtils.isEmpty(record.getPreviewBillRentList())){ return; } + if (null == record.getDecimalSize()) { + record.setDecimalSize(Constant.default_short_decimal_size); + } wxBillRentMapper.deletePreviewBill(record); WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); final IdWorker idWorker = IdWorker.get(); @@ -702,6 +705,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { if(CollectionUtils.isEmpty(record.getPreviewBillRentList())){ return; } + if (null == record.getDecimalSize()) { + record.setDecimalSize(Constant.default_short_decimal_size); + } WxBillRentManage wxBillRentManage = new WxBillRentManage(); wxBillRentManage.setRentContractId(record.getId()); wxBillRentManage.setManageFeeType(feeType.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index 3e6e8278f..18d64b610 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -136,6 +136,7 @@ public class Constant { public static final String cache_aliyun_msg ="aliyunMsg:"; public static final Integer default_long_decimal_size = 10; + public static final Integer default_short_decimal_size = 2; public static final Integer bill_near_default_days = 5; public static final Integer bill_all_type_manage_fee = 999;