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

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

@@ -56,7 +56,7 @@ public class GoblinStoreMgtCouponAddParam implements Serializable {
     @Min(value = 0, message = "卡券库存不能小于0")
     private Integer stock;
     @ApiModelProperty(position = 12, required = false, value = "触发金额[8,2]", example = "1")
-    @DecimalMin(value = "0.01", message = "触发金额不能小于0.01")
+    @DecimalMin(value = "0.00", message = "触发金额不能小于0")
     private BigDecimal triggers;
     @ApiModelProperty(position = 12, required = false, value = "面值[8,2]", example = "5")
     @DecimalMin(value = "0.01", message = "面值不能小于0.01")

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

@@ -150,7 +150,7 @@ public class GoblinRedisUtils {
         List<GoblinSelfTagVo> vos;
         if (StringUtils.isEmpty(valStr)) {
             if (!CollectionUtils.isEmpty(vos = goblinMongoUtils.getSelfTagVos("1"))) {
-                redisUtil.set(GoblinRedisConst.BASIC_SELF_TAG, JsonUtils.toJson(vos), 60 * 60);
+                redisUtil.set(GoblinRedisConst.BASIC_SELF_EXTAG, JsonUtils.toJson(vos), 60 * 60);
             }
         } else {
             vos = JsonUtils.fromJson(valStr, new TypeReference<List<GoblinSelfTagVo>>() {