bug修改

无关风月

2024-07-05 cb7edabb2232bc9901725d562a2b4ec56d174a07

bug修改

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java

@@ -232,7 +232,7 @@
                temp += tOrder.getCount();
            }
            if (dto.getTotal()<temp){
                return R.fail("商品总数不能小于当前商品已兑换数量,"+"当前商品已兑换数量为:"+temp);
                return R.fail("商品总数不能小于当前商品已兑换数量，"+"当前商品已兑换数量为:"+temp);
            }
        }
        goodsService.updateById(dto);
@@ -265,12 +265,13 @@
     */
    @GetMapping("/exchangeRecord")
    @ApiOperation(value = "学习端-兑换记录", tags = {"学习端-商城"})
    public R<List<ExchangeRecordVO>> exchangeRecord() {
    public R<PageInfo<ExchangeRecordVO>> exchangeRecord(Integer pageNumber,Integer pageSize) {
        PageInfo<ExchangeRecordVO> res = new PageInfo<>(pageNumber, pageSize);
        LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
        if (null == loginUserStudy) {
            return R.tokenError("登录失效！");
        }
        List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(tokenService.getLoginUserStudy().getUserid());
        List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(res,tokenService.getLoginUserStudy().getUserid());
        for (ExchangeRecordVO record : exchangeRecord) {
            TGoods goods = goodsService.getById(record.getGoodsId());
            List<String> typeList;
@@ -283,16 +284,19 @@
            }
            record.setGoodsType(typeList);
        }
        return R.ok(exchangeRecord);
        res.setRecords(exchangeRecord);
        res.setTotal(exchangeRecord.size());
        return R.ok(res);
    }

    @GetMapping("/exchangeRecordParent")
    @ApiOperation(value = "家长端-兑换记录", tags = {"家长端-兑换记录"})
    public R<List<ExchangeRecordVO>> exchangeRecordParent() {
    public R<PageInfo<ExchangeRecordVO>> exchangeRecordParent(Integer pageNumber,Integer pageSize) {
        PageInfo<ExchangeRecordVO> res = new PageInfo<>(pageNumber, pageSize);
        if (tokenService.getLoginUser1() == null) {
            return R.tokenError("登录失效");
        }
        List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(tokenService.getLoginUser1().getUserid());
        List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(res,tokenService.getLoginUser1().getUserid());
        for (ExchangeRecordVO record : exchangeRecord) {
            TGoods goods = goodsService.getById(record.getGoodsId());
            List<String> typeList;
@@ -305,7 +309,9 @@
            }
            record.setGoodsType(typeList);
        }
        return R.ok(exchangeRecord);
        res.setRecords(exchangeRecord);
        res.setTotal(exchangeRecord.size());
        return R.ok(res);
    }

    /**

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/TOrderMapper.java

@@ -1,6 +1,7 @@
package com.ruoyi.goods.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.goods.domain.TOrder;
import com.ruoyi.goods.dto.OrderQuery;
import com.ruoyi.goods.vo.ExchangeRecordVO;
@@ -35,5 +36,5 @@
     * @param userid 用户id
     * @return 兑换记录
     */
    List<ExchangeRecordVO> exchangeRecord(Integer userid);
    List<ExchangeRecordVO> exchangeRecord(@Param("pageInfo")PageInfo<ExchangeRecordVO> pageInfo,@Param("id") Integer userid);
}

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/ITOrderService.java

@@ -2,6 +2,7 @@


import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.goods.domain.TOrder;
import com.ruoyi.goods.dto.OrderQuery;
import com.ruoyi.goods.vo.ExchangeRecordVO;
@@ -35,5 +36,5 @@
     * @param userid 用户id
     * @return 兑换记录
     */
    List<ExchangeRecordVO> exchangeRecord(Integer userid);
    List<ExchangeRecordVO> exchangeRecord(PageInfo<ExchangeRecordVO> pageInfo, Integer userid);
}

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TOrderServiceImpl.java

@@ -1,6 +1,7 @@
package com.ruoyi.goods.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.goods.domain.TOrder;
import com.ruoyi.goods.dto.OrderQuery;
import com.ruoyi.goods.mapper.TOrderMapper;
@@ -33,8 +34,8 @@
    }

    @Override
    public List<ExchangeRecordVO> exchangeRecord(Integer userid) {
        return baseMapper.exchangeRecord(userid);
    public List<ExchangeRecordVO> exchangeRecord(PageInfo<ExchangeRecordVO> pageInfo, Integer userid) {
        return baseMapper.exchangeRecord(pageInfo,userid);
    }

}

 ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TOrderMapper.xml

@@ -78,7 +78,7 @@
        select o.*, g.id as goodsId, g.name as goodsName,g.coverImg
        from t_order o
                 left join t_goods g on o.goodsId = g.id
        where o.userId = #{userid}
        where o.userId = #{id}
        order by o.createTime desc
    </select>
</mapper>

 ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TGoodsController.java

@@ -121,9 +121,12 @@
    @ResponseBody
    @PostMapping("/updateGoods")
    @ApiOperation(value = "修改", tags = {"后台-商品管理"})
    public AjaxResult<TGoods> updateGoods(@RequestBody TGoods dto) {
        goodsClient.updateGoods(dto);
        return AjaxResult.success("修改成功");
    public R updateGoods(@RequestBody TGoods dto) {
        R r = goodsClient.updateGoods(dto);
        if (r.getCode()!=200){
            return R.fail(r.getMsg());
        }
        return R.ok("修改成功");
    }
    @ResponseBody
    @PostMapping("/getGoodsInfo")

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java

@@ -778,7 +778,7 @@
                .eq(TGameRecord::getDisabled, 0).list();
        int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
        Integer totalStudy = userStudy.getTotalStudy();
        userStudy.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
        userStudy.setTotalStudy(Math.round((float) (totalStudy) / 3600));
        return R.ok(new UserPersonalCenterVO(user, userStudy));
    }