fix

Helius

2022-06-02 5abe23fb7704257846762016e60734901e0b31a4

fix

 src/main/resources/application-test.yml

@@ -2,7 +2,7 @@
  datasource:
    dynamic:
      # 是否开启 SQL日志输出，生产环境建议关闭，有性能损耗
      p6spy: false
      p6spy: true
      hikari:
        connection-timeout: 30000
        max-lifetime: 1800000

 src/main/resources/mapper/modules/MallGoodsMapper.xml

@@ -85,7 +85,7 @@
                        and a.is_normal = #{record.isNormal}
                    </if>
                    <if test="record.goodsType != null and record.goodsType != '' and record.goodsType != 3">
                        and a.goods_type = #{record.goodsType}
                        and a.goods_type = #{record.goodsType} and a.present_price != 0
                    </if>
                    <if test="record.goodsType == 3">
                        and a.present_price = 0

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

@@ -8,7 +8,7 @@
                            <li class="layui-this">分红设置</li>
                            <li>代理分红</li>
                            <li>排名分红</li>
                            <li>间推分配</li>
                            <li>间推分红</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show" id="bonus-global-setting">
@@ -21,6 +21,7 @@
                            </div>
                            <div class="layui-tab-item">
                                <table id="indirectDistrib" lay-filter="indirectDistrib"></table>
                                <div class="layui-word-aux">间推分红即为隔代收益，将直推奖励按照对应比例依次向上级返利，直至结算到一元为止</div>
                            </div>
                        </div>
                    </div>