jiaosong
2023-10-18 051abca66db233f5dbde3f69aa706422e1ac9fd9
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -227,7 +227,15 @@
    public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
        IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
        return PageData.from(goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class,queryWrapper));
        IPage<Goodsorder> goodsorderIPage = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper);
        if (!CollectionUtils.isEmpty(goodsorderIPage.getRecords())){
            goodsorderIPage.getRecords().forEach(s->{
                s.setMoney(Constants.translateMoney(s.getMoney()));
                s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()));
                s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
            });
        }
        return PageData.from(goodsorderIPage);
    }
@@ -633,7 +641,7 @@
                memberRidesResponse.setUnitTime(s.getUnitTime());
                if ( Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(s.getStatus()))){
                    //如果是骑行中
                    s.setDuration(rideTime> finalFreeTime ?(rideTime- finalFreeTime):0);
                    s.setDuration(rideTime> finalFreeTime ?(rideTime):0);
                }
                s.setRideTime(rideTime);
                return memberRidesResponse;