111

k94314517

2023-10-12 c1a1cd48890eace1bec11fab89e9d9bef0ec8cf9

 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -252,14 +252,16 @@
                .eq("isdeleted",Constants.ZERO)
                .eq("status",Constants.ZERO)
                .orderByDesc("create_date")
        ));
        //查询是否存在 已支付的 押金订单
        Integer status = this.goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>()
                .eq("member_id",memberId)
                .eq("status",Constants.goodsorderStatus.pay));
        homeResponse.setDepositStatus(status);
        ));;
        homeResponse.setRideStatus(-1);
        if(homeResponse.getDepositStatus()==Constants.goodsorderStatus.pay) {
        //查询是否存在 已支付的 押金订单
        Goodsorder goodsorder = this.goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>()
                .eq("member_id",memberId)
                .eq("status",Constants.goodsorderStatus.pay)
                .last(" limit 1 "));
        if(!Objects.isNull(goodsorder)&&goodsorder.getStatus().equals(Constants.goodsorderStatus.pay)){
            homeResponse.setDepositStatus(Constants.goodsorderStatus.pay);
            homeResponse.setGoodsOrderId(goodsorder.getId());
            //查询当前骑行状态
            MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().eq("member_id", memberId)
                    .orderByDesc(" create_date ")
@@ -277,8 +279,8 @@
                memberRidesResponse.setBikeCode(memberRides.getBikeCode());
                memberRidesResponse.setBasePrice(memberRides.getBasePrice());
                memberRidesResponse.setBaseTime(memberRides.getBaseTime());
                memberRidesResponse.setUnitTime(memberRidesResponse.getUnitTime());
                memberRidesResponse.setUnitPrice(memberRidesResponse.getUnitPrice());
                memberRidesResponse.setUnitTime(memberRides.getUnitTime());
                memberRidesResponse.setUnitPrice(memberRides.getUnitPrice());
                homeResponse.setMemberRidesResponse(memberRidesResponse);
            }
        }
@@ -605,7 +607,7 @@
                memberRidesResponse.setBikeCode(s.getBikeCode());
                memberRidesResponse.setBasePrice(s.getBasePrice());
                memberRidesResponse.setBaseTime(s.getBaseTime());
                memberRidesResponse.setUnitPrice(s.getUnitTime());
                memberRidesResponse.setUnitPrice(s.getUnitPrice());
                memberRidesResponse.setUnitTime(s.getUnitTime());
                if ( Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(s.getStatus()))){
                    //如果是骑行中