From 2442c923fd35ef864be1cfe07e039eebfaf24ffc Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 03 十二月 2019 11:48:21 +0800
Subject: [PATCH] 新人红包功能
---
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
index 7dbbd2e..11967ac 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandInfoServiceImpl.java
@@ -86,13 +86,9 @@
if (brandClass ==null || brandClass.getId() == null)
throw new BrandInfoException(1, "鍒嗙被涓嶈兘涓虹┖");
- String shopKey = record.getShopKey();
- if (StringUtil.isNullOrEmpty(shopKey))
- record.setShopKey(name);
-
- String searchKey = record.getSearchKey();
- if (StringUtil.isNullOrEmpty(searchKey))
- record.setSearchKey(name);
+ BrandInfo existBrand = brandInfoMapper.selectByUniqueName(name.trim(), brandClass.getId(), record.getId());
+ if (existBrand != null)
+ throw new BrandInfoException(1, "璇ュ垎绫讳腑宸插瓨鍦細" + name.trim());
Integer state = record.getState();
if (state == null) {
@@ -109,6 +105,7 @@
}
}
+ record.setName(name.trim());
Long id = record.getId();
if (id == null) {
record.setCreateTime(new Date());
@@ -247,13 +244,13 @@
@Override
- public List<BrandInfo> listQuery(long start, int count, String key, Long cid, Integer state) {
- return brandInfoMapper.listQuery(start, count, key, cid, state);
+ public List<BrandInfo> listQuery(long start, int count, List<String> keys, Long cid, Integer state, Integer showState) {
+ return brandInfoMapper.listQuery(start, count, keys, cid, state,showState);
}
@Override
- public long countQuery(String key, Long cid, Integer state) {
- return brandInfoMapper.countQuery(key, cid, state);
+ public long countQuery(List<String> keys, Long cid, Integer state, Integer showState) {
+ return brandInfoMapper.countQuery(keys, cid, state, showState);
}
@Override
--
Gitblit v1.8.0