~API:商品管理:商品编辑服务支持、标签编辑未更改问题更正;

liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberOrderMapper.xml

@@ -50,11 +50,11 @@
                 and amo.source = #{source}
             </if>
             <if test="paymentAtStart != null  and paymentAtStart != ''">
-#                 and amo.payment_at &gt; #{paymentAtStart}
+                <!-- and amo.payment_at &gt; #{paymentAtStart} -->
                 and amo.payment_at <![CDATA[>=]]> #{paymentAtStart}
             </if>
             <if test="paymentAtEnd != null  and paymentAtEnd != ''">
-#                 and amo.payment_at &lt; #{paymentAtEnd}
+                <!-- and amo.payment_at &lt; #{paymentAtEnd} -->
                 and amo.payment_at <![CDATA[<=]]> #{paymentAtEnd}
             </if>
         </where>

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

@@ -194,7 +194,10 @@ public class GoblinStoreMgtGoodsController {
         }
 
         // 服务保障处理
-        goodsInfoVo.setServiceSupportVoList(goblinMongoUtils.getServiceSupportVos(storeMgtGoodsAddParam.getSsidList()));
+        List<String> ssidList = storeMgtGoodsAddParam.getSsidList();
+        if (!CollectionUtils.isEmpty(ssidList)) {
+            goodsInfoVo.setServiceSupportVoList(goblinMongoUtils.getServiceSupportVos(ssidList));
+        }
 
         goblinstoreMgtGoodsService.goodsAdd(goodsInfoVo, goodsSkuInfoVoList);
 

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

