Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

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

@@ -106,6 +106,11 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
 
     public GoblinGoodsSkuInfoVo initEditAddGoodsSkuInfoVo() {
         GoblinGoodsSkuInfoVo vo = GoblinGoodsSkuInfoVo.getNew();
+        List<GoblinGoodsSpecDto> skuSpecList = this.getSkuSpecList();
+        vo.setName("");
+        for (GoblinGoodsSpecDto goblinGoodsSpecDto : skuSpecList) {
+            vo.setName(vo.getName().concat(goblinGoodsSpecDto.getSpecVname()));
+        }
         vo.setSkuPic(this.getSkuPic());
         vo.setSkuIsbn(this.getSkuIsbn());
         vo.setStock(this.getStock());
@@ -120,7 +125,7 @@ public class GoblinStoreMgtGoodsEditSkuParam implements Serializable {
         vo.setStoreId(this.getStoreId());
         vo.setSkuValidity(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getSkuValidity()));
         vo.setSkuAppear(this.getSkuAppear());
-        vo.setSkuSpecList(this.getSkuSpecList());
+        vo.setSkuSpecList(skuSpecList);
         return vo;
     }
 }

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml

@@ -91,10 +91,10 @@ spring:
 # -----------------------------------------------------------
 global-auth:
   exclude-url-pattern: # 模式I（与模式II互斥）
