~API:店铺认证+MYSQL、商品规格处理;

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

 package com.liquidnet.service.goblin.dto.manage;
 
 import com.liquidnet.commons.lang.constant.LnsRegex;
-import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreCertificationVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreCertificationVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,11 +33,11 @@ public class GoblinStoreMgtCertificationParam implements java.io.Serializable {
     @NotBlank(message = "证件是否长期有效不能为空")
     @Pattern(regexp = "\\b(0|1)\\b", message = "证件是否长期有效参数无效")
     private String personCertLasting;
-    @ApiModelProperty(position = 17, required = true, value = "证件正面照[256]")
+    @ApiModelProperty(position = 17, required = true, value = "证件正面照[256]", example = "http://pic.zhengzai.tv/202201/F1/50/1641481155557_6581EB9242485010CE0133147DF5D080.jpg")
     private String personCertFpic;
-    @ApiModelProperty(position = 18, required = true, value = "证件背面照[256]")
+    @ApiModelProperty(position = 18, required = true, value = "证件背面照[256]", example = "http://pic.zhengzai.tv/202201/C3/C7/1641361041_5D81A954265418219490CB2538239880.jpg")
     private String personCertBpic;
-    @ApiModelProperty(position = 19, required = true, value = "证件手持照[256]")
+    @ApiModelProperty(position = 19, required = true, value = "证件手持照[256]", example = "http://pic.zhengzai.tv/202201/81/30/1641362407_A60B2870D92EAD9B985289382A3ECA3A.jpg")
     private String personCertSpic;
 
     @ApiModelProperty(position = 19, required = false, value = "省ID[20]", example = "110000")
@@ -66,7 +66,7 @@ public class GoblinStoreMgtCertificationParam implements java.io.Serializable {
     @NotBlank(message = "证件是否长期有效不能为空")
     @Pattern(regexp = "\\b(0|1)\\b", message = "证件是否长期有效参数无效")
     private String busCertLasting;
-    @ApiModelProperty(position = 30, required = false, value = "营业执照照片[256]")
+    @ApiModelProperty(position = 30, required = false, value = "营业执照照片[256]", example = "http://pic.zhengzai.tv/202201/3C/00/1641369685_B1673980AE72DBF44E32BE88FCA3EBA2.jpg")
     private String busCertPic;
     @ApiModelProperty(position = 31, required = false, value = "资质证书照片[256]")
     private String busQualityPic;

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

@@ -4,19 +4,25 @@ import com.liquidnet.service.goblin.dto.vo.GoblinStoreInfoVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.validation.constraints.Pattern;
 
 @ApiModel(value = "GoblinStoreMgtCompleteParam", description = "店铺认证:认证资料入参")
 @Data
 public class GoblinStoreMgtCompleteParam implements java.io.Serializable {
     private static final long serialVersionUID = -5612313562282544613L;
-    @ApiModelProperty(position = 11, value = "店铺名称[128]")
+    @ApiModelProperty(position = 11, value = "店铺名称[128]", example = "店铺名称...")
     private String storeName;
-    @ApiModelProperty(position = 12, value = "店铺LOGO[256]")
+    @ApiModelProperty(position = 12, value = "店铺LOGO[256]", example = "https://img.zhengzai.tv/files/2020/08/31/5f4c75095e9bc.png")
     private String logoPic;
-    @ApiModelProperty(position = 13, value = "店铺背景图[256]")
+    @ApiModelProperty(position = 13, value = "店铺背景图[256]", example = "http://pic.zhengzai.tv/202201/CC/BF/1641361220_C8648990308E1C77247CCA0A37B68F07.jpg")
     private String backgroundPic;
-    @ApiModelProperty(position = 14, value = "店铺介绍[500]")
+    @ApiModelProperty(position = 14, value = "店铺介绍[500]", example = "店铺介绍......")
     private String introduce;
+    @ApiModelProperty(position = 15, value = "店铺类型[1-普通店铺|2-加盟|3-连锁|5-直营]", allowableValues = "1,2,3,5", example = "1")
+    @Pattern(regexp = "\\b(1|2|3|5)\\b", message = "店铺类型参数无效")
+    private String storeType;
 
     public GoblinStoreInfoVo completeStoreInfoVo(GoblinStoreInfoVo vo) {
         vo.setStoreName(this.getStoreName());
@@ -24,6 +30,7 @@ public class GoblinStoreMgtCompleteParam implements java.io.Serializable {
         vo.setBackgroundPic(this.getBackgroundPic());
         vo.setIntroduce(this.getIntroduce());
         vo.setStatus("1");
+        vo.setStoreType(StringUtils.isNotBlank(this.getStoreType()) ? this.getStoreType() : "1");
         return vo;
     }
-}
+}
\ No newline at end of file

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

@@ -68,8 +68,8 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
 
     @ApiModelProperty(position = 23, required = true, value = "规格展现方式[1-常规|2-组合]", allowableValues = "1,2", example = "1")
     private String specMode;
-    @ApiModelProperty(position = 24, required = true, value = "SKU规格信息")
-    @NotNull(message = "SKU规格信息不能为空")
+    @ApiModelProperty(position = 24, required = false, value = "SKU规格信息[初次添加商品必填]")
+//    @NotNull(message = "SKU规格信息不能为空")
     @Valid
     private List<GoblinStoreMgtGoodsAddSkuParam> skuParamList;
     @ApiModelProperty(position = 25, required = true, value = "物流模版", example = "松鼠德邦")
@@ -157,7 +157,8 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
         vo.setStatus("1");
 //        vo.setReason(null);
         vo.setShelvesStatus("0");
-//        vo.setSpuAppear(null);
+        vo.setSpuAppear("0");
+        vo.setDelFlg("0");
 //        vo.setShelvesAt(null);
         vo.setImageList(this.getImageList());
         vo.setLogisticsTemplate(this.getLogisticsTemplate());
@@ -249,6 +250,7 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
 //            vo.setReason();
             vo.setShelvesStatus("0");
             vo.setSkuAppear(addSkuParam.getSkuAppear());
+            vo.setDelFlg("0");
 //            vo.setShelvesAt();
             vo.setCreatedBy(goodsInfoVo.getCreatedBy());
             vo.setCreatedAt(goodsInfoVo.getCreatedAt());
@@ -269,14 +271,13 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
             for (int j = 0; j < specSize; j++) {
                 GoblinGoodsSpecDto specDto = skuSpecList.get(j);
 
-                GoblinGoodsSpecValueVo specValueVo = GoblinGoodsSpecValueVo.getNew().setSpecVname(specDto.getSpecVname()).setSpecVsort(0);
-
+                GoblinGoodsSpecValueVo specValueVo = GoblinGoodsSpecValueVo.getNew().setSpecVname(specDto.getSpecVname()).setSpecVsort(j);
                 if (i == 0) {
                     ArrayList<GoblinGoodsSpecValueVo> specValueVos = new ArrayList<>();
                     specValueVos.add(specValueVo);
 
                     goodsSpecVos.add(j, GoblinGoodsSpecVo.getNew()
-                            .setSpecName(specDto.getSpecName()).setSpecSort(0).setSpecValues(specValueVos));
+                            .setSpecName(specDto.getSpecName()).setSpecSort(j).setSpecValues(specValueVos));
                 } else {// 补充规格对应的值
                     goodsSpecVos.get(j).getSpecValues().add(specValueVo);
                 }

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

 package com.liquidnet.service.goblin.dto.manage.vo;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreInfoVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsInfoVo.java

@@ -74,12 +74,14 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
     private String shelvesStatus;
     @ApiModelProperty(position = 37, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
     private String spuAppear;
-    @ApiModelProperty(position = 38, value = "上架时间")
+    @ApiModelProperty(position = 38, value = "删除标记[0-未删除|1-删除]")
+    private String delFlg;
+    @ApiModelProperty(position = 39, value = "上架时间")
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime shelvesAt;
-    @ApiModelProperty(position = 39, value = "商品图片列表")
+    @ApiModelProperty(position = 40, value = "商品图片列表")
     private List<String> imageList;
-    @ApiModelProperty(position = 40, value = "物流模版")
+    @ApiModelProperty(position = 41, value = "物流模版")
     private String logisticsTemplate;
 
     private String createdBy;
@@ -88,6 +90,9 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
     private String updatedBy;
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
+    private String deletedBy;
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime deletedAt;
 
     @ApiModelProperty(position = 51, value = "规格信息")
     private List<GoblinGoodsSpecVo> specVoList;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoVo.java

@@ -68,19 +68,25 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     private String shelvesStatus;
     @ApiModelProperty(position = 33, value = "自定义展示[0-默认展示|1-隐藏不可购买]")
     private String skuAppear;
-    @ApiModelProperty(position = 34, value = "上架时间")
+    @ApiModelProperty(position = 34, value = "删除标记[0-未删除|1-删除]")
+    private String delFlg;
+    @ApiModelProperty(position = 35, value = "上架时间")
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime shelvesAt;
-    @ApiModelProperty(position = 34, value = "活动Id")
+    @ApiModelProperty(position = 36, value = "活动Id")
     private String marketId;
+    @ApiModelProperty(position = 37, value = "物流模版ID")
+    private String logisticsTemplate;
+
     private String createdBy;
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime createdAt;
     private String updatedBy;
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
-    @ApiModelProperty(position = 35, value = "物流模版ID")
-    private String logisticsTemplate;
+    private String deletedBy;
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime deletedAt;
 
     @ApiModelProperty(position = 40, value = "单品规格信息")
     private List<GoblinGoodsSpecDto> skuSpecList;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinShowStoreInfoVo.java

@@ -2,7 +2,6 @@ package com.liquidnet.service.goblin.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreCertificationVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/GoblinStoreCertificationVo.java → liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreCertificationVo.java

-package com.liquidnet.service.goblin.dto.manage.vo;
+package com.liquidnet.service.goblin.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -59,9 +59,6 @@ public class GoblinStoreCertificationVo implements Serializable, Cloneable {
     private String busCertPic;
     @ApiModelProperty(position = 32, value = "资质证书照片[256]")
     private String busQualityPic;
-    private String updatedBy;
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
-    private LocalDateTime updatedAt;
 
     private static final GoblinStoreCertificationVo obj = new GoblinStoreCertificationVo();
     public static GoblinStoreCertificationVo getNew() {

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreInfoVo.java

 package com.liquidnet.service.goblin.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreCertificationVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,6 +13,7 @@ import java.time.LocalDateTime;
 
 @ApiModel(value = "GoblinStoreInfoVo", description = "店铺基础信息")
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinStoreInfoVo implements Serializable, Cloneable {
     private static final long serialVersionUID = -2268722236055938975L;
     @ApiModelProperty(position = 11, value = "店铺ID[64]")
@@ -42,14 +43,19 @@ public class GoblinStoreInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 23, value = "店铺有效期")
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime validity;
+    @ApiModelProperty(position = 24, value = "删除标记[0-未删除|1-删除]")
+    private String delFlg;
     private String createdBy;
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime createdAt;
     private String updatedBy;
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
+    private String deletedBy;
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime deletedAt;
 
-    @ApiModelProperty(position = 25, value = "店铺认证信息")
+    @ApiModelProperty(position = 30, value = "店铺认证信息")
     private GoblinStoreCertificationVo certificationVo;
 
 

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

@@ -2,19 +2,33 @@ package com.liquidnet.service.goblin.service.manage;
 
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtCertificationParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtCompleteParam;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreInfoVo;
 
 public interface IGoblinStoreMgtCertificationService {
     /**
      * 店铺认证:认证资料保存
      *
-     * @param param GoblinStoreMgtCertificationParam
+     * @param param       GoblinStoreMgtCertificationParam
+     * @param storeInfoVo GoblinStoreInfoVo
+     * @return GoblinStoreInfoVo
      */
-    void certificationInformationProcessing(GoblinStoreMgtCertificationParam param);
+    GoblinStoreInfoVo certificationInformationProcessing(GoblinStoreMgtCertificationParam param, GoblinStoreInfoVo storeInfoVo);
 
     /**
      * 店铺认证:完善信息保存
      *
-     * @param param GoblinStoreMgtCompleteParam
+     * @param param       GoblinStoreMgtCompleteParam
+     * @param storeInfoVo GoblinStoreInfoVo
+     * @return boolean
      */
-    void certificationCompleteProcessing(GoblinStoreMgtCompleteParam param);
+    boolean certificationCompleteProcessing(GoblinStoreMgtCompleteParam param, GoblinStoreInfoVo storeInfoVo);
+
+    /**
+     * 店铺认证:删除店铺处理
+     *
+     * @param storeId 店铺ID
+     * @param uid     UID
+     * @return boolean
+     */
+    boolean certificationCancelProcessing(String storeId, String uid);
 }

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

@@ -5,6 +5,7 @@ import com.liquidnet.service.goblin.dto.manage.*;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsInfoVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 
 public interface IGoblinstoreMgtGoodsService {
     /**
@@ -43,9 +44,10 @@ public interface IGoblinstoreMgtGoodsService {
      * 商品管理:商品编辑:SKU编辑
      *
      * @param storeMgtGoodsEditSkuParam GoblinStoreMgtGoodsEditSkuParam
+     * @param goodsInfoVo               GoblinGoodsInfoVo
      * @return boolean
      */
-    boolean goodsEditSku(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam);
+    boolean goodsEditSku(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam, GoblinGoodsInfoVo goodsInfoVo);
 
     /**
      * 商品管理:商品编辑:SKU添加
@@ -58,11 +60,10 @@ public interface IGoblinstoreMgtGoodsService {
     /**
      * 商品管理:商品编辑:SKU删除
      *
-     * @param spuId   商品ID
-     * @param skuId   单品ID
+     * @param goodsSkuInfoVo GoblinGoodsSkuInfoVo
      * @return boolean
      */
-    boolean goodsEditSkuDel(String spuId, String skuId);
+    boolean goodsEditSkuDel(GoblinGoodsSkuInfoVo goodsSkuInfoVo);
 
     /**
      * 商品管理:商品编辑:SKU批改

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java

@@ -201,6 +201,8 @@ public class MQConst {
     }
 
     public enum GoblinQueue {
+        SQL_STORE("goblin:stream:sql.store", "group.sql.ustore", "店铺相关"),
+        SQL_GOODS("goblin:stream:sql.goods", "group.sql.ustore", "商品相关"),
         GOBLIN_STORE_MARKET("goblin:stream:store.market", "group.store.market", "店铺活动"),
         GOBLIN_SELF_MARKET("goblin:stream:self.market", "group.self.market", "平台活动"),
         GOBLIN_ORDER_CREATE_PAY("goblin:stream:order:create_pay", "group.order:create_pay", "订单创建&支付"),

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinStoreInfo.java

@@ -90,6 +90,11 @@ public class GoblinStoreInfo implements Serializable {
      */
     private LocalDateTime validity;
 
+    /**
+     * 删除标记[0-未删除|1-删除]
+     */
+    private String delFlg;
+
     private String createdBy;
 
     private LocalDateTime createdAt;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/config/ConsumerGoblinSqlUstoreRedisStreamConfig.java

+package com.liquidnet.service.consumer.goblin.config;
+
+import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.consumer.goblin.receiver.ConsumerGoblinSqlGoodsRdsReceiver;
+import com.liquidnet.service.consumer.goblin.receiver.ConsumerGoblinSqlStoreRdsReceiver;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.stream.Consumer;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.connection.stream.StreamOffset;
+import org.springframework.data.redis.stream.StreamMessageListenerContainer;
+import org.springframework.data.redis.stream.Subscription;
+
+import java.time.Duration;
+
+import static com.liquidnet.service.base.constant.MQConst.AdamQueue;
+
+@Configuration
+public class ConsumerGoblinSqlUstoreRedisStreamConfig {
+    @Autowired
+    ConsumerGoblinSqlStoreRdsReceiver consumerGoblinSqlStoreRdsReceiver;
+    @Autowired
+    ConsumerGoblinSqlGoodsRdsReceiver consumerGoblinSqlGoodsRdsReceiver;
+
+    private StreamMessageListenerContainer<String, MapRecord<String, String, String>> buildStreamMessageListenerContainer(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        return StreamMessageListenerContainer.create(factory, options);
+    }
+
+    /**
+     * 店铺相关
+     *
+     * @param listenerContainer StreamMessageListenerContainer
+     * @param t                 消费者序号
+     * @return Subscription
+     */
+    private Subscription receiveSqlStore(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
+        return listenerContainer.receiveAutoAck(
+                Consumer.from(MQConst.GoblinQueue.SQL_STORE.getGroup(), MQConst.GoblinQueue.SQL_STORE.name() + t),
+                StreamOffset.create(MQConst.GoblinQueue.SQL_STORE.getKey(), ReadOffset.lastConsumed()), consumerGoblinSqlStoreRdsReceiver
+        );
+    }
+
+    /**
+     * 商品相关
+     *
+     * @param listenerContainer StreamMessageListenerContainer
+     * @param t                 消费者序号
+     * @return Subscription
+     */
+    private Subscription receiveSqlGoods(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
+        return listenerContainer.receiveAutoAck(
+                Consumer.from(MQConst.GoblinQueue.SQL_GOODS.getGroup(), MQConst.GoblinQueue.SQL_GOODS.name() + t),
+                StreamOffset.create(MQConst.GoblinQueue.SQL_GOODS.getKey(), ReadOffset.lastConsumed()), consumerGoblinSqlGoodsRdsReceiver
+        );
+    }
+
+    /* —————————————————————————— ｜ —————————————————————————— ｜ —————————————————————————— */
+
+    /* -------------------------------------------------------- ｜ 店铺相关 */
+
+    @Bean
+    public Subscription subscriptionSqlStore1(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveSqlStore(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionSqlStore2(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveSqlStore(listenerContainer, 2);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionSqlStore3(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveSqlStore(listenerContainer, 3);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    /* -------------------------------------------------------- ｜ 用户中心 */
+
+    @Bean
+    public Subscription subscriptionSqlGoods1(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveSqlGoods(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionSqlGoods2(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveSqlGoods(listenerContainer, 2);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionSqlGoods3(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveSqlGoods(listenerContainer, 3);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    /* -------------------------------------------------------- ｜  */
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/receiver/ConsumerGoblinSqlGoodsRdsReceiver.java

+package com.liquidnet.service.consumer.goblin.receiver;
+
+import com.liquidnet.service.base.constant.MQConst;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ConsumerGoblinSqlGoodsRdsReceiver extends AbstractSqlRedisReceiver {
+    @Override
+    protected String getRedisStreamKey() {
+        return MQConst.GoblinQueue.SQL_GOODS.getKey();
+    }
+
+    @Override
+    protected String getRedisStreamGroup() {
+        return MQConst.GoblinQueue.SQL_GOODS.getGroup();
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/java/com/liquidnet/service/consumer/goblin/receiver/ConsumerGoblinSqlStoreRdsReceiver.java

+package com.liquidnet.service.consumer.goblin.receiver;
+
+import com.liquidnet.service.base.constant.MQConst;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ConsumerGoblinSqlStoreRdsReceiver extends AbstractSqlRedisReceiver {
+    @Override
+    protected String getRedisStreamKey() {
+        return MQConst.GoblinQueue.SQL_STORE.getKey();
+    }
+
+    @Override
+    protected String getRedisStreamGroup() {
+        return MQConst.GoblinQueue.SQL_STORE.getGroup();
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-goblin/src/main/resources/bootstrap-service-consumer-goblin.yml

@@ -9,7 +9,7 @@ eureka:
 spring:
   cloud:
     config:
-#      uri: http://39.106.122.201:7002/support-config
+#      uri: http://39.107.71.112:7002/support-config
       profile: ${liquidnet.cloudConfig.profile}
       name: ${spring.application.name} #默认为spring.application.name
       discovery:

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

@@ -96,7 +96,7 @@ create table goblin_store_info
     mid            bigint auto_increment primary key,
     store_id       varchar(64)  not null comment '店铺id',
     uid            varchar(64)  not null comment '店主UID',
-    store_name     varchar(128) not null comment '店铺名称',
+    store_name     varchar(128) null comment '店铺名称',
     logo_pic       varchar(256) null comment '店铺LOGO',
     background_pic varchar(256) null comment '店铺背景图',
     introduce      varchar(500) null comment '店铺介绍',
@@ -107,6 +107,7 @@ create table goblin_store_info
     ave_score      decimal(8, 2) default 0.0 comment '店铺评分',
     service_acc    varchar(128) null comment '客服账号',# ==
     validity       datetime     null comment '店铺有效期',
+    del_flg        char          default '0' comment '删除标记[0-未删除|1-删除]',
     created_by     varchar(64)  not null,
     created_at     datetime     not null,
     updated_by     varchar(64)  null,
@@ -220,12 +221,12 @@ create index idx_ggss_spu_id on goblin_goods_service_support (spu_id);
 drop table if exists goblin_goods_tag;
 create table goblin_goods_tag
 (
-    mid        bigint auto_increment primary key,
-    spu_id     varchar(64) not null comment '商品id',
-    tag_id     varchar(30) not null comment '标签id，对应 goblin_self_goods_tag.tag_id | goblin_self_extag.tag_id',
-    sort       int  default 0 comment '排序[数值越小,排序越前]',
-    del_flg    char default '0' comment '删除标记[0-未删除|1-删除]',
-    comment    varchar(255)
+    mid     bigint auto_increment primary key,
+    spu_id  varchar(64) not null comment '商品id',
+    tag_id  varchar(30) not null comment '标签id，对应 goblin_self_goods_tag.tag_id | goblin_self_extag.tag_id',
+    sort    int  default 0 comment '排序[数值越小,排序越前]',
+    del_flg char default '0' comment '删除标记[0-未删除|1-删除]',
+    comment varchar(255)
 ) engine = InnoDB comment '商品关联标签';
 
 create index idx_ggt_tag_id on goblin_goods_tag (tag_id);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/redis_queue_create.txt

+#----                   店铺相关
+XADD goblin:stream:sql.store * 0 0
+XGROUP CREATE goblin:stream:sql.store group.sql.ustore 0
+#----                   商品相关
+XADD goblin:stream:sql.goods * 0 0
+XGROUP CREATE goblin:stream:sql.goods group.sql.ustore 0
+#----                   #
 XADD goblin:stream:store.market * 0 0
 XGROUP CREATE goblin:stream:store.market group.store.market 0
 
@@ -11,4 +18,5 @@ XADD goblin:stream:order:again * 0 0
 XGROUP CREATE goblin:stream:order:again group.order:again 0
 
 XADD goblin:stream:order:close * 0 0
-XGROUP CREATE goblin:stream:order:close group.order:close 0
+XGROUP CREATE goblin:stream:order:close group.order:close 0
\ No newline at end of file
+#----                   #
\ No newline at end of file

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

@@ -13,16 +13,18 @@ import com.liquidnet.service.goblin.service.manage.IGoblinStoreMgtCertificationS
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.Arrays;
+import java.util.List;
 
 @ApiSupport(order = 149001)
 @Api(tags = "店铺认证")
@@ -38,26 +40,41 @@ public class GoblinStoreMgtCertificationController {
     @Autowired
     GoblinRedisUtils goblinRedisUtils;
 
+    public static final List<String> ENABLE_CERT_STATUS = Arrays.asList("0", "2");
+
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "店铺认证第一步:认证资料")
     @PostMapping("fstep")
-    public ResponseDto<Object> certificationFirstStep(@Valid @RequestBody GoblinStoreMgtCertificationParam certificationParam) {
+    public ResponseDto<String> certificationFirstStep(@Valid @RequestBody GoblinStoreMgtCertificationParam certificationParam) {
+        GoblinStoreInfoVo storeInfoVo = goblinRedisUtils.getStoreInfoVoByUid(CurrentUtil.getCurrentUid());
+        if (null != storeInfoVo && !ENABLE_CERT_STATUS.contains(storeInfoVo.getStatus())) {
+            log.warn("店铺认证:无效请求:店铺已认证，无需再次认证[UID={},storeId={},storeStatus={}]", CurrentUtil.getCurrentUid(), storeInfoVo.getStoreId(), storeInfoVo.getStatus());
+            return ResponseDto.failure(ErrorMapping.get("149001"));
+        }
         if (log.isDebugEnabled()) {
             log.debug("店铺认证[GoblinStoreMgtCertificationParam:{}]", JsonUtils.toJson(certificationParam));
         }
-        goblinStoreMgtCertificationService.certificationInformationProcessing(certificationParam);
-        return ResponseDto.success();
+        storeInfoVo = goblinStoreMgtCertificationService.certificationInformationProcessing(certificationParam, storeInfoVo);
+        return ResponseDto.success(storeInfoVo.getStoreId());
     }
 
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "店铺认证第二步:完善信息")
     @PostMapping("sstep")
     public ResponseDto<Object> certificationSecondStep(@Valid @RequestBody GoblinStoreMgtCompleteParam completeParam) {
+        GoblinStoreInfoVo storeInfoVo = goblinRedisUtils.getStoreInfoVoByUid(CurrentUtil.getCurrentUid());
+        if (null == storeInfoVo) {
+            log.warn("店铺认证:完善信息:店铺信息不存在，请按流程完成第一步:[UID={}]", CurrentUtil.getCurrentUid());
+            return ResponseDto.failure(ErrorMapping.get("149001"));
+        }
+        if (!ENABLE_CERT_STATUS.contains(storeInfoVo.getStatus())) {
+            log.warn("店铺认证:无效请求:店铺已认证，无需再次认证[UID={},storeId={},storeStatus={}]", CurrentUtil.getCurrentUid(), storeInfoVo.getStoreId(), storeInfoVo.getStatus());
+            return ResponseDto.failure(ErrorMapping.get("149001"));
+        }
         if (log.isDebugEnabled()) {
             log.debug("店铺认证[GoblinStoreMgtCompleteParam:{}]", JsonUtils.toJson(completeParam));
         }
-        goblinStoreMgtCertificationService.certificationCompleteProcessing(completeParam);
-        return ResponseDto.success();
+        return ResponseDto.success(goblinStoreMgtCertificationService.certificationCompleteProcessing(completeParam, storeInfoVo));
     }
 
     @ApiOperationSupport(order = 3)
@@ -76,19 +93,18 @@ public class GoblinStoreMgtCertificationController {
     }
 
     @ApiOperationSupport(order = 3)
-    @ApiOperation(value = "店铺认证编辑中:删除店铺")
+    @ApiOperation(value = "删除店铺")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID"),
+    })
     @PostMapping("cancel")
-    public ResponseDto<Object> certificationCancel(String storeId) {
-        if (!goblinRedisUtils.hasStoreId(CurrentUtil.getCurrentUid(), storeId)) {
+    public ResponseDto<Object> certificationCancel(@NotBlank(message = "店铺ID不能为空") @RequestParam String storeId) {
+        String currentUid = CurrentUtil.getCurrentUid();
+//        if (!goblinRedisUtils.hasStoreId(currentUid, storeId)) {
+        if (!goblinRedisUtils.hasStoreId(currentUid, storeId) || storeId.equals("1")) {// TODO: 2022/1/7 zhanggb del
             return ResponseDto.failure(ErrorMapping.get("149002"));
         }
-        GoblinStoreInfoVo storeInfoVo = goblinRedisUtils.getStoreInfoVo(storeId);
-        if (null != storeInfoVo) {
-            if (goblinMongoUtils.delStoreInfoVo(storeId)) {
-                goblinRedisUtils.delStoreId(CurrentUtil.getCurrentUid(), storeId);
-                goblinRedisUtils.delStoreInfoVo(storeId);
-            }
-        }
-        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/controller/manage/GoblinStoreMgtGoodsController.java

@@ -16,8 +16,11 @@ import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsInfoVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSpecValueVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSpecVo;
 import com.liquidnet.service.goblin.service.manage.IGoblinstoreMgtGoodsService;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
+import com.liquidnet.service.goblin.util.ObjectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -31,10 +34,12 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 @ApiSupport(order = 149003)
 @Api(tags = "商品管理")
@@ -187,37 +192,78 @@ public class GoblinStoreMgtGoodsController {
         }
         storeMgtGoodsEditSkuParam.setStock(mgtGoodsSkuInfoVo.getStock());
         storeMgtGoodsEditSkuParam.setSkuStock(mgtGoodsSkuInfoVo.getSkuStock());
-        String skuId = storeMgtGoodsEditSkuParam.getSkuId();
+        String paramSkuId = storeMgtGoodsEditSkuParam.getSkuId();
         Integer operStock = storeMgtGoodsEditSkuParam.getOperStock();
         if (null != operStock && operStock != 0) {// 处理库存
             int operStockVal = Math.abs(operStock);
             Integer stock = mgtGoodsSkuInfoVo.getSkuStock();// 总库存
             Integer skuStock = mgtGoodsSkuInfoVo.getSkuStock();// SKU总库存
 
-            int rtSkuStock = goblinRedisUtils.getSkuStock(null, skuId);// 当前剩余库存
+            int rtSkuStock = goblinRedisUtils.getSkuStock(null, paramSkuId);// 当前剩余库存
             if (operStock < 0 && rtSkuStock >= operStockVal) {// SKU实时库存充足时允许扣减
-                if (goblinRedisUtils.decrSkuStock(null, skuId, operStockVal) < 0) {// 过程中库存不足时，回滚库存，编辑无效
-                    goblinRedisUtils.incrSkuStock(null, skuId, operStockVal);
+                if (goblinRedisUtils.decrSkuStock(null, paramSkuId, operStockVal) < 0) {// 过程中库存不足时，回滚库存，编辑无效
+                    goblinRedisUtils.incrSkuStock(null, paramSkuId, operStockVal);
                     return ResponseDto.failure(ErrorMapping.get("149012"));
                 } else {
                     storeMgtGoodsEditSkuParam.setSkuStock(skuStock - operStockVal);
                     storeMgtGoodsEditSkuParam.setStock(stock - operStockVal);
                 }
             } else if (operStock > 0) {// 增加
-                goblinRedisUtils.incrSkuStock(null, skuId, operStockVal);
+                goblinRedisUtils.incrSkuStock(null, paramSkuId, operStockVal);
                 storeMgtGoodsEditSkuParam.setSkuStock(skuStock + operStockVal);
                 storeMgtGoodsEditSkuParam.setStock(stock + operStockVal);
             }
         }
-        if (goblinstoreMgtGoodsService.goodsEditSku(storeMgtGoodsEditSkuParam)) {
+        List<String> skuIdList = goodsInfoVo.getSkuIdList();
+        Map<String, String> paramSkuSpecMap = storeMgtGoodsEditSkuParam.getSkuSpecList().stream()
+                .collect(Collectors.toMap(GoblinGoodsSpecDto::getSpecName, GoblinGoodsSpecDto::getSpecVname, (k1, k2) -> k2));
+        for (String skuId : skuIdList) {// 比对所有SKU规格信息
+            GoblinGoodsSkuInfoVo existMgtGoodsSkuInfoVo = goblinRedisUtils.getMgtGoodsSkuInfoVo(skuId);
+            Map<String, String> editBefSkuSpecMap = existMgtGoodsSkuInfoVo.getSkuSpecList().stream()
+                    .collect(Collectors.toMap(GoblinGoodsSpecDto::getSpecName, GoblinGoodsSpecDto::getSpecVname, (k1, k2) -> k2));
+            boolean existingFlg = false;
+            Set<Map.Entry<String, String>> paramSkuSpecSet = paramSkuSpecMap.entrySet();
+            for (Map.Entry<String, String> entry : paramSkuSpecSet) {
+                existingFlg = editBefSkuSpecMap.get(entry.getKey()).equals(entry.getValue());
+            }
+            if (skuId.equals(paramSkuId)) {
+                if (!existingFlg) {// 更改了规格，则同步修改SPU里的规格信息
+                    List<GoblinGoodsSpecVo> specVoList = goodsInfoVo.getSpecVoList();
+                    for (Map.Entry<String, String> entry : editBefSkuSpecMap.entrySet()) {
+                        for (GoblinGoodsSpecVo specVo : specVoList) {
+                            if (specVo.getSpecName().equals(entry.getKey())) {
+                                List<GoblinGoodsSpecValueVo> specValues = specVo.getSpecValues();
+                                int idx = IntStream.range(0, specValues.size())
+                                        .filter(i -> specValues.get(i).getSpecVname().equals(entry.getValue()))
+                                        .findFirst().orElse(-1);
+                                if (idx == -1) {
+                                    log.warn("商品管理:商品编辑:SKU编辑:规格信息不一致[specVoList={},editBefSkuSpecMap={}]", JsonUtils.toJson(specVoList), editBefSkuSpecMap);
+                                    return ResponseDto.failure(ErrorMapping.get("149013"));
+                                } else {
+                                    specValues.get(idx).setSpecVname(paramSkuSpecMap.get(specVo.getSpecName()));
+                                }
+                            }
+                        }
+                    }
+                } else {// 未更改规格，则标记为NULL（用于判断MONGO是否更新SPU规格信息）
+                    storeMgtGoodsEditSkuParam.setSkuSpecList(null);
+                }
+                continue;
+            }
+            if (existingFlg) {
+                log.warn("商品管理:商品编辑:SKU编辑:重复的规格信息[editBefSkuSpecMap={},paramSkuSpecMap={}]", editBefSkuSpecMap, paramSkuSpecMap);
+                return ResponseDto.failure(ErrorMapping.get("149014"));
+            }
+        }
+        if (goblinstoreMgtGoodsService.goodsEditSku(storeMgtGoodsEditSkuParam, goodsInfoVo)) {
             return ResponseDto.success(goblinRedisUtils.getMgtGoodsSkuInfoVo(storeMgtGoodsEditSkuParam.getSkuId()));
         } else {
             if (null != operStock && operStock != 0) {// 处理库存:回滚
                 int operStockVal = Math.abs(operStock);
                 if (operStock > 0) {// 增加的减回去
-                    goblinRedisUtils.decrSkuStock(null, skuId, operStockVal);
+                    goblinRedisUtils.decrSkuStock(null, paramSkuId, operStockVal);
                 } else {// 扣减的加回去
-                    goblinRedisUtils.incrSkuStock(null, skuId, operStockVal);
+                    goblinRedisUtils.incrSkuStock(null, paramSkuId, operStockVal);
                 }
             }
             return ResponseDto.failure(ErrorMapping.get("149013"));
@@ -236,12 +282,13 @@ public class GoblinStoreMgtGoodsController {
             return ResponseDto.failure(ErrorMapping.get("149010"));
         }
         List<String> skuIdList = goodsInfoVo.getSkuIdList();
-        Map<String, String> paramSkuSpecMap = storeMgtGoodsEditSkuParam.getSkuSpecList()
-                .stream().collect(Collectors.toMap(GoblinGoodsSpecDto::getSpecName, GoblinGoodsSpecDto::getSpecVname, (k1, k2) -> k2));
+        List<GoblinGoodsSpecDto> skuSpecList = storeMgtGoodsEditSkuParam.getSkuSpecList();
+        Map<String, String> paramSkuSpecMap = skuSpecList.stream()
+                .collect(Collectors.toMap(GoblinGoodsSpecDto::getSpecName, GoblinGoodsSpecDto::getSpecVname, (k1, k2) -> k2));
         for (String skuId : skuIdList) {// 比对所有SKU规格信息
             GoblinGoodsSkuInfoVo mgtGoodsSkuInfoVo = goblinRedisUtils.getMgtGoodsSkuInfoVo(skuId);
-            Map<String, String> skuSpecMap = mgtGoodsSkuInfoVo.getSkuSpecList()
-                    .stream().collect(Collectors.toMap(GoblinGoodsSpecDto::getSpecName, GoblinGoodsSpecDto::getSpecVname, (k1, k2) -> k2));
+            Map<String, String> skuSpecMap = mgtGoodsSkuInfoVo.getSkuSpecList().stream()
+                    .collect(Collectors.toMap(GoblinGoodsSpecDto::getSpecName, GoblinGoodsSpecDto::getSpecVname, (k1, k2) -> k2));
             boolean existingFlg = false;
             Set<Map.Entry<String, String>> paramSkuSpecSet = paramSkuSpecMap.entrySet();
             for (Map.Entry<String, String> entry : paramSkuSpecSet) {
@@ -252,6 +299,23 @@ public class GoblinStoreMgtGoodsController {
                 return ResponseDto.failure(ErrorMapping.get("149014"));
             }
         }
+        List<GoblinGoodsSpecVo> specVoList = goodsInfoVo.getSpecVoList();
+        if (CollectionUtils.isEmpty(specVoList)) {
+            if (null == specVoList) specVoList = ObjectUtil.getGoblinGoodsSpecVoArrayList();
+            int size = skuSpecList.size();
+            for (int i = 0; i < size; i++) {
+                GoblinGoodsSpecDto specDto = skuSpecList.get(i);
+                ArrayList<GoblinGoodsSpecValueVo> specValueVoList = ObjectUtil.getGoblinGoodsSpecValueVoArrayList();
+                specValueVoList.add(GoblinGoodsSpecValueVo.getNew().setSpecVname(specDto.getSpecVname()).setSpecVsort(i));
+                specVoList.add(GoblinGoodsSpecVo.getNew().setSpecName(specDto.getSpecName()).setSpecSort(i).setSpecValues(specValueVoList));
+            }
+        } else {
+            for (GoblinGoodsSpecVo specVo : specVoList) {// 同步添加SPU规格信息
+                List<GoblinGoodsSpecValueVo> specValues = specVo.getSpecValues();
+                specValues.add(GoblinGoodsSpecValueVo.getNew().setSpecVname(paramSkuSpecMap.get(specVo.getSpecName())).setSpecVsort(specValues.size()));
+            }
+        }
+
         if (log.isDebugEnabled()) {
             log.debug("商品管理:商品编辑:SKU添加:[GoblinStoreMgtGoodsEditSkuParam={}]", JsonUtils.toJson(storeMgtGoodsEditSkuParam));
         }
@@ -275,7 +339,7 @@ public class GoblinStoreMgtGoodsController {
         if (null == mgtGoodsSkuInfoVo || !mgtGoodsSkuInfoVo.getStoreId().equals(storeId)) {
             return ResponseDto.failure(ErrorMapping.get("149011"));
         }
-        return ResponseDto.success(goblinstoreMgtGoodsService.goodsEditSkuDel(mgtGoodsSkuInfoVo.getSpuId(), skuId));
+        return ResponseDto.success(goblinstoreMgtGoodsService.goodsEditSkuDel(mgtGoodsSkuInfoVo));
     }
 
     @ApiOperationSupport(order = 10)

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

 package com.liquidnet.service.goblin.service.impl.manage;
 
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtCertificationParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtCompleteParam;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreCertificationVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreInfoVo;
 import com.liquidnet.service.goblin.service.manage.IGoblinStoreMgtCertificationService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
+import com.liquidnet.service.goblin.util.QueueUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.LinkedList;
+import java.util.List;
 
 @Slf4j
 @Service
 public class GoblinStoreMgtCertificationServiceImpl implements IGoblinStoreMgtCertificationService {
+    @Autowired
+    QueueUtils queueUtils;
     @Autowired
     private GoblinRedisUtils goblinRedisUtils;
     @Autowired
     private GoblinMongoUtils goblinMongoUtils;
 
     @Override
-    public void certificationInformationProcessing(GoblinStoreMgtCertificationParam param) {
+    public GoblinStoreInfoVo certificationInformationProcessing(GoblinStoreMgtCertificationParam param, GoblinStoreInfoVo storeInfoVo) {
         String uid = CurrentUtil.getCurrentUid();
         LocalDateTime now = LocalDateTime.now();
 
-        GoblinStoreInfoVo storeInfoVo = goblinRedisUtils.getStoreInfoVoByUid(uid);
-        if (null == storeInfoVo) {
+//        if (null == storeInfoVo) {
+        if (null == storeInfoVo || storeInfoVo.getStoreId().equals("1")) {// TODO: 2022/1/6 zhanggb del
             storeInfoVo = GoblinStoreInfoVo.getNew();
             storeInfoVo.setStoreId(IDGenerator.get32UUID());
             storeInfoVo.setUid(uid);
             storeInfoVo.setStatus("0");
+            storeInfoVo.setStoreType("0");
+            storeInfoVo.setCertType(param.getCertType());
+            storeInfoVo.setDelFlg("0");
             storeInfoVo.setCreatedAt(now);
             storeInfoVo.setCreatedBy(uid);
             storeInfoVo.setUpdatedBy(uid);
             storeInfoVo.setUpdatedAt(now);
-            storeInfoVo.setCertificationVo(param.initStoreCertificationVo());
+
+            GoblinStoreCertificationVo storeCertificationVo = param.initStoreCertificationVo();
+            storeInfoVo.setCertificationVo(storeCertificationVo);
 
             goblinMongoUtils.setStoreInfoVo(storeInfoVo);
-            goblinRedisUtils.setStoreInfoVo(storeInfoVo);
+            goblinRedisUtils.addStoreId(uid, storeInfoVo.getStoreId());
+            // TODO: 2022/1/6 zhanggb redis
+//            goblinRedisUtils.setStoreInfoVo(storeInfoVo);
+
+            LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+            LinkedList<Object[]> initStoreInfoObjs = CollectionUtil.linkedListObjectArr();
+            toMqSqls.add(SqlMapping.get("goblin_store_info.insert_by_cert"));
+            initStoreInfoObjs.add(new Object[]{
+                    storeInfoVo.getStoreId(), storeInfoVo.getUid(), storeInfoVo.getStatus(), storeInfoVo.getStoreType(),
+                    storeInfoVo.getCertType(), storeInfoVo.getCreatedBy(), storeInfoVo.getCreatedAt()
+            });
+            toMqSqls.add(SqlMapping.get("goblin_store_certification.insert_by_cert"));
+            LinkedList<Object[]> initStoreCertificationObjs = CollectionUtil.linkedListObjectArr();
+            initStoreCertificationObjs.add(new Object[]{
+                    storeInfoVo.getStoreId(), storeCertificationVo.getPersonCertType(), storeCertificationVo.getPersonName(),
+                    storeCertificationVo.getPersonCertCode(), storeCertificationVo.getPersonCertValidity(), storeCertificationVo.getPersonCertLasting(),
+                    storeCertificationVo.getPersonCertFpic(), storeCertificationVo.getPersonCertBpic(), storeCertificationVo.getPersonCertSpic(),
+                    storeCertificationVo.getProvinceId(), storeCertificationVo.getProvinceName(), storeCertificationVo.getCityId(),
+                    storeCertificationVo.getCityName(), storeCertificationVo.getCountyId(), storeCertificationVo.getCountyName(),
+                    storeCertificationVo.getBusAddress(), storeCertificationVo.getBusName(), storeCertificationVo.getBusCertCode(),
+                    storeCertificationVo.getBusCertValidity(), storeCertificationVo.getBusCertLasting(), storeCertificationVo.getBusCertPic(),
+                    storeCertificationVo.getBusQualityPic(), storeInfoVo.getCreatedBy(), storeInfoVo.getCreatedAt()
+            });
+            queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_STORE.getKey(),
+                    SqlMapping.gets(toMqSqls, initStoreInfoObjs, initStoreCertificationObjs));
+            return storeInfoVo;
         } else {
             storeInfoVo.setStatus("0");
+            storeInfoVo.setStoreType("0");
             storeInfoVo.setUpdatedBy(uid);
             storeInfoVo.setUpdatedAt(now);
-            storeInfoVo.setCertificationVo(param.initStoreCertificationVo());
+
+            GoblinStoreCertificationVo storeCertificationVo = param.initStoreCertificationVo();
+            storeInfoVo.setCertificationVo(storeCertificationVo);
 
             if (goblinMongoUtils.updateStoreInfoVo(storeInfoVo)) {
-                goblinRedisUtils.setStoreInfoVo(storeInfoVo);
+                // TODO: 2022/1/6 zhanggb redis
+//                goblinRedisUtils.setStoreInfoVo(storeInfoVo);
+
+                LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+                LinkedList<Object[]> updateStoreInfoObjs = CollectionUtil.linkedListObjectArr();
+                toMqSqls.add(SqlMapping.get("goblin_store_info.update_by_cert1"));
+                updateStoreInfoObjs.add(new Object[]{
+                        storeInfoVo.getStoreType(), storeInfoVo.getCertType(),
+                        storeInfoVo.getUpdatedBy(), storeInfoVo.getUpdatedAt(), storeInfoVo.getStoreId(),
+                });
+                toMqSqls.add(SqlMapping.get("goblin_store_certification.update_by_cert"));
+                LinkedList<Object[]> updateStoreCertificationObjs = CollectionUtil.linkedListObjectArr();
+                updateStoreCertificationObjs.add(new Object[]{
+                        storeCertificationVo.getPersonCertType(), storeCertificationVo.getPersonName(),
+                        storeCertificationVo.getPersonCertCode(), storeCertificationVo.getPersonCertValidity(), storeCertificationVo.getPersonCertLasting(),
+                        storeCertificationVo.getPersonCertFpic(), storeCertificationVo.getPersonCertBpic(), storeCertificationVo.getPersonCertSpic(),
+                        storeCertificationVo.getProvinceId(), storeCertificationVo.getProvinceName(), storeCertificationVo.getCityId(),
+                        storeCertificationVo.getCityName(), storeCertificationVo.getCountyId(), storeCertificationVo.getCountyName(),
+                        storeCertificationVo.getBusAddress(), storeCertificationVo.getBusName(), storeCertificationVo.getBusCertCode(),
+                        storeCertificationVo.getBusCertValidity(), storeCertificationVo.getBusCertLasting(), storeCertificationVo.getBusCertPic(),
+                        storeCertificationVo.getBusQualityPic(), storeInfoVo.getUpdatedBy(), storeInfoVo.getUpdatedAt(), storeInfoVo.getStoreId()
+                });
+                queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_STORE.getKey(),
+                        SqlMapping.gets(toMqSqls, updateStoreInfoObjs, updateStoreCertificationObjs));
+                return storeInfoVo;
             }
         }
+        return storeInfoVo;
     }
 
     @Override
-    public void certificationCompleteProcessing(GoblinStoreMgtCompleteParam param) {
-        String uid = CurrentUtil.getCurrentUid();
-        GoblinStoreInfoVo storeInfoVo = goblinRedisUtils.getStoreInfoVoByUid(uid);
-        if (null == storeInfoVo) {
-            log.warn("店铺认证:完善信息:店铺信息不存在，请按流程完成第一步:[UID={}]", uid);
-            return;
+    public boolean certificationCompleteProcessing(GoblinStoreMgtCompleteParam param, GoblinStoreInfoVo storeInfoVo) {
+        storeInfoVo.setUpdatedAt(LocalDateTime.now());
+        storeInfoVo.setUpdatedBy(CurrentUtil.getCurrentUid());
+        if (goblinMongoUtils.updateStoreInfoVo(param.completeStoreInfoVo(storeInfoVo))) {
+            // TODO: 2022/1/6 zhanggb redis
+
+//            LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+//            LinkedList<Object[]> updateStoreInfoObjs = CollectionUtil.linkedListObjectArr();
+//            toMqSqls.add(SqlMapping.get("goblin_store_info.update_by_cert2"));
+//            updateStoreInfoObjs.add(new Object[]{
+//                    storeInfoVo.getStoreName(), storeInfoVo.getLogoPic(), storeInfoVo.getBackgroundPic(), storeInfoVo.getIntroduce(),
+//                    storeInfoVo.getStoreType(), storeInfoVo.getUpdatedBy(), storeInfoVo.getUpdatedAt(), storeInfoVo.getStoreId()
+//            });
+            queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_STORE.getKey(),
+                    SqlMapping.get("goblin_store_info.update_by_cert2",
+                            storeInfoVo.getStoreName(), storeInfoVo.getLogoPic(), storeInfoVo.getBackgroundPic(), storeInfoVo.getIntroduce(),
+                            storeInfoVo.getStoreType(), storeInfoVo.getUpdatedBy(), storeInfoVo.getUpdatedAt(), storeInfoVo.getStoreId())
+            );
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean certificationCancelProcessing(String storeId, String uid) {
+        LocalDateTime now = LocalDateTime.now();
+        if (goblinMongoUtils.delStoreInfoVo(storeId, uid, now)) {
+            goblinRedisUtils.delStoreId(CurrentUtil.getCurrentUid(), storeId);
+            goblinRedisUtils.delStoreInfoVo(storeId);
+
+            List<String> delSpuIdList = goblinMongoUtils.delGoodsInfoVoByStoreId(storeId, uid, now);
+            delSpuIdList.forEach(spuId -> goblinRedisUtils.delGoodsInfoVo(spuId));
+            List<String> delSkuIdList = goblinMongoUtils.delGoodsSkuInfoVoByStoreId(storeId, uid, now);
+            delSkuIdList.forEach(skuId -> goblinRedisUtils.delGoodsSkuInfoVo(skuId));
+
+            LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+            toMqSqls.add(SqlMapping.get("goblin_store_info.update_by_del"));
+            LinkedList<Object[]> updateStoreObjs = CollectionUtil.linkedListObjectArr();
+            updateStoreObjs.add(new Object[]{uid, now, storeId});
+            toMqSqls.add(SqlMapping.get("goblin_store_certification.update_by_del"));
+
+            toMqSqls.add(SqlMapping.get("goblin_goods.update_by_del"));
+            LinkedList<Object[]> updateGoodsObjs = CollectionUtil.linkedListObjectArr();
+            updateGoodsObjs.add(new Object[]{uid, now, uid, now, storeId});
+            toMqSqls.add(SqlMapping.get("goblin_goods_sku.update_by_del"));
+
+            queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_STORE.getKey(), SqlMapping.gets(toMqSqls, updateStoreObjs, updateStoreObjs, updateGoodsObjs, updateGoodsObjs));
         }
-        goblinRedisUtils.setStoreInfoVo(param.completeStoreInfoVo(storeInfoVo));
+        return false;
     }
 }

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.goblin.service.impl.manage;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.PagedResult;
+import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsActionParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsAddParam;
 import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsEditSkuParam;
@@ -23,6 +24,8 @@ import org.springframework.util.CollectionUtils;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsService {
@@ -133,9 +136,12 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
     }
 
     @Override
-    public boolean goodsEditSku(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam) {
+    public boolean goodsEditSku(GoblinStoreMgtGoodsEditSkuParam storeMgtGoodsEditSkuParam, GoblinGoodsInfoVo goodsInfoVo) {
         GoblinGoodsSkuInfoVo editGoodsSkuInfoVo = storeMgtGoodsEditSkuParam.initEditGoodsSkuInfoVo();
         if (goblinMongoUtils.updateGoodsSkuInfoVo(editGoodsSkuInfoVo)) {
+            if (!CollectionUtils.isEmpty(storeMgtGoodsEditSkuParam.getSkuSpecList())) {// 更改了规格，需要同步SPU里的规格信息
+                goblinMongoUtils.updateGoodsInfoVo(goodsInfoVo);
+            }
             // TODO: 2022/1/5 zhanggb redis+sql
 
             return true;
@@ -152,6 +158,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         GoblinGoodsSkuInfoVo addGoodsSkuInfoVo = storeMgtGoodsEditSkuParam.initEditAddGoodsSkuInfoVo();
         addGoodsSkuInfoVo.setSkuId(spuId.concat(StringUtils.right(String.valueOf(System.nanoTime()), 5)));
         addGoodsSkuInfoVo.setSpuId(spuId);
+        addGoodsSkuInfoVo.setSkuNo(goodsInfoVo.getSpuNo());
         addGoodsSkuInfoVo.setName(goodsInfoVo.getName());
         addGoodsSkuInfoVo.setSubtitle(goodsInfoVo.getSubtitle());
         addGoodsSkuInfoVo.setVirtualFlg(goodsInfoVo.getVirtualFlg());
@@ -173,15 +180,45 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
     }
 
     @Override
-    public boolean goodsEditSkuDel(String spuId, String skuId) {
-        goblinRedisUtils.delGoodsSkuInfoVo(skuId);
-        goblinMongoUtils.delGoodsSkuInfoVo(skuId);
+    public boolean goodsEditSkuDel(GoblinGoodsSkuInfoVo goodsSkuInfoVo) {
+        String skuId = goodsSkuInfoVo.getSkuId();
 
-        GoblinGoodsInfoVo mgtGoodsInfoVo = goblinRedisUtils.getMgtGoodsInfoVo(spuId);
+        GoblinGoodsInfoVo mgtGoodsInfoVo = goblinRedisUtils.getMgtGoodsInfoVo(goodsSkuInfoVo.getSpuId());
         List<String> skuIdList = mgtGoodsInfoVo.getSkuIdList();
         skuIdList.removeIf(r -> r.equals(skuId));
         mgtGoodsInfoVo.setSkuIdList(skuIdList);
 
+        List<GoblinGoodsSpecVo> specVoList = mgtGoodsInfoVo.getSpecVoList();
+        Map<String, String> delGoodsSkuSpecMap = goodsSkuInfoVo.getSkuSpecList().stream()
+                .collect(Collectors.toMap(GoblinGoodsSpecDto::getSpecName, GoblinGoodsSpecDto::getSpecVname, (k1, k2) -> k2));
+        for (int i = 0; i < specVoList.size(); i++) {// 处理商品规格信息
+            GoblinGoodsSpecVo specVo = specVoList.get(i);
+            List<GoblinGoodsSpecValueVo> modifySpecValues = ObjectUtil.getGoblinGoodsSpecValueVoArrayList();
+
+            String delSpecVname = delGoodsSkuSpecMap.get(specVo.getSpecName());
+            List<GoblinGoodsSpecValueVo> specValues = specVo.getSpecValues();
+            Integer rmIdx = null;
+            for (GoblinGoodsSpecValueVo specValue : specValues) {
+                if (specValue.getSpecVname().equals(delSpecVname)) {
+                    modifySpecValues.remove(specValue);
+                    rmIdx = specValue.getSpecVsort();
+                } else {
+                    modifySpecValues.add(specValue);
+                }
+                if (null != rmIdx && specValue.getSpecVsort() > rmIdx) {
+                    specValue.setSpecVsort(specValue.getSpecVsort() - 1);
+                }
+            }
+            if (modifySpecValues.size() == 0) {// 规格下规格值为0的时候，移除规格
+                specVoList.remove(specVo);
+            } else {
+                specVo.setSpecValues(modifySpecValues);
+            }
+        }
+
+        goblinMongoUtils.delGoodsSkuInfoVo(skuId);
+        goblinRedisUtils.delGoodsSkuInfoVo(skuId);
+
         // TODO: 2022/1/5 zhanggb redis+sql
 
         return goblinMongoUtils.updateGoodsInfoVo(mgtGoodsInfoVo);

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

@@ -18,14 +18,15 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 @Component
 public class GoblinMongoUtils {
@@ -76,9 +77,10 @@ public class GoblinMongoUtils {
         return mongoTemplate.insert(vo, GoblinStoreInfoVo.class.getSimpleName());
     }
 
-    public boolean delStoreInfoVo(String storeId) {
-        return mongoTemplate.remove(Query.query(Criteria.where("storeId").is(storeId)),
-                GoblinStoreInfoVo.class, GoblinStoreInfoVo.class.getSimpleName()).getDeletedCount() > 0;
+    public boolean delStoreInfoVo(String storeId, String uid, LocalDateTime time) {
+        return mongoTemplate.updateFirst(Query.query(Criteria.where("storeId").is(storeId)),
+                Update.update("delFlg", 1).set("updatedBy", uid).set("updatedAt", time).set("deletedBy", uid).set("deletedAt", time),
+                GoblinStoreInfoVo.class.getSimpleName()).getModifiedCount() > 0;
     }
 
     public boolean updateStoreInfoVo(GoblinStoreInfoVo vo) {
@@ -111,6 +113,24 @@ public class GoblinMongoUtils {
                 GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName()).getDeletedCount() > 0;
     }
 
+    public List<String> delGoodsInfoVoByStoreId(String storeId, String uid, LocalDateTime time) {
+        Query query = Query.query(Criteria.where("storeId").is(storeId).and("shelves_status").is("3"));
+        query.fields().include("spuId");
+        List<GoblinGoodsInfoVo> storeSpus = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
+
+        List<String> storeSpuIdList = CollectionUtil.arrayListString();
+        if (!CollectionUtils.isEmpty(storeSpus)) {
+            storeSpuIdList = storeSpus.stream().map(GoblinGoodsInfoVo::getSpuId).collect(Collectors.toList());
+            UpdateResult updateResult = mongoTemplate.updateMulti(Query.query(Criteria.where("spuId").in(storeSpuIdList)),
+                    Update.update("delFlg", 1).set("updatedBy", uid).set("updatedAt", time).set("deletedBy", uid).set("deletedAt", time),
+                    GoblinGoodsInfoVo.class.getSimpleName());
+            if (updateResult.getModifiedCount() > 0) {
+                return storeSpuIdList;
+            }
+        }
+        return storeSpuIdList;
+    }
+
     // SPU分页
     public PagedResult<GoblinStoreMgtGoodsListVo> getGoodsInfoVo(GoblinStoreMgtGoodsFilterParam filterParam) {
         Criteria criteria = new Criteria();
@@ -196,6 +216,24 @@ public class GoblinMongoUtils {
                 GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName()).getDeletedCount() > 0;
     }
 
+    public List<String> delGoodsSkuInfoVoByStoreId(String storeId, String uid, LocalDateTime time) {
+        Query query = Query.query(Criteria.where("storeId").is(storeId).and("shelves_status").is("3"));
+        query.fields().include("skuId");
+        List<GoblinGoodsSkuInfoVo> storeSkus = mongoTemplate.find(query, GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
+
+        List<String> storeSkuIdList = CollectionUtil.arrayListString();
+        if (!CollectionUtils.isEmpty(storeSkus)) {
+            storeSkuIdList = storeSkus.stream().map(GoblinGoodsSkuInfoVo::getSkuId).collect(Collectors.toList());
+            UpdateResult updateResult = mongoTemplate.updateMulti(Query.query(Criteria.where("skuId").in(storeSkuIdList)),
+                    Update.update("delFlg", 1).set("updatedBy", uid).set("updatedAt", time).set("deletedBy", uid).set("deletedAt", time),
+                    GoblinGoodsSkuInfoVo.class.getSimpleName());
+            if (updateResult.getModifiedCount() > 0) {
+                return storeSkuIdList;
+            }
+        }
+        return storeSkuIdList;
+    }
+
     // SKU信息
     public GoblinGoodsSkuInfoVo getGoodsSkuInfoVo(String skuId) {
         return mongoTemplate.findOne(Query.query(Criteria.where("skuId").is(skuId).and("shelvesStatus").is("3")),
@@ -218,11 +256,10 @@ public class GoblinMongoUtils {
     }
 
     public boolean updateGoodsSkuInfoVoBySpuId(GoblinGoodsSkuInfoVo vo) {
-        return mongoTemplate.getCollection(GoblinGoodsSkuInfoVo.class.getSimpleName())
-                .updateOne(
-                        Query.query(Criteria.where("spuId").is(vo.getSpuId())).getQueryObject(),
-                        ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(vo))
-                ).getModifiedCount() > 0;
+        return mongoTemplate.getCollection(GoblinGoodsSkuInfoVo.class.getSimpleName()).updateMany(
+                Query.query(Criteria.where("spuId").is(vo.getSpuId())).getQueryObject(),
+                ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(vo))
+        ).getModifiedCount() > 0;
     }
 
     /* ----------------------------------------  ---------------------------------------- */

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

@@ -69,6 +69,16 @@ public class GoblinRedisUtils {
         return redisUtil.set(GoblinRedisConst.BASIC_USTORE.concat(uid), storeIds);
     }
 
+    public boolean addStoreId(String uid, String storeId) {
+        List<String> storeIds = this.getStoreIds(uid);
+//        if (CollectionUtils.isEmpty(storeIds)) {
+        if (CollectionUtils.isEmpty(storeIds) || storeIds.contains("1")) {// TODO: 2022/1/6 zhanggb del
+            storeIds = CollectionUtil.arrayListString();
+        }
+        storeIds.add(storeId);
+        return this.setStoreIds(uid, storeIds);
+    }
+
     public void delStoreIds(String uid) {
         redisUtil.del(GoblinRedisConst.BASIC_USTORE.concat(uid));
     }
@@ -83,7 +93,9 @@ public class GoblinRedisUtils {
 
     public List<String> getStoreIds(String uid) {
 //        return (List<String>) redisUtil.get(GoblinRedisConst.BASIC_USTORE.concat(uid));
-        return Arrays.asList("1");// TODO: 2022/1/5 zhanggb
+//        return Arrays.asList("1");// TODO: 2022/1/5 zhanggb
+        List<String> list = (List<String>) redisUtil.get(GoblinRedisConst.BASIC_USTORE.concat(uid));
+        return CollectionUtils.isEmpty(list) ? Arrays.asList("1") : list;
     }
 
     public boolean hasStoreId(String uid, String storeId) {

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

@@ -24,6 +24,7 @@ public class ObjectUtil {
     private static final ArrayList<GoblinStoreMgtThumbVo> goblinStoreMgtThumbVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinGoodsSkuInfoVo> goblinGoodsSkuInfoVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinGoodsSpecVo> goblinGoodsSpecVoArrayList = new ArrayList<>();
+    private static final ArrayList<GoblinGoodsSpecValueVo> goblinGoodsSpecValueVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinServiceSupportVo> goblinServiceSupportVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinSelfTagVo> goblinSelfTagVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinGoodsTagVo> goblinGoodsTagVoArrayList = new ArrayList<>();
@@ -112,6 +113,10 @@ public class ObjectUtil {
         return (ArrayList<GoblinGoodsSpecVo>) goblinGoodsSpecVoArrayList.clone();
     }
 
+    public static ArrayList<GoblinGoodsSpecValueVo> getGoblinGoodsSpecValueVoArrayList() {
+        return (ArrayList<GoblinGoodsSpecValueVo>) goblinGoodsSpecValueVoArrayList.clone();
+    }
+
     public static ArrayList<GoblinServiceSupportVo> getGoblinServiceSupportVoArrayList() {
         return (ArrayList<GoblinServiceSupportVo>) goblinServiceSupportVoArrayList.clone();
     }

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

+#----                   店铺信息
+goblin_store_info.insert_by_cert=INSERT INTO goblin_store_info (store_id,uid,status,store_type,cert_type,created_by,created_at)VALUES(?,?,?,?,?,?,?) 
+goblin_store_info.update_by_cert1=UPDATE goblin_store_info SET store_type=?,cert_type=?,updated_by=?,updated_at=? WHERE store_id=? 
+goblin_store_info.update_by_cert2=UPDATE goblin_store_info SET store_name=?,logo_pic=?,background_pic=?,introduce=?,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_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=? 
+goblin_store_certification.update_by_del=UPDATE goblin_store_certification SET del_flg=1,updated_by=?,updated_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 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 store_id=? 
 #----                   商铺活动
 goblin.store.market.insert=INSERT INTO goblin_store_marketing (`store_market_id`,`name`,`type`,`status`,`store_id`,`start_time`,`end_time`,`del_flag`,`is_pre`,`pre_time`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?)
 goblin.store.market.status=UPDATE goblin_store_marketing SET status=? , del_flag=? WHERE store_market_id =? and store_id =?