Merge branch 'pre' into 'master'

Pre

See merge request !180

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java

@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{
 
     public static void main(String[] args) {
         String[] keys = {
-                "goblin:real_stock_sku:ZZ:226311525252003387ZZ87427",
+                "kylin:member:uid:809406",
         };
         for (String key : keys) {
             long value = key.hashCode();

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

-use test_ln_scene;
+use dev_ln_scene;
 // ================================================== 创建集合
 db.createCollection("GoblinSelfGoodsCategoryVo");
 db.createCollection("GoblinStoreGoodsCategoryVo");
@@ -20,7 +20,6 @@ db.createCollection("GoblinFrontNavigation");
 db.createCollection("GoblinFrontSeckill");
 db.createCollection("GoblinFrontSelectGoods");
 db.createCollection("GoblinShoppingCartVoo");
-
 db.createCollection("GoblinBackOrderVo");
 db.createCollection("GoblinMailVo");
 db.createCollection("GoblinMarketingZhengzaiRelationVo");
@@ -29,34 +28,35 @@ db.createCollection("GoblinOrderSkuVo");
 db.createCollection("GoblinSelfMarketingVo");
 db.createCollection("GoblinStoreOrderVo");
 // ================================================== 创建分片
-sh.enableSharding("test_ln_scene");
-sh.shardCollection("test_ln_scene.GoblinSelfGoodsCategoryVo",{"cateId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinStoreGoodsCategoryVo",{"cateId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinMgtCategorySpecVo",{"cateId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinSelfTagVo",{"tagId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinServiceSupportVo",{"ssid":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinStoreNoticeVo",{"noticeId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinStoreConfigVo",{"storeId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinStoreInfoVo",{"storeId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinGoodsInfoVo",{"spuId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinGoodsSkuInfoVo",{"skuId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinStoreCouponBasicVo",{"storeCouponId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinUserCouponVo",{"ucouponId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinFrontBanner",{"bannerId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinFrontCube",{"cubeId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinFrontHotWord",{"hotWordId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinFrontMoudleIndex",{"moudleIndexId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinFrontNavigation",{"navigationId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinFrontSeckill",{"seckilId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinFrontSelectGoods",{"selectGoodsId":"hashed"});
-sh.shardCollection("test_ln_scene.GoblinShoppingCartVoo",{"goblinShoppingCartId":"hashed"});
+sh.enableSharding("dev_ln_scene");
+sh.shardCollection("dev_ln_scene.GoblinSelfGoodsCategoryVo",{"cateId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinStoreGoodsCategoryVo",{"cateId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinMgtCategorySpecVo",{"cateId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinSelfTagVo",{"tagId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinServiceSupportVo",{"ssid":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinStoreNoticeVo",{"noticeId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinStoreConfigVo",{"storeId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinStoreInfoVo",{"storeId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinGoodsInfoVo",{"spuId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinGoodsSkuInfoVo",{"skuId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinStoreCouponBasicVo",{"storeCouponId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinUserCouponVo",{"ucouponId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinFrontBanner",{"bannerId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinFrontCube",{"cubeId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinFrontHotWord",{"hotWordId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinFrontMoudleIndex",{"moudleIndexId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinFrontNavigation",{"navigationId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinFrontSeckill",{"seckilId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinFrontSelectGoods",{"selectGoodsId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinShoppingCartVoo",{"goblinShoppingCartId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinBackOrderVo",{"backOrderId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinMailVo",{"mailId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinMarketingZhengzaiRelationVo",{"selfMarketId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinOrderLogVo",{"selfMarketId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinOrderSkuVo",{"selfMarketId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinStoreOrderVo",{"orderId":"hashed"});
+sh.shardCollection("dev_ln_scene.GoblinSelfMarketingVo",{"selfMarketId":"hashed"});
 
-sh.createCollection("test_ln_scene.GoblinBackOrderVo",{"backOrderId":"hashed"});
-sh.createCollection("test_ln_scene.GoblinMailVo",{"mailId":"hashed"});
-sh.createCollection("test_ln_scene.GoblinMarketingZhengzaiRelationVo",{"selfMarketId":"hashed"});
-sh.createCollection("test_ln_scene.GoblinOrderLogVo",{"selfMarketId":"hashed"});
-sh.createCollection("test_ln_scene.GoblinOrderSkuVo",{"selfMarketId":"hashed"});
-sh.createCollection("test_ln_scene.GoblinStoreOrderVo",{"orderId":"hashed"});
 // ================================================== 创建索引
 db.GoblinStoreGoodsCategoryVo.createIndex({storeId:"hashed"});
 db.GoblinMgtCategorySpecVo.createIndex({cateId:"hashed"});
@@ -80,7 +80,6 @@ db.GoblinFrontNavigation.createIndex({navigationId:"hashed"});
 db.GoblinFrontSeckill.createIndex({seckilId:"hashed"});
 db.GoblinFrontSelectGoods.createIndex({selectGoodsId:"hashed"});
 db.GoblinShoppingCartVoo.createIndex({goblinShoppingCartId:"hashed"});
-
 db.GoblinBackOrderVo.createIndex({backOrderId:"hashed"});
 db.GoblinBackOrderVo.createIndex({orderId:"hashed"});
 db.GoblinMailVo.createIndex({mailId:"hashed"});

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

@@ -837,8 +837,7 @@ public class GoblinMongoUtils {
                     Aggregation.match(criteria),
                     Aggregation.group("storeId")
                             .first("storeId").as("storeId")
-                            .first("skuPriceActual").as("skuPriceActual")
-                            .sum("skuPriceActualBig").as("skuPriceActualBig"));
+                            .sum("skuPriceActual").as("skuPriceActual"));
         }
         AggregationResults<GoblinOrderLogVo> outputType = mongoTemplate.aggregate(aggregation, GoblinOrderLogVo.class.getSimpleName(), GoblinOrderLogVo.class);
         List<GoblinOrderLogVo> dataList = new ArrayList(outputType.getMappedResults());

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml

@@ -18,9 +18,8 @@ liquidnet:
     username: admin
     password: admin
   config:
-#    location: /Users/hujiachen/JavaProject/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
-#    location: /app/support-config
-    location: /Users/edy/Project/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
+#    location: /Users/hujiachen/IdeaProjects/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
+    location: /app/support-config
 # end-dev-这里是配置信息基本值
 
 spring: