~API;

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

@@ -149,7 +149,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
 //        vo.setPriceLe(BigDecimal.ZERO);
         vo.setIntro(this.getIntro());
         vo.setDetails(this.getDetails());
-        vo.setCoverPic(this.getCoverPic());
+        vo.setCoverPic(StringUtils.isBlank(this.getCoverPic()) ? this.getImageList().get(0) : this.getCoverPic());
         vo.setVideo(this.getVideo());
         vo.setSpecMode(this.getSpecMode());
         vo.setCateFid(this.getCateFid());
@@ -197,7 +197,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
         vo.setSellPrice(this.getSellPrice());
         vo.setIntro(this.getIntro());
         vo.setDetails(this.getDetails());
-        vo.setCoverPic(this.getCoverPic());
+        vo.setCoverPic(StringUtils.isBlank(this.getCoverPic()) ? this.getImageList().get(0) : this.getCoverPic());
         vo.setVideo(this.getVideo());
         vo.setSpecMode(this.getSpecMode());
         vo.setCateFid(this.getCateFid());
@@ -288,7 +288,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
             vos.add(skuInfoVo);
 
             skuIdList.add(skuInfoVo.getSkuId());
-            priceGe = priceGe.compareTo(skuInfoVo.getPrice()) > 0 ? skuInfoVo.getPrice() : priceGe;
+            priceGe = priceGe.compareTo(BigDecimal.ZERO) == 0 ? skuInfoVo.getPrice() : (priceGe.compareTo(skuInfoVo.getPrice()) > 0 ? skuInfoVo.getPrice() : priceGe);
             priceLe = priceLe.compareTo(skuInfoVo.getPrice()) < 0 ? skuInfoVo.getPrice() : priceLe;
 
             if (CollectionUtils.isEmpty(skuSpecList) || (skuSpecSize > 0 && skuSpecSize != skuSpecList.size())) {

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

@@ -9,7 +9,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
 
+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;
 import java.math.BigDecimal;
@@ -29,6 +32,8 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
     @ApiModelProperty(position = 13, required = true, value = "单品默认图片的url[256]")
     private String skuPic;
     @ApiModelProperty(position = 14, required = true, value = "单品规格信息")
+    @Valid
+    @NotNull(message = "规格信息不能为空")
     private List<GoblinGoodsSpecDto> skuSpecList;
     @ApiModelProperty(position = 15, required = false, value = "单品销售价-原价[20,2]")
     private BigDecimal sellPrice;

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

@@ -8,6 +8,7 @@ import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IGoblinstoreMgtGoodsService {
     /**
@@ -38,10 +39,11 @@ public interface IGoblinstoreMgtGoodsService {
     /**
      * 商品管理:商品编辑:SPU编辑
      *
+     * @param uid                   UID
      * @param storeMgtGoodsAddParam GoblinStoreMgtGoodsAddParam
      * @return boolean
      */
-    boolean goodsEditSpu(GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam);
+    boolean goodsEditSpu(String uid, GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam);
 
     /**
      * 商品管理:商品编辑:SKU编辑
@@ -49,35 +51,40 @@ public interface IGoblinstoreMgtGoodsService {
      * @param uid                       UID
      * @param storeMgtGoodsEditSkuParam GoblinStoreMgtGoodsEditSkuParam
      * @param goodsInfoVo               GoblinGoodsInfoVo
+     * @param delSpuSpecMap             Map<String, String>
+     * @param beUpdateSpuSpecFlg        boolean
      * @return boolean
      */
-    boolean goodsEditSku(String uid, GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam, GoblinGoodsInfoVo goodsInfoVo);
+    boolean goodsEditSku(String uid, GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam,
+                         GoblinGoodsInfoVo goodsInfoVo, Map<String, String> delSpuSpecMap, boolean beUpdateSpuSpecFlg);
 
     /**
      * 商品管理:商品编辑:SKU添加
      *
+     * @param uid                       UID
      * @param storeMgtGoodsEditSkuParam GoblinStoreMgtGoodsEditSkuParam
      * @param goodsInfoVo               GoblinGoodsInfoVo
      */
-    void goodsEditSkuAdd(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam, GoblinGoodsInfoVo goodsInfoVo);
+    void goodsEditSkuAdd(String uid, GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam, GoblinGoodsInfoVo goodsInfoVo);
 
     /**
      * 商品管理:商品编辑:SKU删除
      *
+     * @param uid            UID
      * @param goodsSkuInfoVo GoblinGoodsSkuInfoVo
      * @return boolean
      */
-    boolean goodsEditSkuDel(GoblinGoodsSkuInfoVo goodsSkuInfoVo);
+    boolean goodsEditSkuDel(String uid, GoblinGoodsSkuInfoVo goodsSkuInfoVo);
 
-    /**
-     * 商品管理:商品编辑:SKU批改
-     *
-     * @param spuId       商品ID
-     * @param batField    批量修改属性
-     * @param batFieldVal 批量修改属性值
-     * @return boolean
-     */
-    boolean goodsEditSkuBat(String spuId, String batField, String batFieldVal);
+//    /**
+//     * 商品管理:商品编辑:SKU批改
+//     *
+//     * @param spuId       商品ID
+//     * @param batField    批量修改属性
+//     * @param batFieldVal 批量修改属性值
+//     * @return boolean
+//     */
+//    boolean goodsEditSkuBat(String spuId, String batField, String batFieldVal);
 
     /**
      * 商品管理:上下架商品

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_ln_goblin_initialdata.sql

@@ -380,7 +380,7 @@ create table goblin_goods_spu_spec_value
     comment  varchar(255)
 ) engine = InnoDB comment '商品关联规格值';
 
-create unique index uidx_ggssv_spu_s_s on goblin_goods_spu_spec_value (spu_id, spec_name, spec_vname);
+create unique index uidx_ggssv_spu_s_s on goblin_goods_spu_spec_value (spu_id, spec_name, spec_vname, del_flg);
 # -- >>------------------------------------------------------------------------------------
 drop table if exists goblin_goods_sku_spec_value;
 create table goblin_goods_sku_spec_value
@@ -395,7 +395,7 @@ create table goblin_goods_sku_spec_value
     comment  varchar(255)
 ) engine = InnoDB comment '单品关联规格值';
 
-create unique index uidx_ggssv_s_s_s on goblin_goods_sku_spec_value (sku_id, spec_name, spec_vname);
+create unique index uidx_ggssv_s_s_s on goblin_goods_sku_spec_value (sku_id, spec_name, del_flg);
 # -- >>------------------------------------------------------------------------------------
 # -- >>------------------------------------------------------------------------------------
 drop table if exists goblin_goods_spec_value;

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

@@ -103,6 +103,10 @@ public class GoblinStoreMgtCertificationController {
         if (!goblinRedisUtils.hasStoreId(currentUid, storeId)) {
             return ResponseDto.failure(ErrorMapping.get("149002"));
         }
+        GoblinStoreInfoVo storeInfoVo = goblinRedisUtils.getStoreInfoVo(storeId);
+        if (null == storeInfoVo || Arrays.asList("3","4","5").contains(storeInfoVo.getStatus())) {
+            return ResponseDto.success();// 店铺认证通过后不允许删除
+        }
         log.info("删除店铺[UID={},storeId={}]", currentUid, storeId);
         return ResponseDto.success(goblinStoreMgtCertificationService.certificationCancelProcessing(storeId, currentUid));
     }

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

@@ -124,7 +124,7 @@ public class GoblinStoreMgtCertificationServiceImpl implements IGoblinStoreMgtCe
         storeInfoVo.setUpdatedAt(LocalDateTime.now());
         storeInfoVo.setUpdatedBy(CurrentUtil.getCurrentUid());
         if (goblinMongoUtils.updateStoreInfoVo(param.completeStoreInfoVo(storeInfoVo))) {
-            // TODO: 2022/1/6 zhanggb redis
+            goblinRedisUtils.delStoreInfoVo(storeInfoVo.getStoreId());
 
 //            LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
 //            LinkedList<Object[]> updateStoreInfoObjs = CollectionUtil.linkedListObjectArr();

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

@@ -66,19 +66,41 @@ public class GoblinStoreMgtServiceImpl implements IGoblinStoreMgtService {
             }
         }
         if (!CollectionUtils.isEmpty(updateStoreConfigVoList) && goblinMongoUtils.updateStoreConfigVos(updateStoreConfigVoList)) {
-//            goblinRedisUtils.setStoreConfigVos(storeId, storeConfigVos);// TODO: 2022/1/17 zhanggb==
+//            goblinRedisUtils.setStoreConfigVos(storeId, storeConfigVos);// TODO: 2022/1/17 zhanggb==redis
 
+            LinkedList<Object[]> updateStoreInfoObjs = CollectionUtil.linkedListObjectArr();
+            LinkedList<Object[]> updateGoodsInfoObjs = CollectionUtil.linkedListObjectArr();
             if (toUpdateStoreStatusFlg) {
-                GoblinStoreInfoVo storeInfoVo = goblinRedisUtils.getStoreInfoVo(storeId);
-                storeInfoVo.setStatus(confMap.get(GoblinStoreConf.BUSINESS_STATUS.name()));
-                goblinMongoUtils.updateStoreInfoVo(storeInfoVo);
-//                goblinRedisUtils.setStoreInfoVo(storeInfoVo);// TODO: 2022/1/17 zhanggb==
+                String status = confMap.get(GoblinStoreConf.BUSINESS_STATUS.name());
+
+                GoblinStoreInfoVo updateStoreInfoVo = goblinRedisUtils.getStoreInfoVo(storeId);
+                updateStoreInfoVo.setStatus(status);
+                updateStoreInfoVo.setUpdatedBy(uid);
+                updateStoreInfoVo.setUpdatedAt(now);
+                goblinMongoUtils.updateStoreInfoVo(updateStoreInfoVo);
+//                goblinRedisUtils.setStoreInfoVo(updateStoreInfoVo);// TODO: 2022/1/17 zhanggb==redis
+
+                goblinMongoUtils.updateGoodsInfoVoAppear(storeId, status, now, uid);
+
+                List<String> spuIdList = goblinMongoUtils.getMgtGoodsSpuIds(storeId);
+                spuIdList.forEach(spuId -> goblinRedisUtils.delGoodsInfoVo(spuId));
+
+                updateStoreInfoObjs.add(new Object[]{updateStoreInfoVo.getStatus(), uid, now, storeId});
+                updateGoodsInfoObjs.add(new Object[]{status, uid, now, storeId});
             }
 
+            LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+            toMqSqls.add(SqlMapping.get("goblin_store_config.update"));
             LinkedList<Object[]> updateStoreConfigVoObjs = CollectionUtil.linkedListObjectArr();
-            updateStoreConfigVoList.forEach(uc -> updateStoreConfigVoObjs.add(new Object[]{uc.getConfigVal(), uc.getUpdatedBy(), uc.getUpdatedAt(), uc.getStoreId(), uc.getConfigKey()}));
+            updateStoreConfigVoList.forEach(uc -> updateStoreConfigVoObjs.add(new Object[]{
+                    uc.getConfigVal(), uc.getUpdatedBy(), uc.getUpdatedAt(), uc.getStoreId(), uc.getConfigKey()}));
+            toMqSqls.add(SqlMapping.get("goblin_store_info.update_by_setting"));
+//            LinkedList<Object[]> updateStoreInfoObjs = CollectionUtil.linkedListObjectArr();
+            toMqSqls.add(SqlMapping.get("goblin_goods.update_by_status"));
+//            LinkedList<Object[]> updateGoodsInfoObjs = CollectionUtil.linkedListObjectArr();
+
             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_STORE.getKey(),
-                    SqlMapping.get("goblin_store_config.update", updateStoreConfigVoObjs));
+                    SqlMapping.gets(toMqSqls, updateStoreConfigVoObjs, updateStoreInfoObjs, updateGoodsInfoObjs));
             return true;
         }
         return false;

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

@@ -295,14 +295,14 @@ public class GoblinMongoUtils {
 
     public boolean delGoodsInfoVoBySpuIds(String storeId, List<String> spuIdList, String uid, LocalDateTime time) {
         return mongoTemplate.updateMulti(
-                Query.query(Criteria.where("store_id").is(storeId).and("spuId").in(spuIdList.toArray()).and("delFlg").is("0")),
+                Query.query(Criteria.where("storeId").is(storeId).and("spuId").in(spuIdList.toArray()).and("delFlg").is("0")),
                 Update.update("delFlg", 1).set("updatedBy", uid).set("updatedAt", time).set("deletedBy", uid).set("deletedAt", time),
                 GoblinGoodsInfoVo.class.getSimpleName()
         ).getModifiedCount() > 0;
     }
 
     public List<String> delGoodsInfoVoByStoreId(String storeId, String uid, LocalDateTime time) {
-        Query query = Query.query(Criteria.where("storeId").is(storeId).and("delFlg").is("0").and("shelves_status").is("3"));
+        Query query = Query.query(Criteria.where("storeId").is(storeId).and("delFlg").is("0").and("shelvesStatus").is("3"));
         query.fields().include("spuId");
         List<GoblinGoodsInfoVo> storeSpus = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
 
@@ -320,7 +320,7 @@ public class GoblinMongoUtils {
     }
 
     // SPU分页
-    public PagedResult<GoblinStoreMgtGoodsListVo> getGoodsInfoVo(GoblinStoreMgtGoodsFilterParam filterParam) {
+    public PagedResult<GoblinStoreMgtGoodsListVo> getMgtGoodsInfoVos(GoblinStoreMgtGoodsFilterParam filterParam) {
         Criteria criteria = Criteria.where("delFlg").is("0").and("storeId").is(filterParam.getStoreId()).and("marketId").exists(false);
         if (StringUtils.isNotBlank(filterParam.getKeyword())) {
             Pattern pattern = Pattern.compile("^.*" + filterParam.getKeyword() + ".*$", Pattern.CASE_INSENSITIVE);
@@ -368,6 +368,24 @@ public class GoblinMongoUtils {
         return pagedResult.setList(goodsListVos).setTotal(count, filterParam.getPageSize());
     }
 
+    // SPU信息
+    public List<String> getMgtGoodsSpuIds(String storeId) {
+        Query query = Query.query(Criteria.where("storeId").is(storeId).and("delFlg").is("0"));
+        query.fields().include("spuId");
+        List<GoblinGoodsInfoVo> vos = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
+        return CollectionUtils.isEmpty(vos) ? CollectionUtil.arrayListString()
+                : vos.stream().map(GoblinGoodsInfoVo::getSpuId).collect(Collectors.toList());
+    }
+
+    // SKU信息
+    public List<String> getMgtGoodsSkuIds(String storeId, List<String> spuIdList) {
+        Query query = Query.query(Criteria.where("storeId").is(storeId).and("delFlg").is("0").and("spuId").in(spuIdList.toArray()));
+        query.fields().include("skuId");
+        List<GoblinGoodsSkuInfoVo> vos = mongoTemplate.find(query, GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
+        return CollectionUtils.isEmpty(vos) ? CollectionUtil.arrayListString()
+                : vos.stream().map(GoblinGoodsSkuInfoVo::getSkuId).collect(Collectors.toList());
+    }
+
     // SPU信息
     public GoblinGoodsInfoVo getGoodsInfoVo(String spuId) {
         return mongoTemplate.findOne(Query.query(Criteria.where("spuId").is(spuId).and("delFlg").is("0").and("shelvesStatus").is("3")),
@@ -382,13 +400,20 @@ public class GoblinMongoUtils {
 
     // SPU信息
     public boolean updateGoodsInfoVo(GoblinGoodsInfoVo vo) {
-        return mongoTemplate.getCollection(GoblinGoodsInfoVo.class.getSimpleName())
-                .updateOne(
+        return mongoTemplate.getCollection(GoblinGoodsInfoVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("spuId").is(vo.getSpuId()).and("delFlg").is("0")).getQueryObject(),
                         ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(vo))
                 ).getModifiedCount() > 0;
     }
 
+    // SPU信息
+    public boolean updateGoodsInfoVoAppear(String storeId, String spuAppear, LocalDateTime time, String uid) {
+        return mongoTemplate.getCollection(GoblinGoodsInfoVo.class.getSimpleName()).updateOne(
+                Query.query(Criteria.where("storeId").is(storeId).and("delFlg").is("0")).getQueryObject(),
+                Update.update("spuAppear", spuAppear).set("updatedBy", uid).set("updatedAt", time).getUpdateObject()
+        ).getModifiedCount() > 0;
+    }
+
     public boolean updateGoodsInfoVoByShelves(String storeId, List<String> spuIdList, boolean shelvesFlg, String uid, LocalDateTime time) {
         return mongoTemplate.updateMulti(Query.query(Criteria.where("storeId").is(storeId).and("spuId").in(spuIdList.toArray())),
                 Update.update("shelvesStatus", shelvesFlg ? "3" : "1").set("shelvesAt", time).set("updatedBy", uid).set("updatedAt", time),
@@ -405,13 +430,16 @@ public class GoblinMongoUtils {
         return (List<GoblinGoodsSkuInfoVo>) mongoTemplate.insert(vos, GoblinGoodsSkuInfoVo.class.getSimpleName());
     }
 
-    public boolean delGoodsSkuInfoVo(String skuId) {
-        return mongoTemplate.remove(Query.query(Criteria.where("skuId").is(skuId).and("delFlg").is("0")),
-                GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName()).getDeletedCount() > 0;
+    public boolean delGoodsSkuInfoVo(GoblinGoodsSkuInfoVo vo) {
+        return mongoTemplate.getCollection(GoblinGoodsSkuInfoVo.class.getSimpleName()).updateOne(
+                Query.query(Criteria.where("skuId").is(vo.getSkuId()).and("delFlg").is("0")).getQueryObject(),
+                Update.update("updatedBy", vo.getUpdatedBy()).set("updatedAt", vo.getUpdatedAt())
+                        .set("deletedBy", vo.getDeletedBy()).set("deletedAt", vo.getDeletedAt()).getUpdateObject()
+        ).getModifiedCount() > 0;
     }
 
     public List<String> delGoodsSkuInfoVoByStoreId(String storeId, String uid, LocalDateTime time) {
-        Query query = Query.query(Criteria.where("storeId").is(storeId).and("delFlg").is("0").and("shelves_status").is("3"));
+        Query query = Query.query(Criteria.where("storeId").is(storeId).and("delFlg").is("0").and("shelvesStatus").is("3"));
         query.fields().include("skuId");
         List<GoblinGoodsSkuInfoVo> storeSkus = mongoTemplate.find(query, GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
 

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

@@ -4,6 +4,7 @@ goblin_store_info.update_by_cert1=UPDATE goblin_store_info SET store_type=?,cert
 goblin_store_info.update_by_cert2=UPDATE goblin_store_info SET store_name=?,logo_pic=?,background_pic=?,introduce=?,status=?,store_type=?,updated_by=?,updated_at=? WHERE store_id=? 
 goblin_store_info.update_by_del=UPDATE goblin_store_info SET del_flg=1,updated_by=?,updated_at=? WHERE store_id=? 
 goblin_store_info.update_by_edit=UPDATE goblin_store_info SET store_name=?,logo_pic=?,background_pic=?,introduce=?,updated_by=?,updated_at=? WHERE store_id=? 
+goblin_store_info.update_by_setting=UPDATE goblin_store_info SET status=?,updated_by=?,updated_at=? WHERE store_id=? AND del_flg='0' 
 
 goblin_store_certification.insert_by_cert=INSERT INTO goblin_store_certification (store_id,person_cert_type,person_name,person_cert_code,person_cert_validity,person_cert_lasting,person_cert_fpic,person_cert_bpic,person_cert_spic,province_id,province_name,city_id,city_name,county_id,county_name,bus_address,bus_name,bus_cert_code,bus_cert_validity,bus_cert_lasting,bus_cert_pic,bus_quality_pic,created_by,created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
 goblin_store_certification.update_by_cert=UPDATE goblin_store_certification SET person_cert_type=?,person_name=?,person_cert_code=?,person_cert_validity=?,person_cert_lasting=?,person_cert_fpic=?,person_cert_bpic=?,person_cert_spic=?,province_id=?,province_name=?,city_id=?,city_name=?,county_id=?,county_name=?,bus_address=?,bus_name=?,bus_cert_code=?,bus_cert_validity=?,bus_cert_lasting=?,bus_cert_pic=?,bus_quality_pic=?,updated_by=?,updated_at=? WHERE store_id=? 
@@ -27,17 +28,28 @@ goblin_goods_spec.insert_by_ignore=INSERT IGNORE INTO goblin_goods_spec (spec_na
 goblin_goods_spec_value.insert_by_ignore=INSERT IGNORE INTO goblin_goods_spec_value (spec_name,spec_vname,created_by,created_at)VALUES(?,?,'-',?) 
 #----                   商品关联规格信息
 goblin_goods_spu_spec_value.insert_by_ignore=INSERT IGNORE INTO goblin_goods_spu_spec_value (spu_id,spec_name,spec_vname,sort)VALUES(?,?,?,?) 
+goblin_goods_spu_spec_value.update_by_editdel=UPDATE goblin_goods_spu_spec_value SET del_flg='1' WHERE spu_id=? AND spec_name=? AND spec_vname=? AND del_flg='0'
+goblin_goods_spu_spec_value.update_by_edit=UPDATE goblin_goods_spu_spec_value SET sort=? WHERE spu_id=? AND spec_name=? AND spec_vname=? AND del_flg='0'
+goblin_goods_spu_spec_value.update_by_del_sku1=UPDATE goblin_goods_spu_spec_value SET del_flg='1' WHERE spu_id=? AND spec_name=? AND spec_vname=? 
+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_by_ignore=INSERT IGNORE INTO goblin_goods_sku_spec_value (spu_id,sku_id,spec_name,spec_vname)VALUES(?,?,?,?) 
+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=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' 
 goblin_goods.update_by_shelves=UPDATE goblin_goods SET shelves_status=?,shelves_at=?,updated_by=?,updated_at=? WHERE spu_id=? AND store_id=? AND spu_appear='0' 
-goblin_goods.update_by_del_store=UPDATE goblin_goods SET del_flg=1,updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE store_id=? 
-goblin_goods.update_by_del=UPDATE goblin_goods SET del_flg=1,updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE spu_id=? AND store_id=? 
+goblin_goods.update_by_status=UPDATE goblin_goods SET spu_appear=?,updated_by=?,updated_at=? WHERE store_id=? AND del_flg='0' 
+goblin_goods.update_by_del_sku=UPDATE goblin_goods SET price_ge=?,price_le=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0' 
+goblin_goods.update_by_del_store=UPDATE goblin_goods SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE store_id=? 
+goblin_goods.update_by_del=UPDATE goblin_goods SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE spu_id=? AND store_id=? 
 
 goblin_goods_sku.insert=INSERT INTO goblin_goods_sku (sku_id,spu_id,sku_no,name,subtitle, sell_price,sku_pic,sku_isbn,stock,sku_stock, warning_stock,price,price_member,weight,buy_factor, buy_roster,buy_limit,store_id,sku_validity,virtual_flg, status,shelves_status,sku_appear,shelves_at,created_by, created_at,logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
+goblin_goods_sku.update_by_edit=UPDATE goblin_goods_sku SET sku_pic=?,sell_price=?,price=?,price_member=?,weight=?,stock=?,sku_stock=?,warning_stock=?,sku_appear=?,sku_isbn=?,buy_factor=?,buy_roster=?,buy_limit=?,sku_validity=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0' 
+goblin_goods_sku.update_by_edit_spu=UPDATE goblin_goods_sku SET sku_no=?,virtual_flg=?,logistics_template=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0' 
 goblin_goods_sku.update_by_shelves=UPDATE goblin_goods_sku SET shelves_status=?,shelves_at=?,updated_by=?,updated_at=? WHERE spu_id=? AND store_id=? AND sku_appear='0' 
-goblin_goods_sku.update_by_del_store=UPDATE goblin_goods_sku SET del_flg=1,updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE store_id=? 
-goblin_goods_sku.update_by_del=UPDATE goblin_goods_sku SET del_flg=1,updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE spu_id=? AND store_id=? 
+goblin_goods_sku.update_by_del_store=UPDATE goblin_goods_sku SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE store_id=? 
+goblin_goods_sku.update_by_del=UPDATE goblin_goods_sku SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE spu_id=? AND store_id=? 
 
 goblin_goods_image.insert=INSERT INTO goblin_goods_image (spu_id,url)VALUES(?,?) 
 goblin_goods_tag.insert=insert into goblin_goods_tag (spu_id,tag_id,sort,tag_belong)VALUES(?,?,?,?)