parent: ff9ced34 | patch | commit | ignore whitespace
xiaoyong931011
2023-04-13 8e756196df99e62c41aa84144067c0dd5eb0f077 
后台修改
4 files modified
81 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java 33 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html 14 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html 16 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/system/agentAmountSet.html 18 ●●●●● patch | view | raw | blame | history 
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java


@@ -117,10 +117,11 @@


                    if (StrUtil.isEmpty(originalPrice)) {


                        return new FebsResponse().fail().message("商品规格原价不能为空");


                    }


                    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())) {


@@ -174,7 +175,8 @@


            sku.setSkuImage(mallGoods.getThumb());


            sku.setSkuName(mallGoods.getGoodsName());


            sku.setCostPrice(mallGoods.getCostPrice());


            sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));


//            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());


@@ -215,7 +217,8 @@


                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.getPresentPrice()));


                mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getOriginalPrice()));




                mallGoodsSku.setLevelOnePrice(new BigDecimal(addMallGoodsSkuDto.getLevelOnePrice()));


                mallGoodsSku.setLevelTwoPrice(new BigDecimal(addMallGoodsSkuDto.getLevelTwoPrice()));


@@ -372,10 +375,11 @@


                    if (originalPrice.compareTo(BigDecimal.ZERO) <= 0) {


                        return new FebsResponse().fail().message("商品规格原价不能小于0");


                    }


                    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");


                    }


@@ -449,7 +453,8 @@


            sku.setSkuImage(mallGoods.getThumb());


            sku.setSkuName(mallGoods.getGoodsName());


            sku.setCostPrice(mallGoods.getCostPrice());


            sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));


//            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());


@@ -517,7 +522,8 @@


                        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.getPresentPrice());


                        mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());


                        mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());


                        mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());


                        mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());


@@ -536,7 +542,8 @@


                        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.getPresentPrice());


                        mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());


                        mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());


                        mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());


                        mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());




 src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html


@@ -190,12 +190,12 @@


                                                    <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>-->


<!--                                            </div>-->


                                        </div>


                                        <blockquote class="layui-elem-quote blue-border">代理价格</blockquote>


                                        <div class="layui-row layui-col-space10 layui-form-item">


@@ -450,7 +450,7 @@


                ,{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: '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}




 src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html


@@ -214,13 +214,13 @@


                                                           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>-->


<!--                                            </div>-->


                                        </div>


                                        <blockquote class="layui-elem-quote blue-border">代理价格</blockquote>


                                        <div class="layui-row layui-col-space10 layui-form-item">


@@ -482,7 +482,7 @@


                ,{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: '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}




 src/main/resources/templates/febs/views/modules/system/agentAmountSet.html


@@ -3,15 +3,15 @@


        <form class="layui-form" action="" lay-filter="agent-amount-set-form">


            <div class="layui-card">


                <div class="layui-card-body">


                    <div class="layui-form-item">


                        <blockquote class="layui-elem-quote blue-border">合伙人充值设置</blockquote>


                        <label class="layui-form-label ">充值金额：</label>


                        <div class="layui-input-block">


                            <input type="text" name="agentAmountValue"


                                   lay-verify="required" autocomplete="off" class="layui-input" >


                        </div>


                        <div class="layui-word-aux" style="margin-left: 150px;">申请成为合伙人需要充值的金额数目</div>


                    </div>


<!--                    <div class="layui-form-item">-->


<!--                        <blockquote class="layui-elem-quote blue-border">合伙人充值设置</blockquote>-->


<!--                        <label class="layui-form-label ">充值金额：</label>-->


<!--                        <div class="layui-input-block">-->


<!--                            <input type="text" name="agentAmountValue"-->


<!--                                   lay-verify="required" autocomplete="off" class="layui-input" >-->


<!--                        </div>-->


<!--                        <div class="layui-word-aux" style="margin-left: 150px;">申请成为合伙人需要充值的金额数目</div>-->


<!--                    </div>-->




                    <div class="layui-form-item">


                        <blockquote class="layui-elem-quote blue-border">普通充值赠送金额设置</blockquote>