修改 活动名称不能重复 修改配置文件指定 config goblin/order

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -338,5 +338,7 @@ public class GoblinRedisConst {
 
     public static final String GOBLIN_MIX_LIMIT = PREFIX.concat("mix:limit:");//$key:$mixId:$uid 混合售开始列表
     /* ----------------------------------------------------------------- */
+    public static final String GOBLIN_ORDER_LOG = PREFIX.concat("order:log:");//无用
+
     /* ----------------------------------------------------------------- */
 }

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

@@ -151,6 +151,12 @@ public class GoblinMixServiceImpl implements IGoblinMixService {
         List<GoblinMixDetailsItemVo> itemList = ObjectUtil.goblinMixDetailsItemVo();
         List<GoblinMixDetailsItemParam> itemParams = param.getItem();
 
+        //判断活动名称
+        int count = (int) mongoUtils.getMixNameCount(param.getName());
+        if(count>0){
+            return ResponseDto.failure("活动名称重复");
+        }
+
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         sqls.add(SqlMapping.get("goblin_mix_insert"));
         sqls.add(SqlMapping.get("goblin_mix_details_insert"));

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

@@ -1746,6 +1746,11 @@ public class GoblinMongoUtils {
         return mongoTemplate.insert(vo, GoblinMixDetailsVo.class.getSimpleName());
     }
 
+    // 添加 混合售 数据
+    public long getMixNameCount(String name) {
+        return mongoTemplate.count(Query.query(Criteria.where("name").is(name)), GoblinMixDetailsVo.class, GoblinMixDetailsVo.class.getSimpleName());
+    }
+
     //修改 混合售 数据
     public Boolean changeGoblinMixDetailsVo(GoblinMixDetailsVo vo) {
         return mongoTemplate.getCollection(GoblinMixDetailsVo.class.getSimpleName())

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

@@ -9,10 +9,10 @@ eureka:
 spring:
   cloud:
     config:
-#      uri: http://127.0.0.1:7002/support-config
+      uri: http://182.92.70.253:7002/support-config
 #      uri: http://39.107.71.112:7002/support-config
-      profile: ${liquidnet.cloudConfig.profile}
-      name: ${spring.application.name} #默认为spring.application.name
-      discovery:
-        enabled: true
-        service-id: liquidnet-support-config
+#      profile: ${liquidnet.cloudConfig.profile}
+#      name: ${spring.application.name} #默认为spring.application.name
+#      discovery:
+#        enabled: true
+#        service-id: liquidnet-support-config
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/MixOrderServiceImpl.java

@@ -646,7 +646,9 @@ public class MixOrderServiceImpl implements IMixOrderService {
                 logVo.setOperationName(orderVo.getUserName());
                 logVo.setOperationType(GoblinStatusConst.Type.OPERATION_TYPE_1.getValue());
                 logVo.setCreatedAt(LocalDateTime.now());
-                mongoUtils.insertGoblinOrderLogVo(logVo);
+                redisUtils.setLogVo(orderVo.getOrderId()+orderVo.getOrderCode(),logVo);
+                queueUtils.setMongoList(GoblinOrderLogVo.class.getSimpleName(), "orderId", orderVo.getOrderId()+orderVo.getOrderCode(), GoblinRedisConst.REDIS_GOBLIN_ORDER, 1);
+//                mongoUtils.insertGoblinOrderLogVo(logVo);
 
                 //mysql
                 sqlDataSku.add(new Object[]{

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinRedisUtils.java

@@ -72,6 +72,11 @@ public class GoblinRedisUtils {
         return vo;
     }
 
+    public void setLogVo(String orderId, GoblinOrderLogVo vo) {
+        String rk = GoblinRedisConst.GOBLIN_ORDER_LOG.concat(orderId);
+        redisUtil.set(rk, vo);
+    }
+
     /* ---------------------------------------- 商品数据源 ---------------------------------------- */
 
     /**

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/bootstrap-service-order.yml

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