diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 8f5cf2a15..00e48c6d2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -102,6 +102,20 @@ public class WxRentContractController extends WxContractBaseController { return new ResultData(page); } + @GetMapping("getDateDiff") + @ApiImplicitParams({ + @ApiImplicitParam(name = "startDate", value = "开始时间", dataType = "string", paramType = "query", required = true), + @ApiImplicitParam(name = "endtDate", value = "结束时间", dataType = "string", paramType = "query", required = true)}) + @SystemControllerLog(description = "获取两个时间相差,返回n月零n天") + public ResultData getDateDiff(String startDate, String endDate) throws Exception{ + SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); + Map map = new HashMap<>(); + int[] array = DateUtils.getDiff(sd.parse(startDate),sd.parse(endDate)); + map.put("month",array[0]); + map.put("day",array[1]); + return new ResultData(map); + } + /** * 新增第一步 * @param wxRentContract @@ -385,21 +399,6 @@ public class WxRentContractController extends WxContractBaseController { wxRentContractService.download(request,response); } - @GetMapping("getDateDiff") - @ApiImplicitParams({ - @ApiImplicitParam(name = "startDate", value = "开始时间", dataType = "string", paramType = "query", required = true), - @ApiImplicitParam(name = "endtDate", value = "结束时间", dataType = "string", paramType = "query", required = true)}) - @SystemControllerLog(description = "获取两个时间相差,返回n月零n天") - public ResultData getDateDiff(String startDate, String endDate) throws Exception{ - SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); - Map map = new HashMap<>(); - int[] array = DateUtils.getDiff(sd.parse(startDate),sd.parse(endDate)); - map.put("month",array[0]); - map.put("day",array[1]); - return new ResultData(map); - } - - @PostMapping("effective") @ApiImplicitParams({}) @SystemControllerLog(description = "租金合同-合同生效") diff --git a/mallinkAdmin/src/main/resources/db/migration/欢乐城拆分.sql b/mallinkAdmin/src/main/resources/db/migration/欢乐城拆分.sql new file mode 100644 index 000000000..17887979e --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/欢乐城拆分.sql @@ -0,0 +1,7 @@ +user_basic_info_address_28 拷贝到user_basic_info_address_8, user_basic_info_address_20 +wx_c_user_basic_child_28 拷贝到wx_c_user_basic_child_8,wx_c_user_basic_child_20 +wx_c_user_basic_info_28 拷贝到wx_c_user_basic_info_8,wx_c_user_basic_info_20 +wx_c_user_basic_sign_28 拷贝到wx_c_user_basic_sign_8,wx_c_user_basic_sign_20 +wx_c_user_tags_28 拷贝到 wx_c_user_tags_8,wx_c_user_tags_20 +wx_level_config 拷贝 +wx_mall更新,缓存更新 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 7b67cec8f..e1ce7fbdf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2357,10 +2357,18 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public List getRentContractYears(WxRentContract rentContract) { - String adjustRatio = rentContract.getAdjustRatio(); - List integers = JSONArray.parseArray(adjustRatio, String.class); - integers.add(0, "0"); - int years = integers.size(); + //String adjustRatio = rentContract.getAdjustRatio(); + //List integers = JSONArray.parseArray(adjustRatio, String.class); + //integers.add(0, "0"); + //int years = integers.size(); + SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); + int [] diffs = DateUtils.getDiff(rentContract.getRentalStartDate(),rentContract.getRentalEndDate()); + int months = diffs[0]; + int ext = months % 12; + int years = months/12; + if (ext > 0 ) { + years = years + 1; + } //合同以什么日期来计算开始计租日期 if(rentContract.getRentStartType()!=null &&rentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ rentContract.setRentalStartDate(rentContract.getStartDate());