fix

netflix-dao/src/main/java/com/cyksj/model/manage/request/ReqGoodsSkuInsert.java

@@ -34,15 +34,22 @@ public class ReqGoodsSkuInsert {
          */
         private String picture;
 
+        private BigDecimal price;
+
         /**
-         * 原价 单位分
+         * 数量
          */
-        private BigDecimal price;
+        private Integer num;
+
+        /**
+         * 月份
+         */
+        private Integer months;
 
         /**
-         * 成本 单位分
+         * 状态
          */
-        private Integer cost;
+        private Boolean status;
 
     }
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonSkuController.java

@@ -1,6 +1,8 @@
 package com.cyksj.web.controller.manage.goods;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.util.IoKit;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
@@ -130,8 +132,8 @@ public class CmsGoodsDonSkuController {
             throw new RuntimeException("找不到商品spu.");
         }
         GoodsDonSpec loveSpec = goodsDonSpecService.getOne(Wrappers.lambdaQuery(GoodsDonSpec.class).eq(GoodsDonSpec::getGoodsId,insert.getGoodsId()));
-        if (null != loveSpec) {
-            throw new RuntimeException("该商品已新增总规格, 请点击编辑并追加该商品的sku.");
+        if (null == loveSpec) {
+            throw new RuntimeException("该商品未设置总规格, 请设置总规格.");
         }
 
         List<ReqGoodsSkuSpec> specs = insert.getSpecs();
@@ -139,6 +141,10 @@ public class CmsGoodsDonSkuController {
             throw new RuntimeException("缺少商品总规格.");
         }
 
+        List<ReqGoodsSkuInsert.Sku> skus = insert.getSkus();
+        if (null == skus || skus.isEmpty()) {
+            throw new RuntimeException("参数错误.");
+        }
         int specNumber = loveSpec.getSpecNumber();
 
         JavaType type = Jsons.javaType().constructMapType(HashMap.class, Integer.class, ReqGoodsSpecSingle.class);
@@ -146,11 +152,10 @@ public class CmsGoodsDonSkuController {
 
         StringBuilder builder = new StringBuilder();
         List<ReqGoodsSpecSingle> specList = null;
-        GoodsDonSku goodsLoveSku = null;
+        GoodsDonSku goodsDonSku = null;
 
         // 判断属性是否属于同一个key
         Set<String> set = null;
-        
 
         for (ReqGoodsSkuInsert.Sku sku : insert.getSkus()) {
             // 跳过空值的sku
@@ -199,18 +204,17 @@ public class CmsGoodsDonSkuController {
             String specVal = builder.toString();
             String specJson = Jsons.toJson(specList);
 
-            if (null == goodsLoveSku) {
-                goodsLoveSku = new GoodsDonSku();
-                goodsLoveSku.setGoodsId(insert.getGoodsId());
+            if (null == goodsDonSku) {
+                goodsDonSku = new GoodsDonSku();
+                goodsDonSku.setGoodsId(insert.getGoodsId());
             }
-            goodsLoveSku.setSpecIds(specIds);
-            goodsLoveSku.setSpecVal(specVal);
-            goodsLoveSku.setSpecJson(specJson);
-            goodsLoveSku.setPicture(picture);
-            goodsLoveSku.setPrice(sku.getPrice());
-
-            goodsDonSkuService.save(goodsLoveSku);
-            
+            BeanUtil.copyProperties(sku,goodsDonSku);
+            goodsDonSku.setSpecIds(specIds);
+            goodsDonSku.setSpecVal(specVal);
+            goodsDonSku.setSpecJson(specJson);
+
+            goodsDonSkuService.save(goodsDonSku);
+
         }
         
        return GatewayResponse.SUCCESS.newBuilder().toResult();

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonSpecController.java

@@ -91,7 +91,7 @@ public class CmsGoodsDonSpecController {
     @DeleteMapping(value = "/delete")
     public Result<String> delete(Integer specId, Long goodsId) throws Exception {
         //TODO
-        GoodsDonSpec loveSpec = goodsDonSpecService.getOne(Wrappers.lambdaQuery(GoodsDonSpec.class).eq(GoodsDonSpec::getGoodsId,goodsId));
+        GoodsDonSpec loveSpec = goodsDonSpecService.getOne(Wrappers.lambdaQuery(GoodsDonSpec.class).eq(GoodsDonSpec::getGoodsId,goodsId).last(" limit 1"));
         if (null == loveSpec) {
             throw new RuntimeException("该商品未设置总规格, 请设置总规格.");
         }