refactor(vip): 优化积分和返佣计算逻辑

Administrator

2025-05-19 9b51a95fa8bc9b3a86108c6900e17fc55f8db467

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

@@ -112,24 +112,21 @@
                                            </div>
                                        </div>

                                        <div class="layui-form-item febs-hide tc-set">
                                            <label class="layui-form-label">静态倍数</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="staticMulti" placeholder="请输入静态倍数"
                                                       autoComplete="off" class="layui-input">
                                                <div class="layui-form-mid layui-word-aux">支付后，赠送（购买金额*静态倍数）的赠送积分
                                                </div>
                                            </div>
                                        </div>
<!--                                        <div class="layui-form-item">-->
<!--                                            <label class="layui-form-label">推销员返积分比例(%)</label>-->
<!--                                            <div class="layui-input-block">-->
<!--                                                <input type="text" name="staticMulti" placeholder="请输入推销员返积分比例" autocomplete="off" class="layui-input">-->
<!--                                            </div>-->
<!--                                        </div>-->

                                        <div class="layui-form-item febs-hide tc-set">
                                            <label class="layui-form-label">静态占比(%)</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="staticProp" placeholder="请输入静态占比"
                                                       autoComplete="off" class="layui-input">
                                                <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>
                                            </div>
                                        </div>
<!--                                        <div class="layui-form-item febs-hide tc-set">-->
<!--                                            <label class="layui-form-label">静态占比(%)</label>-->
<!--                                            <div class="layui-input-block">-->
<!--                                                <input type="text" name="staticProp" placeholder="请输入静态占比"-->
<!--                                                       autoComplete="off" class="layui-input">-->
<!--                                                <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>-->
<!--                                            </div>-->
<!--                                        </div>-->
                                    </div>

                                    <div class="layui-tab-item">
@@ -193,13 +190,24 @@
                                            </div>
                                        </div>

<!--                                        <div class="layui-form-item">-->
<!--                                            <label class="layui-form-label febs-form-item-require">商品详情：</label>-->
<!--                                            <div class="layui-input-block">-->
<!--                                                <textarea id="goodsDetailsUpdate" lay-verify="content" name="goodsDetails" class="layui-textarea"></textarea>-->
<!--&lt;!&ndash;                                                <div style="border: 1px solid #ccc;">&ndash;&gt;-->
<!--&lt;!&ndash;                                                    <div id="toolbar-container-good-update" style="border-bottom: 1px solid #ccc;"></div>&ndash;&gt;-->
<!--&lt;!&ndash;                                                    <div id="editor-container-good-update" style="height: 300px;"></div>&ndash;&gt;-->
<!--&lt;!&ndash;                                                </div>&ndash;&gt;-->
<!--                                            </div>-->
<!--                                        </div>-->

                                        <div class="layui-form-item">
                                            <label class="layui-form-label febs-form-item-require">商品详情：</label>
                                            <div class="layui-input-block">
<!--                                                <textarea id="lay_edit" lay-verify="goodsDetails" name="goodsDetails" class="layui-textarea"></textarea>-->
                                                <!--                                                <textarea id="goodsDetailEditAdd" lay-verify="content" name = "goodsDetails" class="layui-textarea"></textarea>-->
                                                <div style="border: 1px solid #ccc;">
                                                    <div id="toolbar-container-good-update" style="border-bottom: 1px solid #ccc;"></div>
                                                    <div id="editor-container-good-update" style="height: 300px;"></div>
                                                    <div id="toolbar-container" class="toolbar"></div>
                                                    <div id="text-container" class="text" style="height: 450px;"></div>
                                                </div>
                                            </div>
                                        </div>
@@ -214,43 +222,54 @@
                                                           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">
                                            <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>
                                            </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>
                                            </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">
                                                    <input type="text" name="presentPrice" 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>-->
<!--                                            <div class="layui-input-block">-->
<!--                                                <input type="text" name="costPrice" lay-verify="required" placeholder=""-->
<!--                                                       autoComplete="off" class="layui-input">-->
                                        <div class="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="costPrice" 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="staticProp" lay-verify="required" placeholder="请输入积分折扣" lay-reqText="请输入积分折扣" autocomplete="off" class="layui-input">
                                                    <div class="layui-form-mid layui-word-aux">折扣积分=售价*积分折扣（%）*积分换算比例</div>
                                                    <div class="layui-form-mid layui-word-aux">不允许使用积分设置成：0%</div>
                                                    <div class="layui-form-mid layui-word-aux">全部使用积分设置成：大于等于100%</div>
                                                </div>
                                            </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>-->
<!--                                                <div class="layui-input-block">-->
<!--                                                    <input type="text" name="levelOnePrice" 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="levelTwoPrice" 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>-->

@@ -278,6 +297,16 @@
                                                <label class="layui-form-label febs-form-item-require">邮费模板：</label>
                                                <div class="layui-input-block">
                                                    <div id="carriage-rule"></div>
                                                </div>
                                            </div>
                                        </div>

                                        <blockquote class="layui-elem-quote blue-border">优惠卷设置</blockquote>
                                        <div class="layui-form-item coupon-rule">
                                            <div class="layui-col-lg6">
                                                <label class="layui-form-label">优惠卷：</label>
                                                <div class="layui-input-block">
                                                    <div id="coupon-rule"></div>
                                                </div>
                                            </div>
                                        </div>
