소스 검색

[审批流][修改][完善账单审批]

release_toaliyun_real
luozukai 7 년 전
부모
커밋
7b3492220c
1개의 변경된 파일11개의 추가작업 그리고 1개의 파일을 삭제
  1. +11
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 11
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java 파일 보기

@@ -781,6 +781,14 @@ public class WxRentContractServiceImpl implements WxRentContractService {
return resultList;
}

public boolean isFirstDay(Date date){
int dateInt = Integer.parseInt(new SimpleDateFormat("d").format(date));
if(dateInt == 1){
return true;
}
return false;
}

public Map<String, Object> buildRent(int lease, int receivePeriod, int price, Date startdate, int dayType, WxRentContract wxRentContract, Long userId, WxMerchant wxMerchant, int billcount, Integer isPreview, Map<String, Object> shopInfo) {
String shopInfoStr = null;
if (shopInfo != null) {
@@ -794,7 +802,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
int index = paycount - 1;
final IdWorker idWorker = IdWorker.get();
//自然月 n+1
if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){
if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())
&& !isFirstDay(wxRentContract.getRentalStartDate())
){
paycount ++;
}
for (int i = 0; i < paycount; i++) {


불러오는 중...
취소
저장