Просмотр исходного кода

[预览账单][修改][修改预账单金额问题]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
cbffff6233
4 измененных файлов: 23 добавлений и 8 удалений
  1. +7
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906031645__L_ALTER_MSG.sql
  2. +1
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906031651__L_ALTER_MSG.sql
  3. +8
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  4. +7
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 7
- 0
mallinkAdmin/src/main/resources/db/migration/V201906031645__L_ALTER_MSG.sql Просмотреть файл

@@ -0,0 +1,7 @@
update wx_bill_rent set is_preview = 0 where rent_contract_id in(
select id from wx_rent_contract where apply_status = 2
);

update wx_bill_property set is_preview = 0 where property_contract_id in(
select id from wx_property_contract where apply_status = 2
);

+ 1
- 0
mallinkAdmin/src/main/resources/db/migration/V201906031651__L_ALTER_MSG.sql Просмотреть файл

@@ -0,0 +1 @@
alter table wx_merchant_trade_daily modify column trade_amt BIGINT(20);

+ 8
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Просмотреть файл

@@ -358,7 +358,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
//建立账单
WxPropertyContract record = wxPropertyContractMapper.selectByPrimaryKey(id);
if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode())
&& record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) {
&& record.getReceivePeriod() != null && record.getPrice() > 0) {
//WxBillProperty wxBillProperty = new WxBillProperty();
//wxBillProperty.setMerchantId(record.getMerchantId());
//List<Map<String, Object>> billPropertyList = wxBillPropertyMapper.queryBillPropertyList(wxBillProperty);
@@ -560,20 +560,24 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
priceD = new Double(price)/12;
}

SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM");
if(i == 0){//第一期
if(wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){
if(isFirstDay(billTimeVo.getStartDate())){
needpay = new Double(receivePeriod * priceD).longValue();
int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01");
needpay = new Double(months * priceD).longValue();
}else{
needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD, billTimeVo.getStartDate(), billTimeVo.getEndDate())).longValue();
}
}else{
needpay = new Double(receivePeriod * priceD).longValue();
int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01");
needpay = new Double(months * priceD).longValue();
}
}else if(i == billTimeVoList.size()-1){//最后
needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue();
}else{//中间
needpay = new Double(receivePeriod * priceD).longValue();
int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01");
needpay = new Double(months * priceD).longValue();
}
}



+ 7
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -950,20 +950,24 @@ public class WxRentContractServiceImpl implements WxRentContractService {
priceD = new Double(price)/12;
}

SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM");
if(i == 0){//第一期
if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){
if(isFirstDay(billTimeVo.getStartDate())){
needpay = new Double(receivePeriod * priceD).longValue();
int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01");
needpay = new Double(months * priceD).longValue();
}else{
needpay = new Double(getMonthNeedPay(priceD, billTimeVo.getStartDate(), billTimeVo.getEndDate())).longValue();
}
}else{
needpay = new Double(receivePeriod * priceD).longValue();
int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01");
needpay = new Double(months * priceD).longValue();
}
}else if(i == billTimeVoList.size()-1){//最后
needpay = new Double(getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue();
}else{//中间
needpay = new Double(receivePeriod * priceD).longValue();
int months = getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01");
needpay = new Double(months * priceD).longValue();
}
}

@@ -1277,7 +1281,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
record.getMerchantId() != null &&
record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) &&
record.getReceivePeriod() != null &&
record.getDeposit() > 0 &&
record.getPrice() > 0) {
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setMerchantId(record.getMerchantId());


Загрузка…
Отмена
Сохранить