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

bug秒杀拼团修改报错

Browse Source
This commit is contained in:
xuwenbo
2020-09-08 10:21:49 +08:00
parent dd0447bbb2
commit ff3834d97e
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java
View File

@ -176,9 +176,6 @@ public class YxStoreCombination extends BaseDomain {
@ApiModelProperty(value = "运费模板ID") @ApiModelProperty(value = "运费模板ID")
private Long tempId; private Long tempId;
/** 是否单独分佣 */
@JsonProperty("is_sub")
private Integer isSub;
/** 属性项目 */ /** 属性项目 */
@TableField(exist = false) @TableField(exist = false)

3
yshop-mall/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java
View File

@ -176,9 +176,6 @@ public class YxStoreSeckill extends BaseDomain {
@ApiModelProperty(value = "运费模板ID") @ApiModelProperty(value = "运费模板ID")
private Long tempId; private Long tempId;
/** 是否单独分佣 */
@JsonProperty("is_sub")
private Integer isSub;
/** 属性项目 */ /** 属性项目 */
@TableField(exist = false) @TableField(exist = false)

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

@ -138,6 +138,7 @@ public class StoreCombinationController {
.brokerageTwo(Double.valueOf(mapAttr.get("brokerage_two").toString())) .brokerageTwo(Double.valueOf(mapAttr.get("brokerage_two").toString()))
.pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString())) .pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString()))
.pinkStock(Integer.valueOf(mapAttr.get("pink_stock").toString())) .pinkStock(Integer.valueOf(mapAttr.get("pink_stock").toString()))
.stock(Integer.valueOf(mapAttr.get("stock").toString()))
.seckillPrice(Double.valueOf(mapAttr.get("seckill_price").toString())) .seckillPrice(Double.valueOf(mapAttr.get("seckill_price").toString()))
.seckillStock(Integer.valueOf(mapAttr.get("seckill_stock").toString())) .seckillStock(Integer.valueOf(mapAttr.get("seckill_stock").toString()))
.build(); .build();

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

@ -149,6 +149,7 @@ public class StoreSeckillController {
.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()))
.stock(Integer.valueOf(mapAttr.get("stock").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())) .pinkPrice(Double.valueOf(mapAttr.get("pink_price").toString()))