diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java index 614230b9..48412544 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java @@ -53,13 +53,13 @@ public class ProductFormatDto { private Double volume = 0d; private Double weight = 0d; - + @JsonProperty("pink_price") private Double pinkPrice = 0d; - + @JsonProperty("pink_stock") private Integer pinkStock = 0; - + @JsonProperty("seckill_price") private Double seckillPrice = 0d; - + @JsonProperty("seckill_stock") private Integer seckillStock = 0; private Map detail; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java index f9e42bff..f9e0dfa5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java @@ -131,15 +131,15 @@ public class StoreCombinationController { .pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString())) .cost(Double.valueOf(mapAttr.get("cost").toString())) .otPrice(Double.valueOf(mapAttr.get("ot_price").toString())) - .stock(Integer.valueOf(mapAttr.get("stock").toString())) - .pinkStock(Integer.valueOf(mapAttr.get("pink_stock").toString())) .barCode(mapAttr.get("bar_code").toString()) .weight(Double.valueOf(mapAttr.get("weight").toString())) .volume(Double.valueOf(mapAttr.get("volume").toString())) .brokerage(Double.valueOf(mapAttr.get("brokerage").toString())) .brokerageTwo(Double.valueOf(mapAttr.get("brokerage_two").toString())) - .brokerageTwo(Double.valueOf(mapAttr.get("brokerage_two").toString())) - .brokerageTwo(Double.valueOf(mapAttr.get("brokerage_two").toString())) + .pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString())) + .pinkStock(Integer.valueOf(mapAttr.get("pink_stock").toString())) + .seckillPrice(Double.valueOf(mapAttr.get("seckill_price").toString())) + .seckillStock(Integer.valueOf(mapAttr.get("seckill_stock").toString())) .build(); productDto.setAttr(productFormatDto); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java index f2cebbd0..aec18484 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java @@ -146,15 +146,15 @@ public class StoreSeckillController { .pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString())) .cost(Double.valueOf(mapAttr.get("cost").toString())) .otPrice(Double.valueOf(mapAttr.get("ot_price").toString())) - .stock(Integer.valueOf(mapAttr.get("stock").toString())) - .pinkStock(Integer.valueOf(mapAttr.get("pink_stock").toString())) .barCode(mapAttr.get("bar_code").toString()) .weight(Double.valueOf(mapAttr.get("weight").toString())) .volume(Double.valueOf(mapAttr.get("volume").toString())) .brokerage(Double.valueOf(mapAttr.get("brokerage").toString())) .brokerageTwo(Double.valueOf(mapAttr.get("brokerage_two").toString())) - .brokerageTwo(Double.valueOf(mapAttr.get("brokerage_two").toString())) - .brokerageTwo(Double.valueOf(mapAttr.get("brokerage_two").toString())) + .pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString())) + .pinkStock(Integer.valueOf(mapAttr.get("pink_stock").toString())) + .seckillPrice(Double.valueOf(mapAttr.get("seckill_price").toString())) + .seckillStock(Integer.valueOf(mapAttr.get("seckill_stock").toString())) .build(); productDto.setAttr(productFormatDto); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java index ba146cf4..ac91c585 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java @@ -196,6 +196,10 @@ public class StoreProductController { .volume(Double.valueOf(mapAttr.get("volume").toString())) .brokerage(Double.valueOf(mapAttr.get("brokerage").toString())) .brokerageTwo(Double.valueOf(mapAttr.get("brokerage_two").toString())) + .pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString())) + .pinkStock(Integer.valueOf(mapAttr.get("pink_stock").toString())) + .seckillPrice(Double.valueOf(mapAttr.get("seckill_price").toString())) + .seckillStock(Integer.valueOf(mapAttr.get("seckill_stock").toString())) .build(); productDto.setAttr(productFormatDto); }