From 72d83a5e8f80f975409abc52f5d29f15dc69eea0 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 22 Aug 2019 15:45:14 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B4=A6=E5=8D=95=E7=BB=93=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxBillRentServiceImpl.java | 10 +++------- .../service/impl/WxRentContractServiceImpl.java | 11 +++++------ .../src/main/resources/mapper/WxBillRentMapper.xml | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 1213ba003..a87814659 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -283,7 +283,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRent.setRevenue(record.getRevenue()); Integer ratio = 0; - if(wxRentContract.getPayRatio() != null){ + if(wxRentContract.getPayRatio() != null && wxRentContract.getPayRatio().intValue() > 0){ ratio = wxRentContract.getPayRatio(); }else{ if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){ @@ -319,17 +319,13 @@ public class WxBillRentServiceImpl implements WxBillRentService { Long oldPrice = wxBillRent.getReceivePay(); Long newPrice = newReceivePay; - //wxBillRent.setReceivePay(oldPrice.equals(newPrice) ? oldPrice : newPrice); wxBillRent.setUpdatetime(new Date()); //如果在跳点区间中,修改扣点率 - - wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){ - wxRentContract.setPayRatio(ratio); - wxRentContract.setUpdatetime(new Date()); - wxRentContractMapper.updateByPrimaryKeySelective(wxRentContract); + wxBillRent.setPayRatio(new Long(ratio)); } + wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); if (!oldPrice.equals(newPrice)) { //日志 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 46ef1f505..d39a79595 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -378,12 +378,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { if(record.getRevenue() == null || record.getRevenue().longValue() <= 0){ record.setPrice(0l); }else{ - if(record.getPayRatio()!=null){ + if(record.getPayRatio()!=null && record.getPayRatio().intValue() > 0){ record.setPrice(countPrice(record.getPayRatio(),record.getRevenue())); }else{ int dayCount = record.getReceivePeriod() * 30; RatioVo ratioVo = getPayRatio(EnumGetRatioFrom.RENT.getCode(),record.getRevenue(),record.getBusDiscountRatio(),record.getBusDiscountTime(),dayCount,record.getReceivePeriod()); - record.setPayRatio(ratioVo.getRatio()); + //record.setPayRatio(ratioVo.getRatio()); if(ratioVo.getBalance() != null){ //有超出部分,在getPayRatio里计算 record.setPrice(ratioVo.getBalance().longValue()); @@ -597,8 +597,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillRentMapper.insertBills(record.getPreviewBillRentList()); } - - public ResultData getResultDataForUpdate(WxRentContract record, Long userId,int from,Date oldRentStartDate) { //更新租赁合同信息 WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(record.getId()); @@ -607,6 +605,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { } wxRentContract.setBusDiscountTime(record.getBusDiscountTime()); wxRentContract.setBusDiscountRatio(record.getBusDiscountRatio()); + wxRentContract.setPayRatio(record.getPayRatio()); int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; @@ -617,12 +616,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { if(!EnumFromType.SWITCH.getCode().equals(from)){ if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { - if(record.getPayRatio()!=null){ + if(record.getPayRatio()!=null && record.getPayRatio().intValue() > 0){ record.setPrice(countPrice(record.getPayRatio(),record.getRevenue())); }else{ int dayCount = record.getReceivePeriod() * 30; RatioVo ratioVo = getPayRatio(EnumGetRatioFrom.RENT.getCode(),record.getRevenue(),record.getBusDiscountRatio(),record.getBusDiscountTime(),dayCount,record.getReceivePeriod()); - record.setPayRatio(ratioVo.getRatio()); + //record.setPayRatio(ratioVo.getRatio()); if(ratioVo.getBalance() != null){ //有超出部分,在getPayRatio里计算 record.setPrice(ratioVo.getBalance().longValue()); diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index e5a01497e..18d1bf7ae 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -97,7 +97,7 @@ select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`need_pay`,r.merchant_name, s.shop_number,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,r.type as rent_type, - r.pay_ratio,br.`revenue`,r.`late_pay_ratio`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, + br.pay_ratio,br.`revenue`,r.`late_pay_ratio`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, d.receive_pay deposit,d.`status` deposit_status,br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime, r.late_pay_day,r.late_pay_ratio