fix
Hentua
2023-04-24 3916de9410192ea8728ebd15c124585d4514825c
fix
4 files modified
12 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java 4 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html 2 ●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html 4 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -347,7 +347,7 @@
                    }
                    // 判断会员层级
                    if (item.getIsNormal() == 2 && goodsLevel > item.getGoodsLevel()) {
                    if (item.getIsNormal() == 2 && goodsLevel < item.getGoodsLevel()) {
                        goodsLevel = item.getGoodsLevel();
                    }
                }
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -72,6 +72,10 @@
        // 父级会员
        MallMember parentMember = mallMemberMapper.selectInfoByInviteId(member.getReferrerId());
        if (parentMember == null) {
            return;
        }
        if (parentMember.getAccountLevel() == 0 || MemberLevelEnum.ZERO_LEVEL.getType().equals(parentMember.getLevel())) {
            log.info("上级:{}未购买会员套餐,无返利", parentMember.getInviteId());
            return;
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -110,7 +110,7 @@
                                                <select name="goodsLevel" class="goods-level" lay-filter="goods-level-select">
                                                    <option value="1">会员套餐</option>
                                                    <option value="2">代理套餐</option>
                                                    <option value="2">股东套餐</option>
                                                    <option value="3">股东套餐</option>
                                                </select>
                                            </div>
                                        </div>
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -120,7 +120,7 @@
                                                <select name="goodsLevel" class="goods-level">
                                                    <option value="1">会员套餐</option>
                                                    <option value="2">代理套餐</option>
                                                    <option value="2">股东套餐</option>
                                                    <option value="3">股东套餐</option>
                                                </select>
                                            </div>
                                        </div>
@@ -377,6 +377,7 @@
            elem: '#febs-form-group-date'
        });
        var E = window.wangEditor;
        formSelects.render();
        form.verify({
@@ -386,7 +387,6 @@
            ]
        });
        var E = window.wangEditor;
        const editorConfig = { MENU_CONF: {} };
        editorConfig.MENU_CONF['uploadImage'] = {
            server: '/admin/goods/uploadFileBase64',