소스 검색

fix bug

release_toaliyun_real
zhengfangyuan 3 년 전
부모
커밋
cece0c53e4
1개의 변경된 파일10개의 추가작업 그리고 2개의 파일을 삭제
  1. +10
    -2
      mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java

+ 10
- 2
mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java 파일 보기

@@ -63,7 +63,11 @@ public class WxRentContractHelper {
priceArr[i] = new BigDecimal(priceStr).multiply(new BigDecimal(rentArea)).multiply(new BigDecimal(100)).longValue();
}
List<long[]> priceList = computeRatioByShop(rentInfoArray,wxRentContract.getBussinessManagementFeeRatioWay(),priceArr,feeRatioField);
return calcuteRatioByPart(priceList, feeRatioField);
if (null != priceList) {
return calcuteRatioByPart(priceList, feeRatioField);
}else {
return null;
}
}else {
String rentArea = wxRentContract.getRentArea();
if (rentArea == null || rentArea.equalsIgnoreCase("NaN")) {
@@ -93,6 +97,7 @@ public class WxRentContractHelper {
return calcuteRentPriceByJoin(wxRentContract);
}
//计算单个店铺每年租金基数(分铺录入)
public static List<long[]> computeRentPriceByShop(WxRentContract wxRentContract) {
JSONArray rentInfoArray = JSONArray.parseArray(wxRentContract.getRentInfo());
long[] priceArr = new long[rentInfoArray.size()];
@@ -318,7 +323,10 @@ public class WxRentContractHelper {
//大于一年
JSONObject rentInfoObject = rentInfoArray.getJSONObject(0);
JSONArray adjustRatio = rentInfoObject.getJSONArray(ratioKey);//[100,200]
return computeRatioFromRentInfo(priceList, rentInfoArray, ratioWayType, adjustRatio.size(), ratioKey);
if (null != adjustRatio) {
return computeRatioFromRentInfo(priceList, rentInfoArray, ratioWayType, adjustRatio.size(), ratioKey);
}
return null;
}
//计算年调整后的某项计费


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