@@ -19,6 +19,7 @@ import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import com.liquidnet.service.goblin.util.ObjectUtil;
 import com.liquidnet.service.goblin.util.QueueUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,6 +30,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsService {
     @Autowired
@@ -223,7 +225,22 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
 
     @Override
     public boolean goodsEditSpu(String uid, GoblinStoreMgtGoodsAddParam storeMgtGoodsAddParam) {
+        String spuId = storeMgtGoodsAddParam.getSpuId();
+        GoblinGoodsInfoVo mgtGoodsInfoVo = goblinRedisUtils.getMgtGoodsInfoVo(spuId);
+        if (null == mgtGoodsInfoVo) {
+            log.warn("商品管理:商品编辑:SPU编辑:[uid={},storeId={},spuId={}]", uid, storeMgtGoodsAddParam.getStoreId(), spuId);
+            return false;
+        }
         GoblinGoodsInfoVo updateSpuInfoVo = storeMgtGoodsAddParam.initEditGoodsInfoVo();
+
+        boolean updateTagFlg = false, updateExtagFlg = false;
+        List<GoblinGoodsTagVo> befTagVoList = mgtGoodsInfoVo.getTagVoList();
+        boolean befTagIsEmptyFlg = CollectionUtils.isEmpty(befTagVoList);
+        List<GoblinGoodsExtagVo> befExtagVoList = mgtGoodsInfoVo.getExtagVoList();
+        boolean befExtagIsEmptyFlg = CollectionUtils.isEmpty(befExtagVoList);
+        boolean paramTagIsEmptyFlg, paramExtagIsEmptyFlg;
+        List<GoblinGoodsTagVo> paramTagVoList = ObjectUtil.getGoblinGoodsTagVoArrayList();
+        List<GoblinGoodsExtagVo> paramExtagVoList = ObjectUtil.getGoblinGoodsExtagVoArrayList();
         {// 标签处理
             List<String> goodsTagIdList = storeMgtGoodsAddParam.getTagList(), goodsExtagIdList = storeMgtGoodsAddParam.getExtagList();
             List<String> tagIdList = CollectionUtil.arrayListString();
@@ -232,20 +249,91 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
             List<GoblinSelfTagVo> selfTagVoList;
             if (!CollectionUtils.isEmpty(tagIdList) && !CollectionUtils.isEmpty(selfTagVoList = goblinMongoUtils.getMgtSelfTagVos(tagIdList))) {
                 if (!CollectionUtils.isEmpty(goodsTagIdList)) {
-                    List<GoblinGoodsTagVo> goodsTagVoList = ObjectUtil.getGoblinGoodsTagVoArrayList();
                     for (int i = 0; i < goodsTagIdList.size(); i++)
                         for (GoblinSelfTagVo r : selfTagVoList)
-                            if (r.getTagId().equals(goodsTagIdList.get(i))) goodsTagVoList.add(GoblinGoodsTagVo.getNew().copy(r).setSort(i));
-                    updateSpuInfoVo.setTagVoList(goodsTagVoList);
+                            if (r.getTagBelong().equals("0") && r.getTagId().equals(goodsTagIdList.get(i)))
+                                paramTagVoList.add(GoblinGoodsTagVo.getNew().copy(r).setSort(i));
                 }
                 if (!CollectionUtils.isEmpty(goodsExtagIdList)) {
-                    List<GoblinGoodsExtagVo> goodsExtagVoList = ObjectUtil.getGoblinGoodsExtagVoArrayList();
                     for (int i = 0; i < goodsExtagIdList.size(); i++)
                         for (GoblinSelfTagVo r : selfTagVoList)
-                            if (r.getTagId().equals(goodsExtagIdList.get(i))) goodsExtagVoList.add(GoblinGoodsExtagVo.getNew().copy(r).setSort(i));
-                    updateSpuInfoVo.setExtagVoList(goodsExtagVoList);
+                            if (r.getTagBelong().equals("1") && r.getTagId().equals(goodsExtagIdList.get(i)))
+                                paramExtagVoList.add(GoblinGoodsExtagVo.getNew().copy(r).setSort(i));
+                }
+            }
+
+            paramTagIsEmptyFlg = CollectionUtils.isEmpty(paramTagVoList);
+            paramExtagIsEmptyFlg = CollectionUtils.isEmpty(paramExtagVoList);
+            if (!befTagIsEmptyFlg || !paramTagIsEmptyFlg) {
+                if (!befTagIsEmptyFlg && !paramTagIsEmptyFlg) {
+                    if (paramTagVoList.size() != befTagVoList.size()) {
+                        updateTagFlg = true;
+                    } else {
+                        List<String> befTagIdList = befTagVoList.stream().map(GoblinGoodsTagVo::getTagId).collect(Collectors.toList());
+                        for (GoblinGoodsTagVo vo : paramTagVoList) {
+                            if (!befTagIdList.contains(vo.getTagId())) {
+                                updateTagFlg = true;
+                                break;
+                            }
+                        }
+                    }
+                } else {
+                    updateTagFlg = true;
+                }
+            }
+            if (updateTagFlg) {
+                updateSpuInfoVo.setTagVoList(paramTagIsEmptyFlg ? ObjectUtil.getGoblinGoodsTagVoArrayList() : paramTagVoList);
+            }
+
+            if (!befExtagIsEmptyFlg || !paramExtagIsEmptyFlg) {
+                if (!befExtagIsEmptyFlg && !paramExtagIsEmptyFlg) {
+                    if (paramExtagVoList.size() != befExtagVoList.size()) {
+                        updateExtagFlg = true;
+                    } else {
+                        List<String> befExtagIdList = befExtagVoList.stream().map(GoblinGoodsExtagVo::getTagId).collect(Collectors.toList());
+                        for (GoblinGoodsExtagVo vo : paramExtagVoList) {
+                            if (!befExtagIdList.contains(vo.getTagId())) {
+                                updateExtagFlg = true;
+                                break;
+                            }
+                        }
+                    }
+                } else {
+                    updateExtagFlg = true;
                 }
             }
+            if (updateExtagFlg) {
+                updateSpuInfoVo.setExtagVoList(paramExtagIsEmptyFlg ? ObjectUtil.getGoblinGoodsExtagVoArrayList() : paramExtagVoList);
+            }
+        }
+
+
+        boolean updateSsidFlg = false;
+        List<String> ssidList = storeMgtGoodsAddParam.getSsidList();
+        boolean paramSsidListIsEmptyFlg = CollectionUtils.isEmpty(ssidList);
+        List<GoblinServiceSupportVo> serviceSupportVoList = mgtGoodsInfoVo.getServiceSupportVoList();
+        boolean befServiceSupportVoListIsEmptyFlg = CollectionUtils.isEmpty(serviceSupportVoList);
+        {// 服务支持处理
+            if (!befServiceSupportVoListIsEmptyFlg || !paramSsidListIsEmptyFlg) {
+                if (!befServiceSupportVoListIsEmptyFlg && !paramSsidListIsEmptyFlg) {
+                    if (serviceSupportVoList.size() != ssidList.size()) {
+                        updateSsidFlg = true;
+                    } else {
+                        List<String> befSsidList = serviceSupportVoList.stream().map(GoblinServiceSupportVo::getSsid).collect(Collectors.toList());
+                        for (String ssid : ssidList) {
+                            if (!befSsidList.contains(ssid)) {
+                                updateSsidFlg = true;
+                                break;
+                            }
+                        }
+                    }
+                } else {
+                    updateSsidFlg = true;
+                }
+            }
+            if (updateSsidFlg) {
+                updateSpuInfoVo.setServiceSupportVoList(paramSsidListIsEmptyFlg ? ObjectUtil.getGoblinServiceSupportVoArrayList() : goblinMongoUtils.getServiceSupportVos(ssidList));
+            }
         }
         updateSpuInfoVo.setUpdatedBy(uid);
         updateSpuInfoVo.setUpdatedAt(LocalDateTime.now());
@@ -280,8 +368,43 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
                     updateSkuInfoVo.getUpdatedBy(), updateSkuInfoVo.getUpdatedAt(), updateSkuInfoVo.getSpuId()
             });
 
