~API:商品管理:商品编辑+同步活动商品数据;

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

@@ -129,29 +129,4 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
             return new GoblinGoodsInfoVo();
         }
     }
-/*    public int compareTo(GoblinGoodsInfoVo arg0) {
-        return this.getCount().compareTo(arg0.getCount());
-    }*/
-
-    public static void main(String[] args) {
-        GoblinGoodsInfoVo goblinGoodsInfoVo=new GoblinGoodsInfoVo();
-        goblinGoodsInfoVo.setCount(1);
-        GoblinGoodsInfoVo goblinGoodsInfoVo1=new GoblinGoodsInfoVo();
-        goblinGoodsInfoVo1.setCount(12);
-        GoblinGoodsInfoVo goblinGoodsInfoVo2=new GoblinGoodsInfoVo();
-        goblinGoodsInfoVo2.setCount(12);
-        List<GoblinGoodsInfoVo> list=new ArrayList<>();
-
-        list.add(goblinGoodsInfoVo1);
-        list.add(goblinGoodsInfoVo);
-        list.add(goblinGoodsInfoVo2);
-        Collections.sort(list, new Comparator<GoblinGoodsInfoVo>() {
-
-        public int compare(GoblinGoodsInfoVo arg0, GoblinGoodsInfoVo arg1) {
-            return -(arg0.getCount().compareTo(arg1.getCount()));
-        }});
-        for(GoblinGoodsInfoVo goblinGoodsInfoVo3:list){
-            System.out.println(goblinGoodsInfoVo3.getCount());
-        }
-    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinStoreAdminController.java

@@ -125,7 +125,7 @@ public class GoblinStoreAdminController extends BaseController {
     @ResponseBody
     public AjaxResult audit(String storeId) {
         try {
-            return this.toAjax(goblinStoreInfoService.audit(storeId, String.valueOf(3), ShiroUtils.getLoginName(), null));
+            return this.toAjax(goblinStoreInfoService.audit(storeId, String.valueOf(5), ShiroUtils.getLoginName(), null));
         } catch (Exception e) {
             return toAjax(false);
         }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinStoreInfoServiceImpl.java

@@ -57,7 +57,7 @@ public class GoblinStoreInfoServiceImpl extends ServiceImpl<GoblinStoreInfoMappe
         lambdaUpdateWrapper.set(GoblinStoreInfo::getUpdatedAt, now);
 
         if (this.update(lambdaUpdateWrapper)) {
-            if (status.equals("3")) {// 审核通过即生成店铺配置
+            if (status.equals("5")) {// 审核通过即生成店铺配置
                 List<GoblinStoreConfigVo> storeConfigVos = goblinStoreConfigService.initStoreConfigs(storeId);
                 mongoTemplate.insert(storeConfigVos, GoblinStoreConfigVo.class.getSimpleName());
                 // TODO: 2022/1/13 zhanggb redis

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-adam/src/main/resources/bootstrap-service-consumer-adam.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/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java

@@ -60,14 +60,14 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
                     totalStock += mgtGoodsSkuInfoVo.getStock();
                     surplusStock += goblinRedisUtils.getSkuStock(null, skuId);
 
-                    if (!mgtGoodsSkuInfoVo.getStock().equals(mgtGoodsSkuInfoVo.getSkuStock())) {// 总库存<>当前SKU库存，则存在活动商品分库存
+//                    if (!mgtGoodsSkuInfoVo.getStock().equals(mgtGoodsSkuInfoVo.getSkuStock())) {// 总库存<>当前SKU库存，则存在活动商品分库存
                         List<String> skuReList = goblinRedisUtils.getSkuRe(skuId);
                         if (!CollectionUtils.isEmpty(skuReList)) {
                             for (String skuRe : skuReList) {
                                 surplusStock += goblinRedisUtils.getSkuStock(GoblinStatusConst.MarketPreStatus.getPre(skuRe), skuRe);
                             }
                         }
-                    }
+//                    }
                 }
                 vo.setTotalStock(totalStock);
                 vo.setSurplusStock(surplusStock);
@@ -350,10 +350,6 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         updateSpuInfoVo.setUpdatedBy(uid);
         updateSpuInfoVo.setUpdatedAt(LocalDateTime.now());
         if (goblinMongoUtils.updateGoodsInfoVo(updateSpuInfoVo)) {
-            // 参与活动的同一商品更新处理
-
-
-
             GoblinGoodsSkuInfoVo updateSkuInfoVo = GoblinGoodsSkuInfoVo.getNew();
             updateSkuInfoVo.setSpuId(updateSpuInfoVo.getSpuId());
             updateSkuInfoVo.setSkuNo(updateSpuInfoVo.getSpuNo());
@@ -364,12 +360,33 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
             updateSkuInfoVo.setUpdatedBy(updateSpuInfoVo.getUpdatedBy());
             updateSkuInfoVo.setUpdatedAt(updateSpuInfoVo.getUpdatedAt());
 
+            LinkedList<Object[]> updateGoodsInfoObjs = CollectionUtil.linkedListObjectArr();
+            LinkedList<Object[]> updateGoodsSkuObjs = CollectionUtil.linkedListObjectArr();
+            // 参与活动的同一商品更新处理
+            List<String> marketSpuIdList = goblinMongoUtils.updateGoodsInfoVoForMarket(spuId, mgtGoodsInfoVo.getSpuNo(), updateSpuInfoVo);
+            if (!CollectionUtils.isEmpty(marketSpuIdList)) {
+                marketSpuIdList.forEach(marketSpuId -> {
+                    goblinRedisUtils.delGoodsInfoVo(marketSpuId);
+                    updateGoodsInfoObjs.add(new Object[]{
+                            updateSpuInfoVo.getSpuNo(), updateSpuInfoVo.getName(), updateSpuInfoVo.getSubtitle(), updateSpuInfoVo.getSellPrice(),
+                            updateSpuInfoVo.getIntro(), updateSpuInfoVo.getDetails(), updateSpuInfoVo.getCoverPic(), updateSpuInfoVo.getVideo(),
+                            "2", updateSpuInfoVo.getCateFid(), updateSpuInfoVo.getCateSid(), updateSpuInfoVo.getCateTid(),
+                            updateSpuInfoVo.getShelvesHandle(), updateSpuInfoVo.getShelvesTime(), updateSpuInfoVo.getSpuValidity(), updateSpuInfoVo.getVirtualFlg(),
+                            updateSpuInfoVo.getLogisticsTemplate(), updateSpuInfoVo.getUpdatedBy(), updateSpuInfoVo.getUpdatedAt(), marketSpuId
+                    });
+                    updateGoodsSkuObjs.add(new Object[]{
+                            updateSkuInfoVo.getSkuNo(), updateSkuInfoVo.getVirtualFlg(), updateSkuInfoVo.getLogisticsTemplate(),
+                            updateSkuInfoVo.getUpdatedBy(), updateSkuInfoVo.getUpdatedAt(), marketSpuId
+                    });
+                });
+            }
+
             goblinMongoUtils.updateGoodsSkuInfoVoBySpuId(updateSkuInfoVo);
             goblinRedisUtils.delGoodsInfoVo(updateSpuInfoVo.getSpuId());
 
             LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
             toMqSqls.add(SqlMapping.get("goblin_goods.update_by_edit"));
-            LinkedList<Object[]> updateGoodsInfoObjs = CollectionUtil.linkedListObjectArr();
+//            LinkedList<Object[]> updateGoodsInfoObjs = CollectionUtil.linkedListObjectArr();
             updateGoodsInfoObjs.add(new Object[]{
                     updateSpuInfoVo.getSpuNo(), updateSpuInfoVo.getName(), updateSpuInfoVo.getSubtitle(), updateSpuInfoVo.getSellPrice(),
                     updateSpuInfoVo.getIntro(), updateSpuInfoVo.getDetails(), updateSpuInfoVo.getCoverPic(), updateSpuInfoVo.getVideo(),
@@ -378,7 +395,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
                     updateSpuInfoVo.getLogisticsTemplate(), updateSpuInfoVo.getUpdatedBy(), updateSpuInfoVo.getUpdatedAt(), updateSpuInfoVo.getSpuId()
             });
             toMqSqls.add(SqlMapping.get("goblin_goods_sku.update_by_edit_spu"));
-            LinkedList<Object[]> updateGoodsSkuObjs = CollectionUtil.linkedListObjectArr();
+//            LinkedList<Object[]> updateGoodsSkuObjs = CollectionUtil.linkedListObjectArr();
             updateGoodsSkuObjs.add(new Object[]{
                     updateSkuInfoVo.getSkuNo(), updateSkuInfoVo.getVirtualFlg(), updateSkuInfoVo.getLogisticsTemplate(),
                     updateSkuInfoVo.getUpdatedBy(), updateSkuInfoVo.getUpdatedAt(), updateSkuInfoVo.getSpuId()
@@ -435,6 +452,22 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         updateSkuInfoVo.setUpdatedBy(uid);
         updateSkuInfoVo.setUpdatedAt(now);
         if (goblinMongoUtils.updateGoodsSkuInfoVo(updateSkuInfoVo)) {
+            LinkedList<Object[]> updateGoodsSkuForMarketObjs = CollectionUtil.linkedListObjectArr();
+            // 参与活动的同一商品更新处理
+            List<String> marketSkuIdList = goblinRedisUtils.getSkuRe(updateSkuInfoVo.getSkuId());
+            if (!CollectionUtils.isEmpty(marketSkuIdList)) {
+                goblinMongoUtils.updateGoodsSkuInfoVoForMarket(marketSkuIdList, updateSkuInfoVo);
+                marketSkuIdList.forEach(marketSkuId -> {
+                    goblinRedisUtils.delGoodsSkuInfoVo(marketSkuId);
+                    updateGoodsSkuForMarketObjs.add(new Object[]{
+                            updateSkuInfoVo.getName(), updateSkuInfoVo.getSkuPic(), updateSkuInfoVo.getSellPrice(),
+                            updateSkuInfoVo.getWeight(), updateSkuInfoVo.getStock(), updateSkuInfoVo.getWarningStock(),
+                            updateSkuInfoVo.getSkuAppear(), updateSkuInfoVo.getSkuIsbn(), updateSkuInfoVo.getSkuValidity(),
+                            updateSkuInfoVo.getUpdatedBy(), updateSkuInfoVo.getUpdatedAt(), marketSkuId
+                    });
+                });
+            }
+
             String skuId = updateSkuInfoVo.getSkuId();
             String spuId = goodsInfoVo.getSpuId();
 
@@ -504,14 +537,16 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
             }
 
             LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+            toMqSqls.add(SqlMapping.get("goblin_goods_sku.update_by_edit_for_market"));
+//            LinkedList<Object[]> updateGoodsSkuForMarketObjs = CollectionUtil.linkedListObjectArr();
             toMqSqls.add(SqlMapping.get("goblin_goods_sku.update_by_edit"));
             LinkedList<Object[]> updateGoodsSkuObjs = CollectionUtil.linkedListObjectArr();
             updateGoodsSkuObjs.add(new Object[]{
-                    updateSkuInfoVo.getSkuPic(), updateSkuInfoVo.getSellPrice(), updateSkuInfoVo.getPrice(), updateSkuInfoVo.getPriceMember(),
-                    updateSkuInfoVo.getWeight(), updateSkuInfoVo.getStock(), updateSkuInfoVo.getSkuStock(), updateSkuInfoVo.getWarningStock(),
-                    updateSkuInfoVo.getSkuAppear(), updateSkuInfoVo.getSkuIsbn(), updateSkuInfoVo.getBuyFactor(), updateSkuInfoVo.getBuyRoster(),
-                    updateSkuInfoVo.getBuyLimit(), updateSkuInfoVo.getSkuValidity(), updateSkuInfoVo.getUpdatedBy(), updateSkuInfoVo.getUpdatedAt(),
-                    skuId
+                    updateSkuInfoVo.getName(), updateSkuInfoVo.getSkuPic(), updateSkuInfoVo.getSellPrice(), updateSkuInfoVo.getPrice(),
+                    updateSkuInfoVo.getPriceMember(), updateSkuInfoVo.getWeight(), updateSkuInfoVo.getStock(), updateSkuInfoVo.getSkuStock(),
+                    updateSkuInfoVo.getWarningStock(), updateSkuInfoVo.getSkuAppear(), updateSkuInfoVo.getSkuIsbn(), updateSkuInfoVo.getBuyFactor(),
+                    updateSkuInfoVo.getBuyRoster(), updateSkuInfoVo.getBuyLimit(), updateSkuInfoVo.getSkuValidity(), updateSkuInfoVo.getUpdatedBy(),
+                    updateSkuInfoVo.getUpdatedAt(), skuId
             });
             toMqSqls.add(SqlMapping.get("goblin_goods_sku_spec_value.update_by_edit"));
 //            LinkedList<Object[]> updateSkuSpecValueObjs = CollectionUtil.linkedListObjectArr();
@@ -525,7 +560,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
 //            LinkedList<Object[]> updateGoodsObjs = CollectionUtil.linkedListObjectArr();
 
             queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_GOODS.getKey(),
-                    SqlMapping.gets(toMqSqls, updateGoodsSkuObjs,
+                    SqlMapping.gets(toMqSqls, updateGoodsSkuForMarketObjs, updateGoodsSkuObjs,
                             updateSkuSpecValueObjs, initSpuSpecValueObjs, delSpuSpecValueObjs, updateSpuSpecValueObjs, updateGoodsObjs));
             return true;
         }

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

@@ -435,6 +435,45 @@ public class GoblinMongoUtils {
         ).getModifiedCount() > 0;
     }
 
+    // SPU活动商品信息更新
+    public List<String> updateGoodsInfoVoForMarket(String spuId, String spuNo, GoblinGoodsInfoVo vo) {
+        Query query = Query.query(Criteria.where("spuNo").is(spuNo).and("delFlg").is("0").and("spuId").ne(spuId));
+        query.fields().include("spuId");
+        List<GoblinGoodsInfoVo> marketGoodsInfoVos = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
+        if (!CollectionUtils.isEmpty(marketGoodsInfoVos)) {
+            List<String> marketSpuIds = marketGoodsInfoVos.stream().map(GoblinGoodsInfoVo::getSpuId).collect(Collectors.toList());
+            mongoTemplate.getCollection(GoblinGoodsInfoVo.class.getSimpleName()).updateMany(
+                    Query.query(Criteria.where("spuId").in(marketSpuIds).and("delFlg").is("0")).getQueryObject(),
+                    Update.update("spuNo", vo.getSpuNo())
+                            .set("name", vo.getName())
+                            .set("subtitle", vo.getSubtitle())
+                            .set("sellPrice", vo.getSellPrice())
+                            .set("intro", vo.getIntro())
+                            .set("details", vo.getDetails())
+                            .set("coverPic", vo.getCoverPic())
+                            .set("video", vo.getVideo())
+                            .set("specMode", "2")
+                            .set("cateFid", vo.getCateFid())
+                            .set("cateSid", vo.getCateSid())
+                            .set("cateTid", vo.getCateTid())
+                            .set("shelvesHandle", vo.getShelvesHandle())
+                            .set("shelvesTime", vo.getShelvesTime())
+                            .set("spuValidity", vo.getSpuValidity())
+                            .set("virtualFlg", vo.getVirtualFlg())
+                            .set("imageList", vo.getImageList())
+                            .set("logisticsTemplate", vo.getLogisticsTemplate())
+                            .set("tagVoList", vo.getTagVoList())
+                            .set("extagVoList", vo.getExtagVoList())
+                            .set("serviceSupportVoList", vo.getServiceSupportVoList())
+                            .set("updatedBy", vo.getUpdatedBy())
+                            .set("updatedAt", vo.getUpdatedAt())
+                            .getUpdateObject()
+            );
+            return marketSpuIds;
+        }
+        return null;
+    }
+
     // SPU信息
     public boolean updateGoodsInfoVoAppear(String storeId, String spuAppear, LocalDateTime time, String uid) {
         return mongoTemplate.getCollection(GoblinGoodsInfoVo.class.getSimpleName()).updateOne(
@@ -508,6 +547,32 @@ public class GoblinMongoUtils {
                 ).getModifiedCount() > 0;
     }
 
+    // SKU活动商品信息更新
+    public boolean updateGoodsSkuInfoVoForMarket(List<String> skuIds, GoblinGoodsSkuInfoVo vo) {
+        return mongoTemplate.getCollection(GoblinGoodsSkuInfoVo.class.getSimpleName()).updateMany(
+                Query.query(Criteria.where("skuId").in(skuIds).and("delFlg").is("0")).getQueryObject(),
+                Update.update("name", vo.getName())
+                        .set("skuPic", vo.getSkuPic())
+                        .set("skuSpecList", vo.getSkuSpecList())
+                        .set("sellPrice", vo.getSellPrice())
+//                        .set("price", vo.getPrice())
+//                        .set("priceMember", vo.getPriceMember())
+                        .set("weight", vo.getWeight())
+                        .set("stock", vo.getStock())
+//                        .set("skuStock", vo.getSkuStock())
+                        .set("warningStock", vo.getWarningStock())
+                        .set("skuAppear", vo.getSkuAppear())
+                        .set("skuIsbn", vo.getSkuIsbn())
+//                        .set("buyFactor", vo.getBuyFactor())
+//                        .set("buyRoster", vo.getBuyRoster())
+//                        .set("buyLimit", vo.getBuyLimit())
+                        .set("skuValidity", vo.getSkuValidity())
+                        .set("updatedBy", vo.getUpdatedBy())
+                        .set("updatedAt", vo.getUpdatedAt())
+                        .getUpdateObject()
+        ).getModifiedCount() > 0;
+    }
+
     public boolean updateGoodsSkuInfoVoBySpuId(GoblinGoodsSkuInfoVo vo) {
         return mongoTemplate.getCollection(GoblinGoodsSkuInfoVo.class.getSimpleName()).updateMany(
                 Query.query(Criteria.where("spuId").is(vo.getSpuId()).and("delFlg").is("0")).getQueryObject(),

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

@@ -46,7 +46,8 @@ goblin_goods.update_by_del_store=UPDATE goblin_goods SET del_flg='1',updated_by=
 goblin_goods.update_by_del=UPDATE goblin_goods SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE spu_id=? AND store_id=? 
 
 goblin_goods_sku.insert=INSERT INTO goblin_goods_sku (sku_id,spu_id,sku_no,name,subtitle, sell_price,sku_pic,sku_isbn,stock,sku_stock, warning_stock,price,price_member,weight,buy_factor, buy_roster,buy_limit,store_id,sku_validity,virtual_flg, status,shelves_status,sku_appear,shelves_at,created_by, created_at,logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
-goblin_goods_sku.update_by_edit=UPDATE goblin_goods_sku SET sku_pic=?,sell_price=?,price=?,price_member=?,weight=?,stock=?,sku_stock=?,warning_stock=?,sku_appear=?,sku_isbn=?,buy_factor=?,buy_roster=?,buy_limit=?,sku_validity=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0' 
+goblin_goods_sku.update_by_edit_for_market=UPDATE goblin_goods_sku SET name=?,sku_pic=?,sell_price=?,weight=?,stock=?,warning_stock=?,sku_appear=?,sku_isbn=?,sku_validity=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0' 
+goblin_goods_sku.update_by_edit=UPDATE goblin_goods_sku SET name=?,sku_pic=?,sell_price=?,price=?,price_member=?,weight=?,stock=?,sku_stock=?,warning_stock=?,sku_appear=?,sku_isbn=?,buy_factor=?,buy_roster=?,buy_limit=?,sku_validity=?,updated_by=?,updated_at=? WHERE sku_id=? AND del_flg='0' 
 goblin_goods_sku.update_by_edit_spu=UPDATE goblin_goods_sku SET sku_no=?,virtual_flg=?,logistics_template=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0' 
 goblin_goods_sku.update_by_shelves=UPDATE goblin_goods_sku SET shelves_status=?,shelves_at=?,updated_by=?,updated_at=? WHERE spu_id=? AND store_id=? AND sku_appear='0' 
 goblin_goods_sku.update_by_del_store=UPDATE goblin_goods_sku SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE store_id=?