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

[合同][修改][自定义租金]

release_toaliyun_real
gongbiao 6 лет назад
Родитель
Сommit
f2a300e0af
2 измененных файлов: 28 добавлений и 6 удалений
  1. +5
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +23
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

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

@@ -560,12 +560,16 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
priceD = priceD + priceD * integers.get(i) / 10000.0; priceD = priceD + priceD * integers.get(i) / 10000.0;
priceArr[i] = new BigDecimal(priceD).setScale(0, RoundingMode.HALF_EVEN).longValue(); priceArr[i] = new BigDecimal(priceD).setScale(0, RoundingMode.HALF_EVEN).longValue();
} }
} else {
} else if (wxPropertyContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.MONEY.getCode())) {
long priceD = price; long priceD = price;
for (int i = 1; i < size; i++) { for (int i = 1; i < size; i++) {
priceD = priceD + integers.get(i); priceD = priceD + integers.get(i);
priceArr[i] = new BigDecimal(priceD).setScale(0, RoundingMode.HALF_EVEN).longValue(); priceArr[i] = new BigDecimal(priceD).setScale(0, RoundingMode.HALF_EVEN).longValue();
} }
} else {
for (int i = 1; i < size; i++) {
priceArr[i] = new BigDecimal(integers.get(i)).setScale(0, RoundingMode.HALF_EVEN).longValue();
}
} }


int month = 12; int month = 12;


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

@@ -995,7 +995,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
for (int i = 0; i < arraySize; i++) { for (int i = 0; i < arraySize; i++) {
JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
String priceStr = rentInfoObject.getString("price"); String priceStr = rentInfoObject.getString("price");
if(priceStr.equalsIgnoreCase("NaN")) {
if (priceStr.equalsIgnoreCase("NaN")) {
priceStr = "0"; priceStr = "0";
} }
priceArr[i] = new BigDecimal(priceStr).multiply(new BigDecimal(100)).longValue(); priceArr[i] = new BigDecimal(priceStr).multiply(new BigDecimal(100)).longValue();
@@ -1018,7 +1018,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
} }
priceList.add(priceArrs); priceList.add(priceArrs);
} }
} else {
return priceList;
}
if (wxRentContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.MONEY.getCode())) {
for (int i = 0; i < adjustRatioSize; i++) { for (int i = 0; i < adjustRatioSize; i++) {
long[] priceArrs = new long[arraySize]; long[] priceArrs = new long[arraySize];
for (int j = 0; j < arraySize; j++) { for (int j = 0; j < arraySize; j++) {
@@ -1029,12 +1031,24 @@ public class WxRentContractServiceImpl implements WxRentContractService {
} }
priceList.add(priceArrs); priceList.add(priceArrs);
} }
return priceList;
}
if (wxRentContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.CUSTOM.getCode())) {
for (int i = 0; i < adjustRatioSize; i++) {
long[] priceArrs = new long[arraySize];
for (int j = 0; j < arraySize; j++) {
rentInfoObject = rentInfoArray.getJSONObject(j);
adjustRatio = rentInfoObject.getJSONArray("adjustRatio");
BigDecimal price = new BigDecimal(adjustRatio.getString(i)).multiply(new BigDecimal(100));
priceArrs[j] = price.setScale(0, RoundingMode.HALF_EVEN).longValue();
}
priceList.add(priceArrs);
}
} }

return priceList; return priceList;
} }


public List<WxBillRent> buildRentMonth(Long userId, WxRentContract wxRentContract, int receivePeriod, Integer lease, Date rentalStartDate, Long price, Integer isPreview,boolean saveDb) {
public List<WxBillRent> buildRentMonth(Long userId, WxRentContract wxRentContract, int receivePeriod, Integer lease, Date rentalStartDate, Long price, Integer isPreview, boolean saveDb) {
int size = 0; int size = 0;
long[] priceArrs = null; long[] priceArrs = null;
List<Map<String, Object>> shopInfos = new ArrayList<>(); List<Map<String, Object>> shopInfos = new ArrayList<>();
@@ -1079,11 +1093,15 @@ public class WxRentContractServiceImpl implements WxRentContractService {
priceD = priceD.add(divide); priceD = priceD.add(divide);
priceArrs[i] = priceD.setScale(0, RoundingMode.HALF_EVEN).longValue(); priceArrs[i] = priceD.setScale(0, RoundingMode.HALF_EVEN).longValue();
} }
} else {
} else if (wxRentContract.getAdjustRatioWay().equals(EnumRentContractAdjustRatioWay.MONEY.getCode())) {
for (int i = 1; i < size; i++) { for (int i = 1; i < size; i++) {
priceD = priceD.add(new BigDecimal(integers.get(i))); priceD = priceD.add(new BigDecimal(integers.get(i)));
priceArrs[i] = priceD.setScale(0, RoundingMode.HALF_EVEN).longValue(); priceArrs[i] = priceD.setScale(0, RoundingMode.HALF_EVEN).longValue();
} }
} else {
for (int i = 1; i < size; i++) {
priceArrs[i] = new BigDecimal(integers.get(i)).setScale(0, RoundingMode.HALF_EVEN).longValue();
}
} }
} }




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