From 0a33e95989bbe2894aad0fdee7a240e1d6818ccb Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 15 Apr 2019 18:25:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AE=A1=E6=89=B9=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=90=8E=E4=BD=9C=E5=BA=9F=E5=BD=93=E5=89=8D=E5=85=B3=E8=81=94?= =?UTF-8?q?=E7=9A=84=E5=BA=97=E9=93=BA=E5=BE=85=E7=AD=BE=E7=BA=A6=E7=9A=84?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=90=88=E5=90=8C]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/mapper/WxRentContractMapper.java | 2 ++ .../service/WxRentContractService.java | 2 ++ .../service/impl/WxMerchantServiceImpl.java | 2 ++ .../impl/WxPropertyContractServiceImpl.java | 2 +- .../impl/WxRentContractServiceImpl.java | 34 ++++++++++++++----- .../resources/mapper/WxRentContractMapper.xml | 4 +-- 6 files changed, 35 insertions(+), 11 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index e848b0f5f..6aed6be26 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -49,4 +49,6 @@ public interface WxRentContractMapper extends CommonMapper int selectRentContractCountByShopId(WxRentContract wxRentContract); + void updateInvalidContract(WxRentContract record); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 1dcf07be7..067e71e88 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -76,4 +76,6 @@ public interface WxRentContractService { void buildDeposit(WxMerchant wxMerchant, Long userId,Long rentContractId); Object getMerchants(WxRentContract wxRentContract); + + void updateInvalidContract(Long rentContractId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 9ea12989b..12549814a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -353,6 +353,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { //wxRentContractService.buildRent(wxMerchant, userId,null,EnumIsPreview.NO.getCode()); //创建押金 wxRentContractService.buildDeposit(wxMerchant, userId,wxMerchant.getRentContractId()); + //作废合同 + wxRentContractService.updateInvalidContract(wxMerchant.getRentContractId()); } return new ResultData(Result.SUCCESS, "商户创建成功", merchantId); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index f231e2d95..f6dc58513 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -155,7 +155,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } } - if (null == record.getShopId()) { + if (record.getRentShopType().equals(EnumRentShopType.POINT.getCode()) && null == record.getShopId()) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "shopId不能为空"); } 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 4bf817da8..8c5f3d466 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -583,6 +583,30 @@ public class WxRentContractServiceImpl implements WxRentContractService { return rentContractList; } + @Override + public void updateInvalidContract(Long rentContractId) { + WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(rentContractId); + if (wxRentContract.getRentShopType().equals(EnumRentShopType.SHOP.getCode())) { + String rentInfo = wxRentContract.getRentInfo(); + JSONArray rentInfoArray = JSONArray.parseArray(rentInfo); + WxRentContract record = new WxRentContract(); + for (int i = 0, size = rentInfoArray.size(); i < size; i++) { + JSONObject rentInfoObject = rentInfoArray.getJSONObject(i); + Long shopId = rentInfoObject.getLong("shopId"); + record.setShopId(shopId); + record.setTenantId(wxRentContract.getTenantId()); + record.setStatus(EnumRentContractStatus.INVALID.getCode()); + wxRentContractMapper.updateInvalidContract(record); + } + } else { + WxRentContract record = new WxRentContract(); + record.setTenantId(wxRentContract.getTenantId()); + record.setRentShopType(wxRentContract.getRentShopType()); + record.setStatus(EnumRentContractStatus.INVALID.getCode()); + wxRentContractMapper.updateRentInvalidStatus(record); + } + } + @Override @Transactional(rollbackFor = {Exception.class}) public List buildRent(WxMerchant wxMerchant, Long userId,WxRentContract rentContract,Integer isPreview) { @@ -1050,16 +1074,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { } } - //把状态为意见而商户未关联的数据改为待签约状态 - //wxRentContractMapper.updateStatusForUnsign(wxRentContract); - - //作废合同 - wxRentContract.setStatus(EnumRentContractStatus.INVALID.getCode()); - wxRentContractMapper.updateRentInvalidStatus(wxRentContract); - //待签约 wxRentContract.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); - //wxRentContractMapper.updateRentWaitSignStatus(wxRentContract); int waitSignCount = wxRentContractMapper.queryRentContractWaitSignStatus(wxRentContract); resultData.put("waitSignCount", waitSignCount); @@ -1271,6 +1287,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { buildDeposit(wxMerchant, null,id); // } } + //作废合同 + updateInvalidContract(id); return new ResultData(Result.SUCCESS, "操作成功"); } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 89997e4f6..74cddb199 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -191,7 +191,7 @@ update wx_rent_contract set status=#{status} where shop_id in ( select s.shop_id from (SELECT shop_id FROM wx_rent_contract WHERE tenant_id = #{tenantId} and status in(2,3,4) - )s) and status=1 and status!=7 and tenant_id=#{tenantId} and rent_shop_type=2 + )s) and status in(0,1) and status!=7 and tenant_id=#{tenantId} and rent_shop_type=2