+            toMqSqls.add(SqlMapping.get("goblin_goods_tag.delete"));
+            LinkedList<Object[]> deleteGoodsTagObjs = CollectionUtil.linkedListObjectArr();
+            toMqSqls.add(SqlMapping.get("goblin_goods_tag.insert"));
+            LinkedList<Object[]> initGoodsTagObjs = CollectionUtil.linkedListObjectArr();
+            if (updateTagFlg) {
+                if (!befTagIsEmptyFlg) {
+                    deleteGoodsTagObjs.add(new Object[]{spuId, '0'});
+                }
+                if (!paramTagIsEmptyFlg) {
+                    updateSpuInfoVo.getTagVoList().forEach(vo -> initGoodsTagObjs.add(new Object[]{spuId, vo.getTagId(), vo.getSort(), "0"}));
+                }
+            }
+            if (updateExtagFlg) {
+                if (!befExtagIsEmptyFlg) {
+                    deleteGoodsTagObjs.add(new Object[]{spuId, '1'});
+                }
+                if (!paramExtagIsEmptyFlg) {
+                    updateSpuInfoVo.getExtagVoList().forEach(vo -> initGoodsTagObjs.add(new Object[]{spuId, vo.getTagId(), vo.getSort(), "1"}));
+                }
+            }
+
+            toMqSqls.add(SqlMapping.get("goblin_goods_service_support.delete"));
+            LinkedList<Object[]> deleteServiceSupportObjs = CollectionUtil.linkedListObjectArr();
+            toMqSqls.add(SqlMapping.get("goblin_goods_service_support.insert"));
+            LinkedList<Object[]> initServiceSupportObjs = CollectionUtil.linkedListObjectArr();
+            if (updateSsidFlg) {
+                if (!befServiceSupportVoListIsEmptyFlg) {
+                    deleteServiceSupportObjs.add(new Object[]{spuId});
+                }
+                if (!paramSsidListIsEmptyFlg) {
+                    updateSpuInfoVo.getServiceSupportVoList().forEach(vo -> initServiceSupportObjs.add(new Object[]{spuId, vo.getSsid()}));
+                }
+            }
+
             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_GOODS.getKey(),
