From 100465724f683ecc0f022d6446f137fd771cbc66 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 26 Apr 2019 11:27:38 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][ID1001364][dev=20version:.906.1329?= =?UTF-8?q?=EF=BC=9A=E8=A1=A5=E5=BD=95-=E6=B2=A1=E6=9C=89=E7=BB=88?= =?UTF-8?q?=E6=AD=A2=E4=B8=8A=E6=AC=A1=E7=AD=BE=E7=BA=A6=E5=90=88=E5=90=8C?= =?UTF-8?q?=EF=BC=8C=E6=9C=89=E8=BF=9B=E8=A1=8C=E8=A1=A5=E5=BD=95-?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=9C=80=E8=A6=81=E5=9C=A8=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AD=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxRentContractController.java | 8 ++++++ .../service/WxRentContractService.java | 2 ++ .../impl/WxRentContractServiceImpl.java | 27 +++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java index 1c9cfaa76..549fcafb4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java @@ -207,4 +207,12 @@ public class WxRentContractController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", wxRentContractService.getMerchants(wxRentContract)); } + @GetMapping("/hasRentStatus") + @SystemControllerLog(description = "查询店铺租赁状态") + public ResultData hasRentStatus(@ModelAttribute WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::hasRentStatus"); + wxRentContract.setTenantId(getTenantId()); + return wxRentContractService.hasRentStatus(wxRentContract); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 067e71e88..5b929713c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -78,4 +78,6 @@ public interface WxRentContractService { Object getMerchants(WxRentContract wxRentContract); void updateInvalidContract(Long rentContractId); + + ResultData hasRentStatus(WxRentContract wxRentContract); } 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 9b0f5acd5..66ab8d1eb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -633,6 +633,33 @@ public class WxRentContractServiceImpl implements WxRentContractService { updateInvalidStatus(wxRentContract); } + @Override + public ResultData hasRentStatus(WxRentContract record) { + String rentInfo = record.getRentInfo(); + JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); + int size = rentInfoArray.size(); + if (size == 0) { + return new ResultData(ErrorCode.SHOP_NOT_SELECTED); + } + //查询rent_info 包括 shopId + for (int i = 0; i < size; i++) { + JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); + WxRentContract wxRentContractQuery = new WxRentContract(); + wxRentContractQuery.setTenantId(record.getTenantId()); + Long shopId = rentInfoObject.getLong("shopId"); + String shopNumber = rentInfoObject.getString("shopNumber"); + if (shopId == null) { + return new ResultData(ErrorCode.SHOP_IS_NOT_FOUND.getCode(), "店铺 " + shopNumber + " 已删除"); + } + wxRentContractQuery.setShopId(shopId); + int count = wxRentContractMapper.selectRentContractCountByShopId(wxRentContractQuery); + if (count > 0) { + return new ResultData(ErrorCode.SHOP_IS_RENT.getCode(), "店铺 " + shopNumber + " 已出租"); + } + } + return new ResultData(Result.SUCCESS, "操作成功"); + } + public void updateInvalidStatus(WxRentContract wxRentContract) { WxRentContract record = new WxRentContract(); record.setTenantId(wxRentContract.getTenantId());