| @@ -222,7 +222,7 @@ public class WxRentContract extends TenantEntity { | |||||
| // private String taxpayerAdress; | // private String taxpayerAdress; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "金额小数点位数", name = "decimalSize") | @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") | @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(元)", name = "price") | @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(元)", name = "price") | ||||
| @@ -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) { | protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,String remark, MallUserInfo mallUserInfo) { | ||||
| WxBillAction wxBillAction = new WxBillAction(); | WxBillAction wxBillAction = new WxBillAction(); | ||||
| wxBillAction.updateTenantInfo(mallUserInfo); | |||||
| wxBillAction.setBillId(billId); | wxBillAction.setBillId(billId); | ||||
| wxBillAction.setBillType(billType); | wxBillAction.setBillType(billType); | ||||
| wxBillAction.setOldMoney(oldMoney); | 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) { | protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,String remark, WxMerchantBUser bUser) { | ||||
| WxBillAction wxBillAction = new WxBillAction(); | WxBillAction wxBillAction = new WxBillAction(); | ||||
| wxBillAction.updateTenantInfo(bUser); | |||||
| wxBillAction.setBillId(billId); | wxBillAction.setBillId(billId); | ||||
| wxBillAction.setBillType(billType); | wxBillAction.setBillType(billType); | ||||
| wxBillAction.setOldMoney(oldMoney); | wxBillAction.setOldMoney(oldMoney); | ||||
| @@ -652,6 +652,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| if(CollectionUtils.isEmpty(record.getPreviewBillRentList())){ | if(CollectionUtils.isEmpty(record.getPreviewBillRentList())){ | ||||
| return; | return; | ||||
| } | } | ||||
| if (null == record.getDecimalSize()) { | |||||
| record.setDecimalSize(Constant.default_short_decimal_size); | |||||
| } | |||||
| wxBillRentMapper.deletePreviewBill(record); | wxBillRentMapper.deletePreviewBill(record); | ||||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); | WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| @@ -702,6 +705,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| if(CollectionUtils.isEmpty(record.getPreviewBillRentList())){ | if(CollectionUtils.isEmpty(record.getPreviewBillRentList())){ | ||||
| return; | return; | ||||
| } | } | ||||
| if (null == record.getDecimalSize()) { | |||||
| record.setDecimalSize(Constant.default_short_decimal_size); | |||||
| } | |||||
| WxBillRentManage wxBillRentManage = new WxBillRentManage(); | WxBillRentManage wxBillRentManage = new WxBillRentManage(); | ||||
| wxBillRentManage.setRentContractId(record.getId()); | wxBillRentManage.setRentContractId(record.getId()); | ||||
| wxBillRentManage.setManageFeeType(feeType.getCode()); | wxBillRentManage.setManageFeeType(feeType.getCode()); | ||||
| @@ -136,6 +136,7 @@ public class Constant { | |||||
| public static final String cache_aliyun_msg ="aliyunMsg:"; | public static final String cache_aliyun_msg ="aliyunMsg:"; | ||||
| public static final Integer default_long_decimal_size = 10; | 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_near_default_days = 5; | ||||
| public static final Integer bill_all_type_manage_fee = 999; | public static final Integer bill_all_type_manage_fee = 999; | ||||