From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsClassServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsClassServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsClassServiceImpl.java
index 141e179..57f4527 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsClassServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsClassServiceImpl.java
@@ -81,9 +81,9 @@
}
@Override
- public List<GoodsClass> listquery() throws Exception {
+ public List<GoodsClass> listquery(Integer sex) throws Exception {
- List<GoodsClass> list = goodsClassMapper.getGoodsClassAll();
+ List<GoodsClass> list = goodsClassMapper.getGoodsClassAll(sex);
if (list != null && list.size() == 0) {
return list;
@@ -135,7 +135,7 @@
}
public List<GoodsClass> getGoodsClassAll() {
- return goodsClassMapper.getGoodsClassAll();
+ return goodsClassMapper.getGoodsClassAll(null);
}
@Override
@@ -146,7 +146,12 @@
if (name == null || name.trim().length() == 0) {
throw new GoodsClassException(1, "鍒嗙被鍚嶇О涓嶈兘涓虹┖");
}
-
+
+ Integer sex = record.getSex();
+ if (sex == null) {
+ throw new GoodsClassException(1, "鎬у埆璁剧疆涓嶈兘涓虹┖");
+ }
+
// 鍥剧墖涓婁紶
String picture = null;
if (file != null) {
@@ -209,9 +214,16 @@
// 淇濆瓨娣樺疂鍟嗗搧鍒嗙被id
String taobaoCids = record.getTaobaoCids();
+ List<Long> tbCidList = new ArrayList<>();
if (!StringUtil.isNullOrEmpty(taobaoCids) && !"null".equalsIgnoreCase(taobaoCids)) {
- taoBaoClassService.save(record.getId(), taobaoCids);
+
+ String[] sts = taobaoCids.split(",");
+ for (String st : sts) {
+ String cid = st.split("-")[st.split("-").length - 1].trim();
+ tbCidList.add(Long.parseLong(cid));
+ }
}
+ taoBaoClassService.save(record.getId(), tbCidList);
}
/**
@@ -302,7 +314,7 @@
@Override
@Cacheable(value = "classCache", key = "'getEffectiveClassCache'")
- public List<GoodsClass> getEffectiveClassCache() throws Exception {
+ public List<GoodsClass> getEffectiveClassCache() {
return goodsClassMapper.getEffectiveClass();
}
--
Gitblit v1.8.0