-#    - ${liquidnet.info.context}/doc.html
-#    - ${liquidnet.info.context}/webjars/**
-#    - ${liquidnet.info.context}/swagger-resources/**
-#    - ${liquidnet.info.context}/v2/api-docs*
+    - ${liquidnet.info.context}/doc.html
+    - ${liquidnet.info.context}/webjars/**
+    - ${liquidnet.info.context}/swagger-resources/**
+    - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/ath/check
     - ${liquidnet.info.context}/login/*
     - ${liquidnet.info.context}/ts

liquidnet-bus-config/liquidnet-config/liquidnet-service-candy.yml

@@ -90,10 +90,10 @@ spring:
 # -----------------------------------------------------------
 global-auth:
   exclude-url-pattern: # 模式I（与模式II互斥）
-#    - ${liquidnet.info.context}/doc.html
-#    - ${liquidnet.info.context}/webjars/**
-#    - ${liquidnet.info.context}/swagger-resources/**
-#    - ${liquidnet.info.context}/v2/api-docs*
+    - ${liquidnet.info.context}/doc.html
+    - ${liquidnet.info.context}/webjars/**
+    - ${liquidnet.info.context}/swagger-resources/**
+    - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/candy-coupon/useBack
     - ${liquidnet.info.context}/candy-coupon/useBackJxl
   oncheck-url-pattern:

liquidnet-bus-config/liquidnet-config/liquidnet-service-chime.yml

@@ -83,10 +83,10 @@ spring:
 # -----------------------------------------------------------
 global-auth:
   exclude-url-pattern: # 模式I（与模式II互斥）
-#    - ${liquidnet.info.context}/doc.html
-#    - ${liquidnet.info.context}/webjars/**
-#    - ${liquidnet.info.context}/swagger-resources/**
-#    - ${liquidnet.info.context}/v2/api-docs*
+    - ${liquidnet.info.context}/doc.html
+    - ${liquidnet.info.context}/webjars/**
+    - ${liquidnet.info.context}/swagger-resources/**
+    - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/user/register
     - ${liquidnet.info.context}/user/userLikeOperation
     - ${liquidnet.info.context}/user/userDislikeOperation

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -95,10 +95,10 @@ spring:
 # -----------------------------------------------------------
 global-auth:
   exclude-url-pattern:
-#    - ${liquidnet.info.context}/doc.html
-#    - ${liquidnet.info.context}/webjars/**
-#    - ${liquidnet.info.context}/swagger-resources/**
-#    - ${liquidnet.info.context}/v2/api-docs*
+    - ${liquidnet.info.context}/doc.html
+    - ${liquidnet.info.context}/webjars/**
+    - ${liquidnet.info.context}/swagger-resources/**
+    - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/station/login
     - ${liquidnet.info.context}/station/login/sms
     #    -

liquidnet-bus-config/liquidnet-config/liquidnet-service-order.yml

@@ -95,10 +95,10 @@ spring:
 # -----------------------------------------------------------
 global-auth:
   exclude-url-pattern:
-#    - ${liquidnet.info.context}/doc.html
-#    - ${liquidnet.info.context}/webjars/**
-#    - ${liquidnet.info.context}/swagger-resources/**
-#    - ${liquidnet.info.context}/v2/api-docs*
+    - ${liquidnet.info.context}/doc.html
+    - ${liquidnet.info.context}/webjars/**
+    - ${liquidnet.info.context}/swagger-resources/**
+    - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/order/syncOrder
     - ${liquidnet.info.context}/order/pay/syncOrder
     - ${liquidnet.info.context}/order/pay/refundSyncOrder

liquidnet-bus-config/liquidnet-config/liquidnet-service-slime.yml

@@ -95,10 +95,10 @@ spring:
 # -----------------------------------------------------------
 global-auth:
   exclude-url-pattern:
-#    - ${liquidnet.info.context}/doc.html
-#    - ${liquidnet.info.context}/webjars/**
-#    - ${liquidnet.info.context}/swagger-resources/**
-#    - ${liquidnet.info.context}/v2/api-docs*
+    - ${liquidnet.info.context}/doc.html
+    - ${liquidnet.info.context}/webjars/**
+    - ${liquidnet.info.context}/swagger-resources/**
+    - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/fields/app/details
 # -----------------------------------------------------------
 

liquidnet-bus-config/liquidnet-config/liquidnet-service-stone.yml

@@ -95,10 +95,10 @@ spring:
 # -----------------------------------------------------------
 global-auth:
   exclude-url-pattern:
-#    - ${liquidnet.info.context}/doc.html
-#    - ${liquidnet.info.context}/webjars/**
-#    - ${liquidnet.info.context}/swagger-resources/**
-#    - ${liquidnet.info.context}/v2/api-docs*
+    - ${liquidnet.info.context}/doc.html
+    - ${liquidnet.info.context}/webjars/**
+    - ${liquidnet.info.context}/swagger-resources/**
+    - ${liquidnet.info.context}/v2/api-docs*
     - ${liquidnet.info.context}/item/**
     - ${liquidnet.info.context}/user/inner/**
     - ${liquidnet.info.context}/user/logs/in2111

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

 package com.liquidnet.service.goblin.service.impl.manage;
 
 import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
@@ -662,7 +663,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         addSkuInfoVo.setSkuId(skuId);
         addSkuInfoVo.setSpuId(spuId);
         addSkuInfoVo.setSkuNo(goodsInfoVo.getSpuNo());
-        addSkuInfoVo.setName(goodsInfoVo.getName());
+//        addSkuInfoVo.setName(goodsInfoVo.getName());
         addSkuInfoVo.setSubtitle(goodsInfoVo.getSubtitle());
         addSkuInfoVo.setVirtualFlg(goodsInfoVo.getVirtualFlg());
         addSkuInfoVo.setStatus("3");
@@ -756,18 +757,18 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         for (List<GoblinGoodsSpecDto> goblinGoodsSpecDtos : remainSkuSpecDtoList) {
             for (GoblinGoodsSpecDto goblinGoodsSpecDto : goblinGoodsSpecDtos) {
                 String specName = goblinGoodsSpecDto.getSpecName(), specVname = goblinGoodsSpecDto.getSpecVname();
-                Set<String> specVnameSet = remainSkuSpecMap.get(specName);
-                if (CollectionUtils.isEmpty(specVnameSet)) {
-                    specVnameSet = CollectionUtil.getStringArraySet();
+                Set<String> remainSkuSpecVnameSet = remainSkuSpecMap.get(specName);
+                if (CollectionUtils.isEmpty(remainSkuSpecVnameSet)) {
+                    remainSkuSpecVnameSet = CollectionUtil.getStringArraySet();
                 }
-                specVnameSet.add(specVname);
-                remainSkuSpecMap.put(specName, specVnameSet);
+                remainSkuSpecVnameSet.add(specVname);
+                remainSkuSpecMap.put(specName, remainSkuSpecVnameSet);
             }
         }
 
-        List<GoblinGoodsSpecVo> specVoList = mgtGoodsInfoVo.getSpecVoList();
         Map<String, String> delGoodsSkuSpecMap = goodsSkuInfoVo.getSkuSpecList().stream()
                 .collect(Collectors.toMap(GoblinGoodsSpecDto::getSpecName, GoblinGoodsSpecDto::getSpecVname));
+        List<GoblinGoodsSpecVo> specVoList = mgtGoodsInfoVo.getSpecVoList();
         LinkedList<Object[]> updateGoodsSpuSpecObjs = CollectionUtil.linkedListObjectArr();
         for (int i = 0; i < specVoList.size(); i++) {// 处理商品规格信息
             GoblinGoodsSpecVo specVo = specVoList.get(i);// 商品指定规格
@@ -811,6 +812,9 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         List<String> delSkuIdList = goblinRedisUtils.getSkuRe(delSkuId);
         delSkuIdList = null == delSkuIdList ? CollectionUtil.arrayListString() : delSkuIdList;
         delSkuIdList.add(delSkuId);
+        if (log.isDebugEnabled()) {
+            log.debug("商品管理:商品编辑:SKU删除[delSkuId={},skuReId={}]", delSkuId, JsonUtils.toJson(delSkuIdList));
+        }
         if (goblinMongoUtils.delGoodsSkuInfoVo(goodsSkuInfoVo, delSkuIdList)) {
             delSkuIdList.forEach(skuId -> {
                 goblinRedisUtils.delGoodsSkuInfoVo(skuId);

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

@@ -328,7 +328,7 @@ public class GoblinMongoUtils {
 
     public boolean delGoodsInfoVoBySpuIds(String storeId, List<String> spuIdList, String uid, LocalDateTime time) {
         return mongoTemplate.updateMulti(
-                Query.query(Criteria.where("storeId").is(storeId).and("spuId").in(spuIdList.toArray()).and("delFlg").is("0")),
+                Query.query(Criteria.where("storeId").is(storeId).and("spuId").in(spuIdList).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;
@@ -525,7 +525,7 @@ public class GoblinMongoUtils {
     }
 
     public boolean delGoodsSkuInfoVo(GoblinGoodsSkuInfoVo vo, List<String> skuIdList) {
-        return mongoTemplate.getCollection(GoblinGoodsSkuInfoVo.class.getSimpleName()).updateOne(
+        return mongoTemplate.getCollection(GoblinGoodsSkuInfoVo.class.getSimpleName()).updateMany(
                 Query.query(Criteria.where("skuId").in(skuIdList).and("delFlg").is("0")).getQueryObject(),
                 Update.update("delFlg", "1").set("updatedBy", vo.getUpdatedBy()).set("updatedAt", vo.getUpdatedAt())
                         .set("deletedBy", vo.getDeletedBy()).set("deletedAt", vo.getDeletedAt()).getUpdateObject()