Explorar el Código

[合同][修改][开发账单结算]

release_toaliyun_real
luozukai hace 6 años
padre
commit
72d83a5e8f
Se han modificado 3 ficheros con 9 adiciones y 14 borrados
  1. +3
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  2. +5
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 3
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java Ver fichero

@@ -283,7 +283,7 @@ public class WxBillRentServiceImpl implements WxBillRentService {
wxBillRent.setRevenue(record.getRevenue()); wxBillRent.setRevenue(record.getRevenue());


Integer ratio = 0; Integer ratio = 0;
if(wxRentContract.getPayRatio() != null){
if(wxRentContract.getPayRatio() != null && wxRentContract.getPayRatio().intValue() > 0){
ratio = wxRentContract.getPayRatio(); ratio = wxRentContract.getPayRatio();
}else{ }else{
if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){ if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){
@@ -319,17 +319,13 @@ public class WxBillRentServiceImpl implements WxBillRentService {


Long oldPrice = wxBillRent.getReceivePay(); Long oldPrice = wxBillRent.getReceivePay();
Long newPrice = newReceivePay; Long newPrice = newReceivePay;
//wxBillRent.setReceivePay(oldPrice.equals(newPrice) ? oldPrice : newPrice);
wxBillRent.setUpdatetime(new Date()); wxBillRent.setUpdatetime(new Date());


//如果在跳点区间中,修改扣点率 //如果在跳点区间中,修改扣点率

wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent);
if(StringUtils.isNotBlank(wxRentContract.getBusDiscountRatio())){ 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)) { if (!oldPrice.equals(newPrice)) {
//日志 //日志


+ 5
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Ver fichero

@@ -378,12 +378,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if(record.getRevenue() == null || record.getRevenue().longValue() <= 0){ if(record.getRevenue() == null || record.getRevenue().longValue() <= 0){
record.setPrice(0l); record.setPrice(0l);
}else{ }else{
if(record.getPayRatio()!=null){
if(record.getPayRatio()!=null && record.getPayRatio().intValue() > 0){
record.setPrice(countPrice(record.getPayRatio(),record.getRevenue())); record.setPrice(countPrice(record.getPayRatio(),record.getRevenue()));
}else{ }else{
int dayCount = record.getReceivePeriod() * 30; int dayCount = record.getReceivePeriod() * 30;
RatioVo ratioVo = getPayRatio(EnumGetRatioFrom.RENT.getCode(),record.getRevenue(),record.getBusDiscountRatio(),record.getBusDiscountTime(),dayCount,record.getReceivePeriod()); 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){ if(ratioVo.getBalance() != null){
//有超出部分,在getPayRatio里计算 //有超出部分,在getPayRatio里计算
record.setPrice(ratioVo.getBalance().longValue()); record.setPrice(ratioVo.getBalance().longValue());
@@ -597,8 +597,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillRentMapper.insertBills(record.getPreviewBillRentList()); wxBillRentMapper.insertBills(record.getPreviewBillRentList());
} }




public ResultData getResultDataForUpdate(WxRentContract record, Long userId,int from,Date oldRentStartDate) { public ResultData getResultDataForUpdate(WxRentContract record, Long userId,int from,Date oldRentStartDate) {
//更新租赁合同信息 //更新租赁合同信息
WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(record.getId()); WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(record.getId());
@@ -607,6 +605,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
} }
wxRentContract.setBusDiscountTime(record.getBusDiscountTime()); wxRentContract.setBusDiscountTime(record.getBusDiscountTime());
wxRentContract.setBusDiscountRatio(record.getBusDiscountRatio()); wxRentContract.setBusDiscountRatio(record.getBusDiscountRatio());
wxRentContract.setPayRatio(record.getPayRatio());


int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; 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(!EnumFromType.SWITCH.getCode().equals(from)){
if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) { 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())); record.setPrice(countPrice(record.getPayRatio(),record.getRevenue()));
}else{ }else{
int dayCount = record.getReceivePeriod() * 30; int dayCount = record.getReceivePeriod() * 30;
RatioVo ratioVo = getPayRatio(EnumGetRatioFrom.RENT.getCode(),record.getRevenue(),record.getBusDiscountRatio(),record.getBusDiscountTime(),dayCount,record.getReceivePeriod()); 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){ if(ratioVo.getBalance() != null){
//有超出部分,在getPayRatio里计算 //有超出部分,在getPayRatio里计算
record.setPrice(ratioVo.getBalance().longValue()); record.setPrice(ratioVo.getBalance().longValue());


+ 1
- 1
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Ver fichero

@@ -97,7 +97,7 @@
select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, 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, 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, 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` 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, 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 r.late_pay_day,r.late_pay_ratio


Cargando…
Cancelar
Guardar