~ios.products;

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

@@ -180,6 +180,7 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
         } else {
             initVo.setStock(0);
             initVo.setSkuStock(0);
+            initVo.setBuyFactor("0");
             initVo.setSkuAppear("0");
             initVo.setSkuCanbuy("1");
             initVo.setOpeningTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getOpeningTime()));//1
@@ -207,6 +208,9 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
                 updateVo.setSkuCanbuy(this.getSkuCanbuy());//0
                 break;
             case "1":
+                updateVo.setBuyFactor("0");//
+                updateVo.setSkuAppear("0");//
+                updateVo.setSkuCanbuy("1");//
                 updateVo.setName(this.getName());//1
                 updateVo.setSkuPic(this.getSkuPic());//1
                 updateVo.setSkuWatch(this.getSkuWatch());//1

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

 package com.liquidnet.service.goblin.controller.manage;
 
-import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.service.base.ResponseDto;
@@ -84,7 +84,7 @@ public class GoblinStoreMgtExtraController {
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "IOS商品价格")
     @GetMapping("ios_products")
-    public ResponseDto<JsonNode> iosProducts() {
+    public ResponseDto<ObjectNode> iosProducts() {
         return ResponseDto.success(goblinRedisUtils.getIosProducts());
     }
 }

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

@@ -1040,8 +1040,8 @@ public class GoblinStoreMgtGoodsController {
         if (StringUtils.isBlank(mgtDigitalGoodsAddSkuParam.getProductId())) {// TODO: 2022/4/8 ==zhanggb
             mgtDigitalGoodsAddSkuParam.setProductId("NGoods1");
         }
-        JsonNode priceV = goblinRedisUtils.getIosProducts().get(mgtDigitalGoodsAddSkuParam.getProductId());
-        if (null == priceV) {
+        JsonNode priceVNode = goblinRedisUtils.getIosProducts().get(mgtDigitalGoodsAddSkuParam.getProductId());
+        if (null == priceVNode) {
             return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "无效的IOS商品ID");
         }
         String unbox = mgtDigitalGoodsAddSkuParam.getUnbox();
@@ -1080,7 +1080,7 @@ public class GoblinStoreMgtGoodsController {
             log.debug("商品管理:商品编辑:SKU添加:[GoblinStoreMgtGoodsEditSkuParam={}]", JsonUtils.toJson(mgtDigitalGoodsAddSkuParam));
         }
         GoblinGoodsSkuInfoVo initGoodsSkuInfoVo = mgtDigitalGoodsAddSkuParam.initAddGoodsSkuInfoVo(notUnboxFlg);
-        initGoodsSkuInfoVo.setPriceV(priceV.decimalValue());
+        initGoodsSkuInfoVo.setPriceV(priceVNode.decimalValue());
         {// 标签处理
             List<String> paramExtagList = mgtDigitalGoodsAddSkuParam.getExtagList();
             if (!CollectionUtils.isEmpty(paramExtagList)) {

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

 package com.liquidnet.service.goblin.util;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
@@ -113,64 +113,66 @@ public class GoblinRedisUtils {
 
     /* ---------------------------------------- IOS商品价格集 ---------------------------------------- */
 
-    public JsonNode getIosProducts() {
-        JsonNode val = (JsonNode) redisUtil.get(GoblinRedisConst.BASIC_LIB_IOS_PRODUCTS);
-        if (null == val) {
-            val = JsonUtils.OM().createArrayNode()
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods1", 1.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods3", 3.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods6", 6.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods8", 8.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods12", 12.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods18", 18.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods25", 25.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods28", 28.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods30", 30.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods40", 40.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods45", 45.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods50", 50.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods60", 60.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods68", 68.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods73", 73.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods78", 78.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods88", 88.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods93", 93.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods98", 98.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods108", 108.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods113", 113.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods118", 118.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods123", 123.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods128", 128.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods138", 138.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods148", 148.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods153", 153.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods158", 158.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods163", 163.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods168", 168.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods178", 178.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods188", 188.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods193", 193.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods198", 198.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods208", 208.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods218", 218.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods223", 223.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods228", 228.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods233", 233.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods238", 238.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods243", 243.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods248", 248.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods253", 253.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods258", 258.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods263", 263.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods268", 268.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods273", 273.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods278", 278.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods283", 283.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods288", 288.00))
-                    .add(JsonUtils.OM().createObjectNode().put("NGoods298", 298.00));
-            redisUtil.set(GoblinRedisConst.BASIC_LIB_IOS_PRODUCTS, val);
-        }
-        return val;
+    public ObjectNode getIosProducts() {
+        Object obj = redisUtil.get(GoblinRedisConst.BASIC_LIB_IOS_PRODUCTS);
+        if (null != obj) {
+            return JsonUtils.fromJson((String) obj, ObjectNode.class);
+        } else {
+            ObjectNode val = JsonUtils.OM().createObjectNode();
+            val.put("NGoods1", 1.00);
+            val.put("NGoods3", 3.00);
+            val.put("NGoods6", 6.00);
+            val.put("NGoods8", 8.00);
+            val.put("NGoods12", 12.00);
+            val.put("NGoods18", 18.00);
+            val.put("NGoods25", 25.00);
+            val.put("NGoods28", 28.00);
+            val.put("NGoods30", 30.00);
+            val.put("NGoods40", 40.00);
+            val.put("NGoods45", 45.00);
+            val.put("NGoods50", 50.00);
+            val.put("NGoods60", 60.00);
+            val.put("NGoods68", 68.00);
+            val.put("NGoods73", 73.00);
+            val.put("NGoods78", 78.00);
+            val.put("NGoods88", 88.00);
+            val.put("NGoods93", 93.00);
+            val.put("NGoods98", 98.00);
+            val.put("NGoods108", 108.00);
+            val.put("NGoods113", 113.00);
+            val.put("NGoods118", 118.00);
+            val.put("NGoods123", 123.00);
+            val.put("NGoods128", 128.00);
+            val.put("NGoods138", 138.00);
+            val.put("NGoods148", 148.00);
+            val.put("NGoods153", 153.00);
+            val.put("NGoods158", 158.00);
+            val.put("NGoods163", 163.00);
+            val.put("NGoods168", 168.00);
+            val.put("NGoods178", 178.00);
+            val.put("NGoods188", 188.00);
+            val.put("NGoods193", 193.00);
+            val.put("NGoods198", 198.00);
+            val.put("NGoods208", 208.00);
+            val.put("NGoods218", 218.00);
+            val.put("NGoods223", 223.00);
+            val.put("NGoods228", 228.00);
+            val.put("NGoods233", 233.00);
+            val.put("NGoods238", 238.00);
+            val.put("NGoods243", 243.00);
+            val.put("NGoods248", 248.00);
+            val.put("NGoods253", 253.00);
+            val.put("NGoods258", 258.00);
+            val.put("NGoods263", 263.00);
+            val.put("NGoods268", 268.00);
+            val.put("NGoods273", 273.00);
+            val.put("NGoods278", 278.00);
+            val.put("NGoods283", 283.00);
+            val.put("NGoods288", 288.00);
+            val.put("NGoods298", 298.00);
+            redisUtil.set(GoblinRedisConst.BASIC_LIB_IOS_PRODUCTS, val.toString());
+            return val;
+        }
     }
 
     /* ---------------------------------------- 平台标签数据源 ---------------------------------------- */
@@ -1302,9 +1304,9 @@ public class GoblinRedisUtils {
 //        String rk = GoblinRedisConst.REDIS_ZZ_MUSIC_TAG.concat(musicTag + ":").concat(performanceId);
 //        Object obj = redisUtil.get(rk);
 //        if (obj == null) {
-            listVo = goblinMongoUtils.getMusicTagPGoods(musicTag, performanceId);
+        listVo = goblinMongoUtils.getMusicTagPGoods(musicTag, performanceId);
 //            redisUtil.set(rk, listVo, 60 * 30);
-            return listVo;
+        return listVo;
 //        } else {
 //            return (List<GoblinGoodsInfoVo>) obj;
 //        }
@@ -1423,10 +1425,12 @@ public class GoblinRedisUtils {
             return (List<GoblinNftGoodsSkuListVo>) obj;
         }
     }
+
     public void setGoblinNftGoodsInfoListVo(List<GoblinNftGoodsSkuListVo> spuList) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_GOODS_LIST;
         redisUtil.set(redisKey, spuList);
     }
+
     public void delGoblinNftGoodsInfoListVo() {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_GOODS_LIST;
         redisUtil.del(redisKey);