From 357771f7a49fdd54beb316c6740e1b0b4a30abff Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Fri, 4 Sep 2020 13:54:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=90=A5=E9=94=80=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= =?UTF-8?q?=20->=E8=B7=9F=E4=BB=A5=E5=89=8D=E7=9A=84=E5=8D=95=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E5=95=86=E5=93=81=E6=B7=BB=E5=8A=A0=E4=B8=8D=E5=85=BC?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/product/service/dto/ProductFormatDto.java | 8 ++++---- .../modules/activity/rest/StoreCombinationController.java | 8 ++++---- .../modules/activity/rest/StoreSeckillController.java | 8 ++++---- .../modules/product/rest/StoreProductController.java | 4 ++++ 4 files changed, 16 insertions(+), 12 deletions(-) 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); }