| @@ -238,7 +238,7 @@ public enum ErrorCode{ | |||||
| * 租赁合同 | * 租赁合同 | ||||
| * */ | * */ | ||||
| RENT_CONTRACT_IS_NOT_FOUND(15000,"租赁合同不存在"), | 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; | private int code; | ||||
| @@ -63,7 +63,6 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { | |||||
| @Override | @Override | ||||
| public Long saveOrUpdate(WxMerchantBUser record) { | public Long saveOrUpdate(WxMerchantBUser record) { | ||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | |||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| long id = idWorker.nextId(); | long id = idWorker.nextId(); | ||||
| record.setId(id); | record.setId(id); | ||||