cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化营销商品新增修改逻辑 ->跟以前的单规格商品添加不兼容

Browse Source
This commit is contained in:
xuwenbo
2020-09-04 13:54:43 +08:00
parent 72463407b4
commit 357771f7a4
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/ProductFormatDto.java
View File

@ -53,13 +53,13 @@ public class ProductFormatDto {
private Double volume = 0d; private Double volume = 0d;
private Double weight = 0d; private Double weight = 0d;
@JsonProperty("pink_price")
private Double pinkPrice = 0d; private Double pinkPrice = 0d;
@JsonProperty("pink_stock")
private Integer pinkStock = 0; private Integer pinkStock = 0;
@JsonProperty("seckill_price")
private Double seckillPrice = 0d; private Double seckillPrice = 0d;
@JsonProperty("seckill_stock")
private Integer seckillStock = 0; private Integer seckillStock = 0;
private Map<String, String> detail; private Map<String, String> detail;

8
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java
View File

@ -131,15 +131,15 @@ public class StoreCombinationController {
.pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString())) .pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString()))
.cost(Double.valueOf(mapAttr.get("cost").toString())) .cost(Double.valueOf(mapAttr.get("cost").toString()))
.otPrice(Double.valueOf(mapAttr.get("ot_price").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()) .barCode(mapAttr.get("bar_code").toString())
.weight(Double.valueOf(mapAttr.get("weight").toString())) .weight(Double.valueOf(mapAttr.get("weight").toString()))
.volume(Double.valueOf(mapAttr.get("volume").toString())) .volume(Double.valueOf(mapAttr.get("volume").toString()))
.brokerage(Double.valueOf(mapAttr.get("brokerage").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()))
.brokerageTwo(Double.valueOf(mapAttr.get("brokerage_two").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(); .build();
productDto.setAttr(productFormatDto); productDto.setAttr(productFormatDto);
} }

8
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
View File

@ -146,15 +146,15 @@ public class StoreSeckillController {
.pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString())) .pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString()))
.cost(Double.valueOf(mapAttr.get("cost").toString())) .cost(Double.valueOf(mapAttr.get("cost").toString()))
.otPrice(Double.valueOf(mapAttr.get("ot_price").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()) .barCode(mapAttr.get("bar_code").toString())
.weight(Double.valueOf(mapAttr.get("weight").toString())) .weight(Double.valueOf(mapAttr.get("weight").toString()))
.volume(Double.valueOf(mapAttr.get("volume").toString())) .volume(Double.valueOf(mapAttr.get("volume").toString()))
.brokerage(Double.valueOf(mapAttr.get("brokerage").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()))
.brokerageTwo(Double.valueOf(mapAttr.get("brokerage_two").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(); .build();
productDto.setAttr(productFormatDto); productDto.setAttr(productFormatDto);
} }

4
yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
View File

@ -196,6 +196,10 @@ public class StoreProductController {
.volume(Double.valueOf(mapAttr.get("volume").toString())) .volume(Double.valueOf(mapAttr.get("volume").toString()))
.brokerage(Double.valueOf(mapAttr.get("brokerage").toString())) .brokerage(Double.valueOf(mapAttr.get("brokerage").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(); .build();
productDto.setAttr(productFormatDto); productDto.setAttr(productFormatDto);
} }