-                    SqlMapping.gets(toMqSqls, updateGoodsInfoObjs, updateGoodsSkuObjs));
+                    SqlMapping.gets(toMqSqls, updateGoodsInfoObjs, updateGoodsSkuObjs,
+                            deleteGoodsTagObjs, initGoodsTagObjs, deleteServiceSupportObjs, initServiceSupportObjs));
             return true;
         }
         return false;
@@ -341,11 +464,10 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
 
             BigDecimal priceGe = BigDecimal.ZERO, priceLe = BigDecimal.ZERO;
             for (String skuIdStr : goodsInfoVo.getSkuIdList()) {
-                GoblinGoodsSkuInfoVo skuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(skuIdStr);
+                GoblinGoodsSkuInfoVo skuInfoVo = goblinRedisUtils.getMgtGoodsSkuInfoVo(skuIdStr);
 
                 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;
-
             }
             LinkedList<Object[]> updateGoodsObjs = CollectionUtil.linkedListObjectArr();
             if (priceGe.compareTo(goodsInfoVo.getPriceGe()) != 0 || priceLe.compareTo(goodsInfoVo.getPriceLe()) != 0) {
@@ -524,7 +646,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
 
             BigDecimal priceGe = BigDecimal.ZERO, priceLe = BigDecimal.ZERO;
             for (String skuId : mgtGoodsInfoVo.getSkuIdList()) {
-                GoblinGoodsSkuInfoVo skuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(skuId);
+                GoblinGoodsSkuInfoVo skuInfoVo = goblinRedisUtils.getMgtGoodsSkuInfoVo(skuId);
 
                 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;

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

@@ -13,7 +13,7 @@ goblin_store_certification.update_by_del=UPDATE goblin_store_certification SET d
 goblin_store_config.update=UPDATE goblin_store_config SET config_val=?,updated_by=?,updated_at=? WHERE store_id=? AND config_key=? 
 #----                   店铺公告信息
 goblin_store_notice.insert=INSERT INTO goblin_store_notice (notice_id,store_id,content,release_time,long_lasting,cancell_time,status,created_by,created_at)VALUES(?,?,?,?,?,?,?,?,?) 
-goblin_store_notice.update=UPDATE goblin_store_notice set content=?,release_time=?,long_lasting=?,cancell_time=?,status=?,updated_by=?,updated_at=? WHERE notice_id=? 
+goblin_store_notice.update=UPDATE goblin_store_notice SET content=?,release_time=?,long_lasting=?,cancell_time=?,status=?,updated_by=?,updated_at=? WHERE notice_id=? 
 
 goblin_store_notice.release=UPDATE goblin_store_notice SET release_time=?,status='1',updated_by=?,updated_at=? WHERE store_id=? AND notice_id=? 
 goblin_store_notice.remove=UPDATE goblin_store_notice SET del_flg='1',updated_by=?,updated_at=? WHERE store_id=? AND notice_id=? 
@@ -53,8 +53,10 @@ goblin_goods_sku.update_by_del_store=UPDATE goblin_goods_sku SET del_flg='1',upd
 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(?,?,?,?) 
+goblin_goods_tag.insert=INSERT INTO goblin_goods_tag (spu_id,tag_id,sort,tag_belong)VALUES(?,?,?,?) 
+goblin_goods_tag.delete=UPDATE goblin_goods_tag SET del_flg='1' WHERE spu_id=? AND tag_belong=? AND del_flg='0' 
 goblin_goods_service_support.insert=INSERT INTO goblin_goods_service_support (spu_id,ssid)VALUES(?,?) 
+goblin_goods_service_support.delete=UPDATE goblin_goods_service_support SET del_flg='1' WHERE spu_id=? AND del_flg='0' 
 #----                   商铺活动
 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 =?