From 0321b60ced9ca7f9d93c94632fc443e1b9c76b15 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 30 Jul 2022 17:25:58 +0800 Subject: [PATCH] fix rent contract --- .../iformall/enums/EnumRentContractType.java | 3 ++- .../service/impl/WxRentContractServiceImpl.java | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumRentContractType.java b/mallinkService/src/main/java/com/iformall/enums/EnumRentContractType.java index 1c04975cc..bb5ad5119 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumRentContractType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumRentContractType.java @@ -10,7 +10,8 @@ public enum EnumRentContractType { RENT_BY_AREA(1, "面积"), RENT_BY_JOINT(2, "联营扣点"), RENT_BY_AREA_AND_JOINT(3, "面积与联营扣点取高"), - RENT_BY_COUNT(4,"按铺位或点位数") + RENT_BY_COUNT(4,"按铺位或点位数"), + RENT_BY_CUSTOMIZE(5,"自定义") ; public static EnumRentContractType getEnum(Integer code) { 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 aeab8d4a0..7e9f82f14 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1213,6 +1213,23 @@ public class WxRentContractServiceImpl implements WxRentContractService { priceArrs[i] = priceD.setScale(0, RoundingMode.HALF_EVEN).longValue(); } } + }else if (wxRentContract.getType().equals(EnumRentContractType.RENT_BY_CUSTOMIZE.getCode())) { + String adjustRatio = wxRentContract.getAdjustRatio(); + JSONArray array = JSONArray.parseArray(adjustRatio); + if(array != null && array.size() > 0){ + priceArrs = new long[array.size()]; + size = array.size(); + for (int i=0;i(); }