src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
@@ -4,7 +4,6 @@ import cc.mrbird.febs.mall.dto.*; import cc.mrbird.febs.mall.entity.MallMember; import cc.mrbird.febs.mall.entity.MallMemberPayment; import cc.mrbird.febs.mall.entity.MallMemberShopApplyEntity; import cc.mrbird.febs.mall.entity.MallShopApply; import cc.mrbird.febs.mall.vo.CashOutSettingVo; import cc.mrbird.febs.mall.vo.MyCommissionVo; src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
@@ -323,7 +323,7 @@ return new FebsResponse().fail().message("商品规格原价不能小于0"); } BigDecimal presentPrice = addSku.getPresentPrice(); if (presentPrice.compareTo(BigDecimal.ZERO) <= 0) { if (presentPrice.compareTo(BigDecimal.ZERO) < 0) { return new FebsResponse().fail().message("商品规格现价不能小于0"); }
@@ -58,7 +58,6 @@ private final DataDictionaryCustomMapper dataDictionaryCustomMapper; private final MallShopApplyMapper mallShopApplyMapper; private final MallRegisterAppealMapper mallRegisterAppealMapper; private final MallMemberShopApplyMapper mallMemberShopApplyMapper; @Value("${spring.profiles.active}") src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -84,9 +84,12 @@ <if test="record.isNormal != null and record.isNormal != ''"> and a.is_normal = #{record.isNormal} </if> <if test="record.goodsType != null and record.goodsType != ''"> <if test="record.goodsType != null and record.goodsType != '' and record.goodsType != 3"> and a.goods_type = #{record.goodsType} </if> <if test="record.goodsType == 3"> and a.present_price = 0 </if> <if test="record.categoryId != null and record.categoryId != ''"> and (c.id = #{record.categoryId} or c.parent_id=#{record.categoryId}) </if> src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -201,6 +201,21 @@ </div> </div> <div class="layui-form-item"> <label class="layui-form-label">设置运费：</label> <div class="layui-input-block"> <input type="radio" name="hasCarriage" value="1" title="开启" lay-filter="hasCarriage" /> <input type="radio" name="hasCarriage" value="2" title="关闭" lay-filter="hasCarriage" checked /> </div> </div> <div class="layui-form-item carriage-input febs-hide"> <label class="layui-form-label">运费：</label> <div class="layui-input-block"> <input type="text" name="carriage" placeholder="" autocomplete="off" class="layui-input"> </div> </div> <blockquote class="layui-elem-quote blue-border">多规格设置</blockquote> <div class="layui-col-lg6"> <label class="layui-form-label">开启多规格：</label> @@ -422,6 +437,14 @@ } }); form.on('radio(hasCarriage)', function(data){ if (data.value == 2) { $('.carriage-input').hide(); } else { $('.carriage-input').show(); } }); function addTableDate(data) { var hasData = table.cache['multiSku'];
@@ -8,6 +8,7 @@ <li class="layui-this">分红设置</li> <li>代理分红</li> <li>排名分红</li> <li>间推分配</li> </ul> <div class="layui-tab-content"> <div class="layui-tab-item layui-show" id="bonus-global-setting"> @@ -17,6 +18,9 @@ </div> <div class="layui-tab-item"> <table id="rankBonus" lay-filter="rankBonus"></table> </div> <div class="layui-tab-item"> <table id="indirectDistrib" lay-filter="indirectDistrib"></table> </div> </div> </div> @@ -81,7 +85,8 @@ , $bonusSystem = $("#bonus-global-setting") , laytpl = layui.laytpl , agentBonusArr , rankBonusArr; , rankBonusArr , indirectBonusArr; form.verify(validate); form.render(); @@ -92,6 +97,7 @@ {field: 'description', title: '代理', edit:'text'} ,{field: 'prop', title: '返利比例(%)', edit:'text'} ,{field: 'achieve', title: '团队业绩(万元)', edit:'text'} ,{field: 'direct', title: '直推(个)', edit:'text'} ,{field: 'type', title: '比例', edit:'text', hide:'true'} ,{field: 'code', title: '比例', edit:'text', hide:'true'} ]] @@ -106,7 +112,8 @@ if (agentBonusArr[i].code === data.code) { var valueData = {}; valueData.teamIncome = data.achieve; valueData.profitProp = data.prop valueData.profitProp = data.prop; valueData.directCnt = data.direct; agentBonusArr[i].value = JSON.stringify(valueData); } } @@ -135,9 +142,36 @@ } }); table.render({ elem: '#indirectDistrib' ,cols: [[ //表头 {field: 'pushCnt', title: '直推人数', edit:'text'} ,{field: 'prop', title: '返利比例(%)', edit:'text'} ,{field: 'type', title: '比例', edit:'text', hide:'true'} ,{field: 'code', title: '比例', edit:'text', hide:'true'} ]] ,data: [] }); table.on('edit(indirectDistrib)', function(obj){ var value = obj.value //得到修改后的值 ,data = obj.data //得到所在行所有键值 ,field = obj.field; //得到字段 for (let i = 0; i < indirectBonusArr.length; i++) { if (indirectBonusArr[i].code === data.code) { var valueData = {}; valueData.pushCnt = data.pushCnt; valueData.prop = data.prop; indirectBonusArr[i].value = JSON.stringify(valueData); } } }); dicDataReq("BONUS_TYPE"); dicDataReq("AGENT_LEVEL_REQUIRE"); dicDataReq("RANK_AWARD"); dicDataReq("INDIRECT_BONUS_SETTING"); function dicDataReq(type) { $bonusSystem.empty(); $.get(ctx + 'admin/common/findDicByType/' + type, function (r) { @@ -153,6 +187,7 @@ for (let i = 0; i < data.length; i++) { data[i].prop = JSON.parse(data[i].value).profitProp; data[i].achieve = JSON.parse(data[i].value).teamIncome; data[i].direct = JSON.parse(data[i].value).directCnt; } agentBonusArr = data; table.reload('agentBonus', { @@ -166,6 +201,17 @@ data : data }); } if ("INDIRECT_BONUS_SETTING" == type) { for (let i = 0; i < data.length; i++) { data[i].prop = JSON.parse(data[i].value).prop; data[i].pushCnt = JSON.parse(data[i].value).pushCnt; } indirectBonusArr = data; table.reload('indirectDistrib', { data : data }); } } }); } @@ -173,6 +219,7 @@ form.on('submit(profit-setting-form-submit)', function (data) { data.field.agentBonus = agentBonusArr; data.field.rankBonus = rankBonusArr; data.field.indrectDistrib = indirectBonusArr; $.ajax({ 'url':ctx + 'admin/system/bonusSystemSetting', 'type':'post',
