From 812369849a917264e728f5fd494f20c735d5d2b6 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 7 Aug 2024 18:04:59 +0800 Subject: [PATCH] fix --- .../data/PrintMerchantSettleDataHandler.java | 1 + .../impl/WxPropertyContractServiceImpl.java | 22 +++++++++---------- .../impl/WxRentContractServiceImpl.java | 22 +++++++++---------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/print/data/PrintMerchantSettleDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/PrintMerchantSettleDataHandler.java index 9accf50d6..38deba13a 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/PrintMerchantSettleDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/PrintMerchantSettleDataHandler.java @@ -18,6 +18,7 @@ public class PrintMerchantSettleDataHandler extends AbstractPrintDataParser { @Override public Object getObjectValue(String name, Object o,Map merchantMap,Map feesMap) { PrintMerchantSettleVo receive = (PrintMerchantSettleVo) o; + //根据科目来查询对应的信息 // if (name.equals("id")) { // return receive.getId(); // }else if (name.equals("createtime")) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 573dc42ca..d56c329c0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -666,20 +666,20 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService for (int i = 0; i < size; i++) { Calendar instance = Calendar.getInstance(); Date startDate; - //自然月 - if(wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ - if(i == 0){ //第一期 - startDate = rentalStartDate; - }else{ - instance.setTime(rentalStartDate); - instance.add(Calendar.MONTH, month * i); - startDate = DateUtils.getFirstDayForCurrMonth(instance.getTime()); - } - }else{ +// //自然月 +// if(wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ +// if(i == 0){ //第一期 +// startDate = rentalStartDate; +// }else{ +// instance.setTime(rentalStartDate); +// instance.add(Calendar.MONTH, month * i); +// startDate = DateUtils.getFirstDayForCurrMonth(instance.getTime()); +// } +// }else{ instance.setTime(rentalStartDate); instance.add(Calendar.MONTH, month * i); startDate = instance.getTime(); - } +// } yearList.add(startDate); } Map resultMap = buildRent(receivePeriod, priceArr, yearList, wxPropertyContract.getReceivePeriodUnit(), wxPropertyContract, user, wxMerchant, billcount, isPreview, shopInfo,saveDb); 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 8bef23e2e..6f37d0730 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1029,20 +1029,20 @@ public class WxRentContractServiceImpl implements WxRentContractService { for (int i = 0; i < years; i++) { Calendar instance = Calendar.getInstance(); Date startDate; - //自然月 - if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ - if(i == 0){ //第一期 - startDate = rentalStartDate; - }else{ - instance.setTime(rentalStartDate); - instance.add(Calendar.MONTH, month * i); - startDate = DateUtils.getFirstDayForCurrMonth(instance.getTime()); - } - }else{ +// //自然月 +// if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ +// if(i == 0){ //第一期 +// startDate = rentalStartDate; +// }else{ +// instance.setTime(rentalStartDate); +// instance.add(Calendar.MONTH, month * i); +// startDate = DateUtils.getFirstDayForCurrMonth(instance.getTime()); +// } +// }else{ instance.setTime(rentalStartDate); instance.add(Calendar.MONTH, month * i); startDate = instance.getTime(); - } +// } yearList.add(startDate); }