From cc70d04b8371c867f782f927d9956f819a046fb2 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 30 Oct 2018 14:35:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8E=BB=E6=8E=89=E6=B3=A8=E9=87=8A]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 10 +++++++--- .../service/impl/WxMerchantBUserServiceImpl.java | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 7f0aae5b5..cfbd0b503 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -238,7 +238,7 @@ public enum ErrorCode{ * 租赁合同 * */ RENT_CONTRACT_IS_NOT_FOUND(15000,"租赁合同不存在"), - + RENT_CONTRACT_IS_TERMINATED(15001,"租凭合同已终止"), /** * 物业合同 * */ @@ -270,9 +270,13 @@ public enum ErrorCode{ /** * 日常费用账单 * */ - BILL_ROUTINE_IS_NOT_FOUND(20000,"账单不存在"), - + BILL_ROUTINE_IS_NOT_FOUND(21000,"账单不存在"), + /** + * 商铺 + * */ + SHOP_IS_NOT_FOUND(22000,"商铺不存在"), + SHOP_IS_RENT(22001,"商铺已出租"), ; private int code; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java index 4e4ee0e58..55fde30de 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java @@ -63,7 +63,6 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { @Override public Long saveOrUpdate(WxMerchantBUser record) { if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); long id = idWorker.nextId(); record.setId(id);