~API:添加SKU+参数校验;

~API:删除SKU逻辑更正;
~SQL:删除SKU规格;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsAddSkuParam.java

@@ -8,6 +8,7 @@ import lombok.Data;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.io.Serializable;
@@ -21,6 +22,7 @@ public class GoblinStoreMgtGoodsAddSkuParam implements Serializable {
     @ApiModelProperty(position = 10, required = false, value = "单品ID[编辑时必传]")
     private String skuId;
     @ApiModelProperty(position = 11, required = true, value = "单品默认图片的url[256]")
+    @NotBlank(message = "图片不能为空")
     private String skuPic;
     @ApiModelProperty(position = 12, required = true, value = "单品规格信息")
     @NotNull(message = "规格信息不能为空")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinstoreMgtGoodsService.java

@@ -73,9 +73,10 @@ public interface IGoblinstoreMgtGoodsService {
      *
      * @param uid            UID
      * @param goodsSkuInfoVo GoblinGoodsSkuInfoVo
+     * @param mgtGoodsInfoVo GoblinGoodsInfoVo
      * @return boolean
      */
-    boolean goodsEditSkuDel(String uid, GoblinGoodsSkuInfoVo goodsSkuInfoVo);
+    boolean goodsEditSkuDel(String uid, GoblinGoodsSkuInfoVo goodsSkuInfoVo, GoblinGoodsInfoVo mgtGoodsInfoVo);
 
 //    /**
 //     * 商品管理:商品编辑:SKU批改

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtGoodsController.java

@@ -582,7 +582,13 @@ public class GoblinStoreMgtGoodsController {
         if (mgtGoodsSkuInfoVo.getShelvesStatus().equals("3")) {
             return ResponseDto.failure(ErrorMapping.get("149016"));
         }
-        return ResponseDto.success(goblinstoreMgtGoodsService.goodsEditSkuDel(currentUid, mgtGoodsSkuInfoVo));
+        GoblinGoodsInfoVo mgtGoodsInfoVo = goblinRedisUtils.getGoodsInfoVo(mgtGoodsSkuInfoVo.getSpuId());
+        if (null == mgtGoodsInfoVo || !mgtGoodsInfoVo.getDelFlg().equals("0")) {
+            log.warn("商品管理:商品编辑:SKU删除警告:SPU不存在或已删除[uid={},skuId={}]", currentUid, skuId);
+            return ResponseDto.failure(ErrorMapping.get("149010"));
+        }
+        boolean delResultFlg = goblinstoreMgtGoodsService.goodsEditSkuDel(currentUid, mgtGoodsSkuInfoVo, mgtGoodsInfoVo);
+        return delResultFlg ? ResponseDto.success() : ResponseDto.failure(ErrorMapping.get("149003"));
     }
 
 //    @ApiOperationSupport(order = 10)

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java

@@ -753,15 +753,10 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
     }
 
     @Override
-    public boolean goodsEditSkuDel(String uid, GoblinGoodsSkuInfoVo goodsSkuInfoVo) {
+    public boolean goodsEditSkuDel(String uid, GoblinGoodsSkuInfoVo goodsSkuInfoVo, GoblinGoodsInfoVo mgtGoodsInfoVo) {
         String spuId = goodsSkuInfoVo.getSpuId();
         String delSkuId = goodsSkuInfoVo.getSkuId();
 
-        GoblinGoodsInfoVo mgtGoodsInfoVo = goblinRedisUtils.getGoodsInfoVo(spuId);
-        if (null == mgtGoodsInfoVo || !mgtGoodsInfoVo.getDelFlg().equals("0")) {
-            log.warn("商品管理:商品编辑:SKU删除警告:SPU不存在或已删除[uid={},spuId={},skuId={}]", uid, spuId, delSkuId);
-            return false;
-        }
         mgtGoodsInfoVo.getSkuIdList().removeIf(r -> r.equals(delSkuId));
 
         List<GoblinGoodsSpecVo> specVoList = mgtGoodsInfoVo.getSpecVoList();
@@ -841,11 +836,14 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
 //            LinkedList<Object[]> updateGoodsSpuSpecDelObjs = CollectionUtil.linkedListObjectArr();
             toMqSqls.add(SqlMapping.get("goblin_goods_spu_spec_value.update_by_del_sku2"));
 //            LinkedList<Object[]> updateGoodsSpuSpecObjs = CollectionUtil.linkedListObjectArr();
+            toMqSqls.add(SqlMapping.get("goblin_goods_sku_spec_value.update_by_del_sku"));
+            LinkedList<Object[]> deleteGoodsSkuSpecObjs = CollectionUtil.linkedListObjectArr();
+            deleteGoodsSkuSpecObjs.add(new Object[]{delSkuId});
             toMqSqls.add(SqlMapping.get("goblin_goods.update_by_del_sku"));
 //            LinkedList<Object[]> updateGoodsInfoObjs = CollectionUtil.linkedListObjectArr();
 
             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_GOODS.getKey(),
-                    SqlMapping.gets(toMqSqls, delGoodsSkuObjs, updateGoodsSpuSpecDelObjs, updateGoodsSpuSpecObjs, updateGoodsInfoObjs));
+                    SqlMapping.gets(toMqSqls, delGoodsSkuObjs, updateGoodsSpuSpecDelObjs, updateGoodsSpuSpecObjs, deleteGoodsSkuSpecObjs, updateGoodsInfoObjs));
 
             return true;
         }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -519,8 +519,8 @@ public class GoblinMongoUtils {
 
     public boolean delGoodsSkuInfoVo(GoblinGoodsSkuInfoVo vo, List<String> skuIdList) {
         return mongoTemplate.getCollection(GoblinGoodsSkuInfoVo.class.getSimpleName()).updateOne(
-                Query.query(Criteria.where("skuId").is(skuIdList).and("delFlg").is("0")).getQueryObject(),
-                Update.update("updatedBy", vo.getUpdatedBy()).set("updatedAt", vo.getUpdatedAt())
+                Query.query(Criteria.where("skuId").in(skuIdList).and("delFlg").is("0")).getQueryObject(),
+                Update.update("delFlg", "1").set("updatedBy", vo.getUpdatedBy()).set("updatedAt", vo.getUpdatedAt())
                         .set("deletedBy", vo.getDeletedBy()).set("deletedAt", vo.getDeletedAt()).getUpdateObject()
         ).getModifiedCount() > 0;
     }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/errors.properties

@@ -32,8 +32,8 @@
 149007=添加商品失败，商品名称重复
 149008=商品分类名称重复，请核实
 149009=请点选商品后操作
-149010=商品不存在，请核实
-149011=SKU不存在，请核实
+149010=商品不存在或已删除，请核实
+149011=SKU不存在或已删除，请核实
 149012=SKU库存不足，请核实
 149013=SKU编辑失败
 149014=SKU编辑失败，规格信息有误

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -34,6 +34,7 @@ goblin_goods_spu_spec_value.update_by_del_sku1=UPDATE goblin_goods_spu_spec_valu
 goblin_goods_spu_spec_value.update_by_del_sku2=UPDATE goblin_goods_spu_spec_value SET sort=? WHERE spu_id=? AND spec_name=? AND spec_vname=? 
 goblin_goods_sku_spec_value.insert_byreplace=REPLACE INTO goblin_goods_sku_spec_value (spu_id,sku_id,spec_name,spec_vname,del_flg)VALUES(?,?,?,?,'0') 
 goblin_goods_sku_spec_value.update_by_edit=UPDATE goblin_goods_sku_spec_value SET spec_vname=? WHERE sku_id=? AND spec_name=? AND del_flg='0' 
+goblin_goods_sku_spec_value.update_by_del_sku=UPDATE goblin_goods_sku_spec_value SET del_flg='1' WHERE sku_id=? AND del_flg='0' 
 #----                   商品信息
 goblin_goods.insert=INSERT INTO goblin_goods (spu_id,spu_no,name,subtitle,sell_price, price_ge,price_le,intro,details,cover_pic, video,spec_mode,store_id,cate_fid,cate_sid, cate_tid,store_cate_fid,store_cate_sid,store_cate_tid,brand_id, shelves_handle,shelves_time,spu_validity,virtual_flg,status, shelves_status,spu_appear,shelves_at,created_by,created_at, logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
 goblin_goods.update_by_edit=UPDATE goblin_goods SET spu_no=?,name=?,subtitle=?,sell_price=?,intro=?,details=?,cover_pic=?,video=?,spec_mode=?,cate_fid=?,cate_sid=?,cate_tid=?,shelves_handle=?,shelves_time=?,spu_validity=?,virtual_flg=?,logistics_template=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0'