src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java
@@ -70,7 +70,7 @@ private Integer isSku; /** * 是否普通商品 1-普通商品 2-套餐 * 是否普通商品 1-普通商品 2-积分商品 3-双卷商品 */ private Integer isNormal;
@@ -35,7 +35,7 @@ @ApiModelProperty(value = "是否热卖", example = "1是2否") private Integer isHot; @ApiModelProperty(value = "是否套餐 1-普通商品 2-套餐", example = "2") @ApiModelProperty(value = "是否普通商品 1-普通商品 2-积分商品 3-双卷商品", example = "2") private Integer isNormal; @ApiModelProperty(value = "1-付费商品 2-积分商品") src/main/java/cc/mrbird/febs/mall/dto/MallGoodsUpdateDto.java
@@ -73,7 +73,7 @@ private Integer isSku; /** * 是否普通商品 1-普通商品 2-套餐 * 是否普通商品 1-普通商品 2-积分商品 3-双卷商品 */ private Integer isNormal;
@@ -117,15 +117,18 @@ if (StrUtil.isEmpty(originalPrice)) { return new FebsResponse().fail().message("商品规格原价不能为空"); } addSku.setPresentPrice(addSku.getOriginalPrice()); // String presentPrice = addSku.getPresentPrice(); // if (StrUtil.isEmpty(presentPrice)) { // return new FebsResponse().fail().message("商品规格现价不能为空"); // addSku.setPresentPrice(addSku.getOriginalPrice()); String presentPrice = addSku.getPresentPrice(); if (StrUtil.isEmpty(presentPrice)) { return new FebsResponse().fail().message("商品规格现价不能为空"); } // if (StrUtil.isEmpty(addSku.getLevelOnePrice()) // || StrUtil.isEmpty(addSku.getLevelTwoPrice()) // || StrUtil.isEmpty(addSku.getLevelThreePrice())) { // return new FebsResponse().fail().message("商品规格级别价格不能为空"); // } if (StrUtil.isEmpty(addSku.getLevelOnePrice()) || StrUtil.isEmpty(addSku.getLevelTwoPrice()) || StrUtil.isEmpty(addSku.getLevelThreePrice())) { return new FebsResponse().fail().message("商品规格级别价格不能为空"); if (StrUtil.isEmpty(addSku.getLevelOnePrice())) { return new FebsResponse().fail().message("商品规格赠送积分不能为空"); } BigDecimal goodsWeight = addSku.getGoodsWeight(); if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){ @@ -175,12 +178,11 @@ sku.setSkuImage(mallGoods.getThumb()); sku.setSkuName(mallGoods.getGoodsName()); sku.setCostPrice(mallGoods.getCostPrice()); // sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice())); sku.setPresentPrice(new BigDecimal(mallGoods.getOriginalPrice())); sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice())); sku.setOriginalPrice(new BigDecimal(mallGoods.getOriginalPrice())); sku.setLevelOnePrice(mallGoods.getLevelOnePrice()); sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice()); sku.setLevelThreePrice(mallGoods.getLevelThreePrice()); // sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice()); // sku.setLevelThreePrice(mallGoods.getLevelThreePrice()); sku.setSkuVolume(mallGoods.getVolume()); sku.setStock(mallGoods.getStock()); sku.setStyleId(style.getId()); @@ -217,12 +219,12 @@ mallGoodsSku.setStock(addMallGoodsSkuDto.getStock() == null ? 0 : addMallGoodsSkuDto.getStock()); mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume()); mallGoodsSku.setOriginalPrice(new BigDecimal(addMallGoodsSkuDto.getOriginalPrice())); // mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice())); mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getOriginalPrice())); mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice())); // mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getOriginalPrice())); mallGoodsSku.setLevelOnePrice(new BigDecimal(addMallGoodsSkuDto.getLevelOnePrice())); mallGoodsSku.setLevelTwoPrice(new BigDecimal(addMallGoodsSkuDto.getLevelTwoPrice())); mallGoodsSku.setLevelThreePrice(new BigDecimal(addMallGoodsSkuDto.getLevelThreePrice())); // mallGoodsSku.setLevelTwoPrice(new BigDecimal(addMallGoodsSkuDto.getLevelTwoPrice())); // mallGoodsSku.setLevelThreePrice(new BigDecimal(addMallGoodsSkuDto.getLevelThreePrice())); mallGoodsSku.setStyleId(mallGoodsStyleSku.getId()); mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice()); mallGoodsSku.setGoodsId(mallGoods.getId()); @@ -375,20 +377,20 @@ if (originalPrice.compareTo(BigDecimal.ZERO) <= 0) { return new FebsResponse().fail().message("商品规格原价不能小于0"); } addSku.setPresentPrice(addSku.getOriginalPrice()); // BigDecimal presentPrice = addSku.getPresentPrice(); // if (presentPrice.compareTo(BigDecimal.ZERO) < 0) { // return new FebsResponse().fail().message("商品规格现价不能小于0"); // } // addSku.setPresentPrice(addSku.getOriginalPrice()); BigDecimal presentPrice = addSku.getPresentPrice(); if (presentPrice.compareTo(BigDecimal.ZERO) < 0) { return new FebsResponse().fail().message("商品规格现价不能小于0"); } if (addSku.getLevelOnePrice().compareTo(BigDecimal.ZERO) < 0) { return new FebsResponse().fail().message("商品等级价格不能小于0"); return new FebsResponse().fail().message("商品规格赠送积分不能小于0"); } if (addSku.getLevelTwoPrice().compareTo(BigDecimal.ZERO) < 0) { return new FebsResponse().fail().message("商品等级价格不能小于0"); } if (addSku.getLevelThreePrice().compareTo(BigDecimal.ZERO) < 0) { return new FebsResponse().fail().message("商品等级价格不能小于0"); } // if (addSku.getLevelTwoPrice().compareTo(BigDecimal.ZERO) < 0) { // return new FebsResponse().fail().message("商品等级价格不能小于0"); // } // if (addSku.getLevelThreePrice().compareTo(BigDecimal.ZERO) < 0) { // return new FebsResponse().fail().message("商品等级价格不能小于0"); // } BigDecimal goodsWeight = addSku.getGoodsWeight(); if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){ return new FebsResponse().fail().message("重量不能小于零"); @@ -453,12 +455,12 @@ sku.setSkuImage(mallGoods.getThumb()); sku.setSkuName(mallGoods.getGoodsName()); sku.setCostPrice(mallGoods.getCostPrice()); // sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice())); sku.setPresentPrice(new BigDecimal(mallGoods.getOriginalPrice())); sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice())); // sku.setPresentPrice(new BigDecimal(mallGoods.getOriginalPrice())); sku.setOriginalPrice(new BigDecimal(mallGoods.getOriginalPrice())); sku.setLevelOnePrice(mallGoods.getLevelOnePrice()); sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice()); sku.setLevelThreePrice(mallGoods.getLevelThreePrice()); // sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice()); // sku.setLevelThreePrice(mallGoods.getLevelThreePrice()); sku.setSkuVolume(mallGoods.getVolume()); sku.setStock(mallGoods.getStock()); sku.setStyleId(style.getId()); @@ -522,11 +524,11 @@ mallGoodsSku.setStock(addMallGoodsSkuDto.getStock() == null ? 0 : addMallGoodsSkuDto.getStock()); mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume()); mallGoodsSku.setOriginalPrice(addMallGoodsSkuDto.getOriginalPrice()); // mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice()); mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice()); mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice()); // mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice()); mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice()); mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice()); mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice()); // mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice()); // mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice()); mallGoodsSku.setStyleId(addMallGoodsSkuDto.getStyleId()); mallGoodsSku.setGoodsId(mallGoods.getId()); mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice()); @@ -542,11 +544,11 @@ mallGoodsSku.setStock(addMallGoodsSkuDto.getStock() == null ? 0 : addMallGoodsSkuDto.getStock()); mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume()); mallGoodsSku.setOriginalPrice(addMallGoodsSkuDto.getOriginalPrice()); // mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice()); mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice()); mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice()); // mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice()); mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice()); mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice()); mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice()); // mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice()); // mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice()); mallGoodsSku.setStyleId(mallGoodsStyleSku.getId()); mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice()); mallGoodsSku.setGoodsId(mallGoods.getId()); src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -94,7 +94,7 @@ // throw new FebsException("请先申请成为代理人"); // } //订单范围内才允许下单 //验证收货地址 MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId()); if(ObjectUtil.isEmpty(address)){ throw new FebsException("请重新选择收货地址信息"); src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
@@ -91,7 +91,7 @@ @ApiModelProperty(value = "单位") private String unit; @ApiModelProperty(value = "1级代理价格") @ApiModelProperty(value = "赠送积分") private BigDecimal levelOnePrice; @ApiModelProperty(value = "2级代理价格") src/main/java/cc/mrbird/febs/mall/vo/MallGoodsListVo.java
@@ -41,7 +41,7 @@ @ApiModelProperty(value = "库存") private String stock; @ApiModelProperty(value = "积分") @ApiModelProperty(value = "积分--废弃") private BigDecimal score; @ApiModelProperty(value = "是否有运费 1-是 2-包邮 （不使用了）") @@ -66,7 +66,7 @@ @ApiModelProperty(value = "单位") private String unit; @ApiModelProperty(value = "1级代理价格") @ApiModelProperty(value = "赠送积分") private BigDecimal levelOnePrice; @ApiModelProperty(value = "2级代理价格") src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -191,36 +191,37 @@ <input type="text" name="originalPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input"> </div> </div> <!-- <div class="layui-col-lg6">--> <!-- <label class="layui-form-label febs-form-item-require">折扣价：</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="presentPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">--> <!-- </div>--> <!-- </div>--> <div class="layui-col-lg6"> <label class="layui-form-label febs-form-item-require">现价：</label> <div class="layui-input-block"> <input type="text" name="presentPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input"> </div> <blockquote class="layui-elem-quote blue-border">代理价格</blockquote> </div> </div> <blockquote class="layui-elem-quote blue-border">购买商品，赠送积分数量</blockquote> <div class="layui-row layui-col-space10 layui-form-item"> <div class="layui-col-lg6"> <label class="layui-form-label febs-form-item-require">一级价格：</label> <label class="layui-form-label febs-form-item-require">赠送积分：</label> <div class="layui-input-block"> <input type="text" name="levelOnePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input"> <div class="layui-form-mid layui-word-aux">赠送积分：请填写整数。如果不赠送积分则填写：0。</div> </div> </div> <div class="layui-col-lg6"> <label class="layui-form-label febs-form-item-require">二级价格：</label> <div class="layui-input-block"> <input type="text" name="levelTwoPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input"> <!-- <div class="layui-col-lg6">--> <!-- <label class="layui-form-label febs-form-item-require">二级价格：</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="levelTwoPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">--> <!-- </div>--> <!-- </div>--> </div> </div> </div> <div class="layui-row layui-col-space10 layui-form-item"> <div class="layui-col-lg6"> <label class="layui-form-label febs-form-item-require">三级价格：</label> <div class="layui-input-block"> <input type="text" name="levelThreePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input"> </div> </div> </div> <!-- <div class="layui-row layui-col-space10 layui-form-item">--> <!-- <div class="layui-col-lg6">--> <!-- <label class="layui-form-label febs-form-item-require">三级价格：</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="levelThreePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <!-- <div class="layui-form-item">--> <!-- <label class="layui-form-label febs-form-item-require">成本价：</label>--> @@ -451,11 +452,11 @@ ,{field: 'skuName', title: '规格', edit:'text', width:200} ,{field: 'sample', title:'样品', width:100} ,{field: 'goodsWeight', title: '重量', edit:'text', width:100} // ,{field: 'presentPrice', title: '折扣价', edit:'text', width:100} ,{field: 'levelOnePrice', title: '一级价格', edit:'text', width:100} ,{field: 'levelTwoPrice', title: '二级价格', edit:'text', width:100} ,{field: 'levelThreePrice', title: '三级价格', edit:'text', width:100} ,{field: 'originalPrice', title: '原价', edit:'text', width:100} ,{field: 'presentPrice', title: '现价', edit:'text', width:100} ,{field: 'levelOnePrice', title: '赠送积分', edit:'text', width:100} // ,{field: 'levelTwoPrice', title: '二级价格', edit:'text', width:100} // ,{field: 'levelThreePrice', title: '三级价格', edit:'text', width:100} // ,{field: 'costPrice', title: '成本价', edit:'text', width:100} ,{templet: '#tableImgUpload', title: '缩略图', width:150} ,{field: 'stock', title: '库存', edit:'text', width:100} src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -215,37 +215,38 @@ placeholder="" autoComplete="off" class="layui-input"> </div> </div> <!-- <div class="layui-col-lg6">--> <!-- <label class="layui-form-label febs-form-item-require">折扣价：</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="presentPrice" lay-verify="required"--> <!-- placeholder="" autoComplete="off" class="layui-input">--> <!-- </div>--> <!-- </div>--> <div class="layui-col-lg6"> <label class="layui-form-label febs-form-item-require">现价：</label> <div class="layui-input-block"> <input type="text" name="presentPrice" lay-verify="required" placeholder="" autoComplete="off" class="layui-input"> </div> <blockquote class="layui-elem-quote blue-border">代理价格</blockquote> </div> </div> <blockquote class="layui-elem-quote blue-border">购买商品，赠送积分数量</blockquote> <div class="layui-row layui-col-space10 layui-form-item"> <div class="layui-col-lg6"> <label class="layui-form-label febs-form-item-require">一级价格：</label> <label class="layui-form-label febs-form-item-require">赠送积分：</label> <div class="layui-input-block"> <input type="text" name="levelOnePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input"> <div class="layui-form-mid layui-word-aux">赠送积分：请填写整数。如果不赠送积分则填写：0。</div> </div> </div> <div class="layui-col-lg6"> <label class="layui-form-label febs-form-item-require">二级价格：</label> <div class="layui-input-block"> <input type="text" name="levelTwoPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input"> <!-- <div class="layui-col-lg6">--> <!-- <label class="layui-form-label febs-form-item-require">二级价格：</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="levelTwoPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">--> <!-- </div>--> <!-- </div>--> </div> </div> </div> <div class="layui-row layui-col-space10 layui-form-item"> <div class="layui-col-lg6"> <label class="layui-form-label febs-form-item-require">三级价格：</label> <div class="layui-input-block"> <input type="text" name="levelThreePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input"> </div> </div> </div> <!-- <div class="layui-row layui-col-space10 layui-form-item">--> <!-- <div class="layui-col-lg6">--> <!-- <label class="layui-form-label febs-form-item-require">三级价格：</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="levelThreePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">--> <!-- </div>--> <!-- </div>--> <!-- </div>--> <!-- <div class="layui-form-item">--> <!-- <label class="layui-form-label febs-form-item-require">成本价：</label>--> @@ -483,11 +484,11 @@ ,{field: 'skuName', title: '规格', edit:'text', width:200} ,{field: 'sample', title:'样品', width:100} ,{field: 'goodsWeight', title: '重量', edit:'text', width:100} // ,{field: 'presentPrice', title: '折扣价', edit:'text', width:100} ,{field: 'originalPrice', title: '原价', edit:'text', width:100} ,{field: 'levelOnePrice', title: '一级价格', edit:'text', width:100} ,{field: 'levelTwoPrice', title: '二级价格', edit:'text', width:100} ,{field: 'levelThreePrice', title: '三级价格', edit:'text', width:100} ,{field: 'presentPrice', title: '现价', edit:'text', width:100} ,{field: 'levelOnePrice', title: '赠送积分', edit:'text', width:100} // ,{field: 'levelTwoPrice', title: '二级价格', edit:'text', width:100} // ,{field: 'levelThreePrice', title: '三级价格', edit:'text', width:100} // ,{field: 'costPrice', title: '成本价', edit:'text', width:100} ,{templet: '#tableImgUpload', title: '缩略图', width:150} ,{field: 'stock', title: '库存', edit:'text', width:100} @@ -751,8 +752,8 @@ "originalPrice": goodsInfo.originalPrice, "presentPrice": goodsInfo.presentPrice, "levelOnePrice": goodsInfo.levelOnePrice, "levelTwoPrice": goodsInfo.levelTwoPrice, "levelThreePrice": goodsInfo.levelThreePrice, // "levelTwoPrice": goodsInfo.levelTwoPrice, // "levelThreePrice": goodsInfo.levelThreePrice, "costPrice": goodsInfo.costPrice, "isSku": goodsInfo.isSku, "thumb": goodsInfo.thumb,
