From 30db4510c06202b3ad0ad4920e561f5f5541d69f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 20 四月 2021 19:56:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
index 36c9e4b..b216bf5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java
@@ -16,6 +16,7 @@
import com.panzhihua.common.model.vos.shop.AddShopGoodsAttrVO;
import com.panzhihua.common.model.vos.shop.PageShopGoodsVO;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComShopGoodsAttrDAO;
import com.panzhihua.common.model.vos.shop.ComShopGoodsAttrVO;
import com.panzhihua.common.model.vos.shop.ComShopGoodsVO;
@@ -81,7 +82,11 @@
shopGoodsAttrDO.setStoreId(goodDO.getStoreId());
shopGoodsAttrDO.setGoodsName(goodDO.getName());
//如果没有规格加默认
- shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
+ if(StringUtils.isNotEmpty(goodsAttr.getGoodsAttr())){
+ shopGoodsAttrDO.setGoodsAttr("默认");
+ }else{
+ shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
+ }
shopGoodsAttrDO.setIsDefault(1);
shopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
goodsAttrDOS.add(shopGoodsAttrDO);
@@ -136,15 +141,16 @@
}
//先删除
ComShopGoodsAttrDO goodsAttrDO = goodsAttrService.getBaseMapper().selectById(goodsAttr.getGoodsAttrId());
- if (goodsAttrDO == null) {
- throw new ServiceException("规格为空,请检查规格Id");
- }
ComShopGoodsAttrDO shopGoodsAttrDO = new ComShopGoodsAttrDO();
shopGoodsAttrDO.setGoodsId(id);
shopGoodsAttrDO.setStoreId(shopGoodsDO.getStoreId());
shopGoodsAttrDO.setGoodsName(shopGoodsDO.getName());
- //如果没有规格加默认
- shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
+ if (goodsAttrDO == null) {
+ //如果没有规格加默认
+ shopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
+ }else{
+ shopGoodsAttrDO.setGoodsAttr("默认");
+ }
shopGoodsAttrDO.setIsDefault(1);
shopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
goodsAttrDOS.add(shopGoodsAttrDO);
--
Gitblit v1.7.1