20221021

xiaoyong931011

2022-10-29 46d4d48921282a696b901f8ae888996fdb7a5f5d

20221021

 src/main/java/cc/mrbird/febs/dapp/mapper/DataDictionaryCustomMapper.java

@@ -18,5 +18,5 @@

    int updateDicValueByTypeAndCode(@Param("type") String type, @Param("code") String code, @Param("value") String value);

    DataDictionaryCustom selectDicDataByTypeAndCodeAndDesc(@Param("type") String type, @Param("code") String code, @Param("description") String plan);
    DataDictionaryCustom selectDicDataByTypeAndCodeAndDesc(@Param("type") String type, @Param("description") String plan);
}

 src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java

@@ -203,7 +203,6 @@
                    //获取挂机方案
                    DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCodeAndDesc(
                            DataDictionaryEnum.PLAN_A.getType(),
                            DataDictionaryEnum.PLAN_A.getCode(),
                            Integer.toString(Integer.parseInt(plan)+1));
                    String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
                    JSONObject levelMemberValueParse = JSONUtil.parseObj(dataDictionaryCustomValue);

 src/main/resources/mapper/dapp/DataDictionaryCustomMapper.xml

@@ -37,7 +37,6 @@
    <select id="selectDicDataByTypeAndCodeAndDesc" resultType="cc.mrbird.febs.dapp.entity.DataDictionaryCustom">
        select * from data_dictionary_custom a
        where a.type=#{type}
          and a.code=#{code}
          and a.description=#{description}
    </select>
</mapper>

 src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml

@@ -12,7 +12,7 @@
    <update id="updateAvaAmountById">
        update igt_on_hook_plan_order
        set
            ava_amount = ava_amount - #{amount},
            ava_amount = ava_amount - #{amount}
        where
            id = #{id}
          and ava_amount - #{amount} <![CDATA[ >= ]]> 0
@@ -21,7 +21,7 @@
    <update id="addAvaAmountById">
        update igt_on_hook_plan_order
        set
            ava_amount = ava_amount + #{amount},
            ava_amount = ava_amount + #{amount}
        where
            id = #{id}
    </update>

 src/test/java/cc/mrbird/febs/JunitTest.java

@@ -384,7 +384,6 @@
                    //获取挂机方案
                    DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCodeAndDesc(
                            DataDictionaryEnum.PLAN_A.getType(),
                            DataDictionaryEnum.PLAN_A.getCode(),
                            Integer.toString(Integer.parseInt(plan)+1));
                    String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
                    JSONObject levelMemberValueParse = JSONUtil.parseObj(dataDictionaryCustomValue);