洪城义警-正式版后台
zengh
2022-02-16 cac5be41ea0bcc523360287a258501fcd59fdc72
问题修复
6 files modified
26 ■■■■ changed files
src/main/java/org/springblade/modules/integral/controller/IntegralController.java 4 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/integral/entity/Integral.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml 13 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/integral/service/IIntegralService.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/integral/controller/IntegralController.java
@@ -134,8 +134,9 @@
     * @return
     */
    @PostMapping("/selectCount")
    public R selectCount(String uid) {
    public R selectCount(String uid,String type) {
        List<Map<Object, Object>> list = integralService.selectCount(uid);
        List<Map<Object, Object>> listAll = integralService.selectList(uid,type);
        Map map = new HashMap();
        Integer a = Integer.parseInt(list.get(0).get("integral").toString());
        Integer b = Integer.parseInt(list.get(1).get("integral").toString());
@@ -145,6 +146,7 @@
        map.put("yjf", list.get(1));
        //剩余积分
        map.put("sjf", a - b);
        map.put("list",listAll);
        return R.data(map);
    }
src/main/java/org/springblade/modules/integral/entity/Integral.java
@@ -45,7 +45,7 @@
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Integer uid;
    private Long uid;
    /**
     * 获取途径
     */
src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java
@@ -41,4 +41,5 @@
     */
    List<IntegralVO> selectIntegralPage(IPage page, IntegralVO integral);
    List<Map<Object, Object>> selectCount(String uid);
    List<Map<Object, Object>> selectList(String uid,String type);
}
src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml
@@ -15,7 +15,6 @@
    <select id="selectIntegralPage" resultMap="integralResultMap">
        select *
        from sys_integral
        where is_deleted = 0
    </select>
    <select id="selectCount" resultType="java.util.HashMap">
@@ -27,5 +26,17 @@
        FROM sys_integral
        WHERE type = 2 AND uid=#{uid}
    </select>
    <select id="selectList" resultType="org.springblade.modules.integral.entity.Integral">
        SELECT *
        FROM sys_integral
        WHERE uid=#{uid}
        <if test="type == 2  ">
            and type =1
        </if>
        <if test="type == 3  ">
            and type =2
        </if>
    </select>
</mapper>
src/main/java/org/springblade/modules/integral/service/IIntegralService.java
@@ -41,4 +41,5 @@
     */
    IPage<IntegralVO> selectIntegralPage(IPage<IntegralVO> page, IntegralVO integral);
    List<Map<Object, Object>>  selectCount(String uid);
    List<Map<Object, Object>>  selectList(String uid,String type);
}
src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java
@@ -46,4 +46,9 @@
        return baseMapper.selectCount(uid);
    }
    @Override
    public List<Map<Object, Object>>  selectList(String uid,String type) {
        return baseMapper.selectList(uid,type);
    }
}