From ec78622b2952b22200ece6fedf9d02b3905941bb Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期四, 22 四月 2021 10:11:59 +0800
Subject: [PATCH] no

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java                              |    3 +++
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsAttrVO.java                          |    2 ++
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopGoodsServiceImpl.java |   18 +++++++++++++++---
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsAttrVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsAttrVO.java
index 3619766..d499f88 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsAttrVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsAttrVO.java
@@ -4,6 +4,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Min;
 import java.math.BigDecimal;
 
 /**
@@ -21,5 +22,6 @@
     private String goodsAttr;
 
     @ApiModelProperty("规格价格")
+    @Min(value = 0,message = "价格最小值为0")
     private BigDecimal attrPrice;
 }
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
index 64bac1d..ed3d262 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -23,6 +25,7 @@
     private String name;
 
     @ApiModelProperty("商品现价")
+    @Min(value = 0,message = "价格最小值为0")
     private BigDecimal price;
 
 
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 71152b0..2456d43 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
@@ -157,9 +157,21 @@
             }
             addShopGoodsVO.getGoodsAttrVOList().forEach(goodsAttr -> {
                 ComShopGoodsAttrDO comShopGoodsAttrDO = shopGoodsAttrDAO.selectById(goodsAttr.getGoodsAttrId());
-                comShopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
-                comShopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
-                shopGoodsAttrDAO.updateById(comShopGoodsAttrDO);
+                if(comShopGoodsAttrDO!=null){
+                    comShopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
+                    comShopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
+                    shopGoodsAttrDAO.updateById(comShopGoodsAttrDO);
+                }else{
+                    comShopGoodsAttrDO = new ComShopGoodsAttrDO();
+                    comShopGoodsAttrDO.setGoodsId(id);
+                    comShopGoodsAttrDO.setStoreId(addShopGoodsVO.getStoreId());
+                    comShopGoodsAttrDO.setGoodsName(addShopGoodsVO.getName());
+                    comShopGoodsAttrDO.setGoodsAttr(goodsAttr.getGoodsAttr());
+                    comShopGoodsAttrDO.setAttrPic(addShopGoodsVO.getGoodsPic());
+                    comShopGoodsAttrDO.setIsDefault(1);
+                    comShopGoodsAttrDO.setPrice(goodsAttr.getAttrPrice());
+                    shopGoodsAttrDAO.insert(comShopGoodsAttrDO);
+                }
             });
         }
         return R.ok();

--
Gitblit v1.7.1