修改bug

puzhibing

2024-05-06 cf71570fb38ad1983cd40e65fb09e259e509d2a3

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/RedEnvelopeController.java

@@ -74,31 +74,31 @@
            @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<MyRedEnvelope> queryMyRedEnvelope(Integer pageNum, Integer size, HttpServletRequest request){
    public ResultUtil<List<MyRedEnvelope>> queryMyRedEnvelope(Integer pageNum, Integer size, HttpServletRequest request){
        try {
            Integer uid = userInfoService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            List<UserRedPacketRecord> userRedPacketRecords = userRedPacketRecordService.selectList(new EntityWrapper<UserRedPacketRecord>().eq("userId", uid).ne("state", 0));
            List<Double> collect = userRedPacketRecords.stream().map(UserRedPacketRecord::getMoney).collect(Collectors.toList());
            double sum = collect.stream().mapToDouble(Double::doubleValue).sum();

            double sum1 = userRedPacketRecords.stream().filter(v -> v.getRemainingAmount().compareTo(0D) > 0).map(UserRedPacketRecord::getRemainingAmount).mapToDouble(Double::doubleValue).sum();

            List<Map<String, Object>> list = userRedPacketRecordService.queryMyRedEnvelope(pageNum, size, uid);
            List<BaseWarpper> baseWarppers = new ArrayList<>();
            List<MyRedEnvelope> baseWarppers = new ArrayList<>();
            for(Map<String, Object> map : list){
                BaseWarpper baseWarpper = new BaseWarpper();
                MyRedEnvelope baseWarpper = new MyRedEnvelope();
                baseWarpper.setId(null != map.get("id") ? Integer.valueOf(String.valueOf(map.get("id"))) : 0);
                baseWarpper.setAmount(null != map.get("money") ? Double.valueOf(String.valueOf(map.get("money"))) : 0);
                baseWarpper.setName(null != map.get("name") ? String.valueOf(map.get("name")) : "");
                baseWarpper.setContent(null != map.get("insertTime") ? String.valueOf(map.get("insertTime")) : "");
                baseWarpper.setTotalAmount(sum);
                baseWarpper.setRemainingAmount(sum1);
                baseWarppers.add(baseWarpper);
            }
            MyRedEnvelope myRedEnvelope = new MyRedEnvelope();
            myRedEnvelope.setList(baseWarppers);
            List<UserRedPacketRecord> userRedPacketRecords = userRedPacketRecordService.selectList(new EntityWrapper<UserRedPacketRecord>().eq("userId", uid).ne("state", 0));
            List<Double> collect = userRedPacketRecords.stream().map(UserRedPacketRecord::getMoney).collect(Collectors.toList());
            double sum = collect.stream().mapToDouble(Double::doubleValue).sum();
            myRedEnvelope.setTotalAmount(sum);
            double sum1 = userRedPacketRecords.stream().filter(v -> v.getRemainingAmount().compareTo(0D) > 0).map(UserRedPacketRecord::getRemainingAmount).mapToDouble(Double::doubleValue).sum();
            myRedEnvelope.setRemainingAmount(sum1);
            return ResultUtil.success(myRedEnvelope);
            return ResultUtil.success(baseWarppers);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
@@ -121,7 +121,7 @@
            @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<TravelRecordWarpper> queryRedEnvelope(Integer language, Integer pageNum, Integer size, HttpServletRequest request){
    public ResultUtil<List<TravelRecordListWarpper>> queryRedEnvelope(Integer language, Integer pageNum, Integer size, HttpServletRequest request){
        try {
            Integer uid = userInfoService.getUserIdFormRedis(request);
            if(null == uid){
@@ -137,9 +137,9 @@
            list.addAll(list1);
    
            List<TravelRecordListWarpper> orderWarpper = TravelRecordListWarpper.getTravelRecordWarpper(list);
            BigDecimal toal = BigDecimal.ZERO;
            double sum = orderWarpper.stream().mapToDouble(TravelRecordListWarpper::getMoney).sum();
            for (TravelRecordListWarpper travelRecordListWarpper : orderWarpper) {
                toal = toal.add(new BigDecimal(travelRecordListWarpper.getMoney()));
                travelRecordListWarpper.setTotal(sum);
            }

            //分页
@@ -150,10 +150,7 @@
            }else{
                orderWarpper = new ArrayList<>();
            }
            TravelRecordWarpper travelRecordWarpper = new TravelRecordWarpper();
            travelRecordWarpper.setList(orderWarpper);
            travelRecordWarpper.setTotal(toal.doubleValue());
            return ResultUtil.success(travelRecordWarpper);
            return ResultUtil.success(orderWarpper);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();