@@ -399,17 +428,61 @@
            elem: '#febs-form-group-date'
        });

        formSelects.render();
        // layedit.set({   //设置图片接口
        //     uploadImage: {
        //         url: 'admin/goods/uploadFileBase64', //接口url
        //         type: 'post',
        //     }
        // });
        //
        // //创建一个编辑器
        // var indexUpdate = layedit.build('goodsDetailsUpdate',{
        //     height: 300
        // });
        // form.verify({
        //     //content富文本域中的lay-verify值
        //     content: function(value) {
        //         return layedit.sync(indexUpdate);
        //     }
        // });

        var E = window.wangEditor;
        const editorConfig = { MENU_CONF: {} };
        editorConfig.MENU_CONF['uploadImage'] = {
            server: '/admin/goods/uploadFileBase64',
            fieldName : "file",
            customInsert(res, insertFn) {
                insertFn(res.data.src, res.data.title, '')
            },
        }
        formSelects.render();
        const E = window.wangEditor;
        const editor = new E('#toolbar-container', '#text-container'); // 传入两个元素
        editor.config.showLinkImg = false;
        editor.config.uploadFileName = 'file';
        editor.config.customUploadImg = function (files, insertImgFn) {
            // files 是 input 中选中的文件列表
            // insertImgFn 是获取图片 url 后，插入到编辑器的方法
            // 上传图片，返回结果，将图片插入到编辑器中
            for (let i = 0; i < files.length; i++){
                var form = new FormData();
                form.append("file", files[0]);
                $.ajax({
                    url:'/admin/goods/uploadFileBase64',
                    type: "post",
                    processData: false,
                    contentType: false,
                    data: form,
                    dataType: 'json',
                    success(res) {
                        // 上传代码返回结果之后，将图片插入到编辑器中
                        insertImgFn(res.data.src, res.data.title, '')
                    }
                })
            }
        };
        editor.create();

        // var E = window.wangEditor;
        // const editorConfig = { MENU_CONF: {} };
        // editorConfig.MENU_CONF['uploadImage'] = {
        //     server: '/admin/goods/uploadFileBase64',
        //     fieldName : "file",
        //     customInsert(res, insertFn) {
        //         insertFn(res.data.src, res.data.title, '')
        //     },
        // }

        var category = xmSelect.render({
            el: '#goods-category',
@@ -440,6 +513,38 @@
            // initValue();
        })

        var couponRule = xmSelect.render({
            el: '#coupon-rule',
            language: 'zn',
            prop : {
                value : 'id',
                children : 'child'
            },
            iconfont: {
                parent: 'hidden',
            },
            // radio: true,
            clickClose: true,
            tree: {
                show: true,
                //非严格模式
                strict: false,
            },
            data: []
        })

        febs.get(ctx + 'admin/goods/couponTreeSet', null, function(res) {
            couponRule.update({
                data : res.data,
                autoRow: true,
            });


            setTimeout(() => {
                initValue();
            }, 500);
        })

        var carriageRule = xmSelect.render({
            el: '#carriage-rule',
            language: 'zn',
@@ -465,9 +570,8 @@
                data : res.data,
                autoRow: true,
            });

            initValue();
        })


        var tableSkuData = [];
        var tableIns = table.render({
@@ -480,14 +584,13 @@
                ,{field: 'index', title: '序号', width: 70}
                ,{field: 'styleName', title: '样式', edit:'text', width:200}
                ,{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: 'costPrice', 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}
                ,{field: 'skuVolume', title: '销量', edit:'text', width:100}
@@ -759,6 +862,7 @@
                "carriageAmount": goodsInfo.carriageAmount,
                "goodsWeight": goodsInfo.goodsWeight,
                "orderNumber": goodsInfo.orderNumber,
                "goodsDetails": goodsInfo.goodsDetails,
                "thumbs": thumbs
            });

@@ -769,6 +873,8 @@
            var arrCarriageRule = [];
            arrCarriageRule.push(goodsInfo.carriageRuleId)
            carriageRule.setValue(arrCarriageRule);

            couponRule.setValue(goodsInfo.couponIds);

            if (goodsInfo.isNormal == 2) {
                $(".tc-set").show();
@@ -802,32 +908,44 @@
            imgSingleBind();
            imgMultiBind();

            window.editor = E.createEditor({
                html: goodsInfo.goodsDetails,
                selector: '#editor-container-good-update',
                config : editorConfig,
                mode: 'default'
            });

            window.toolbar = E.createToolbar({
                editor,
                selector: '#toolbar-container-good-update',
                mode: 'default'
            });
            // window.editor = E.createEditor({
            //     html: goodsInfo.goodsDetails,
            //     selector: '#editor-container-good-update',
            //     config : editorConfig,
            //     mode: 'default'
            // });
            //
            // window.toolbar = E.createToolbar({
            //     editor,
            //     selector: '#toolbar-container-good-update',
            //     mode: 'default'
            // });

            if (skus) {
                tableSkuData = skus;
                reloadTable(skus);
            }

            editor.txt.html(goodsInfo.goodsDetails);
            // layedit.setContent(indexUpdate,, false);
        }

        form.on('submit(goods-update-form-submit)', function (data) {
            let couponRuleList = couponRule.getValue();
            if (couponRuleList.length > 0) {
                var couponIds = [];
                layui.each(couponRuleList, function (key, item) {
                    couponIds.push(item.id)
                });
                data.field.couponIds=couponIds;
            }
            data.field.goodsType=1;
            data.field.mailGoodsSkuDto = tableSkuData;
            data.field.delSkuId=delSku;
            data.field.categoryId = category.getValue('valueStr');
            data.field.carriageRuleId = carriageRule.getValue('valueStr');
            data.field.goodsDetails = editor.getHtml();
            // data.field.goodsDetails = editor.getHtml();
            data.field.goodsDetails = editor.txt.html();
            $.ajax({
                'url': ctx + 'admin/goods/updateMallGoods',
                'type': 'post',