Merge remote-tracking branch 'origin/dev' into dev

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

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

@@ -241,6 +241,7 @@
        List<GoodsorderExportVO> goodsorderList = null;
        if(Constants.formatIntegerNum(model.getType())==Constants.ZERO){
            MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
            queryWrapper.orderByAsc(Goodsorder::getPayDate);
           goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);

        }else{
@@ -264,7 +265,7 @@
                queryWrapper.le( Refund::getDoneDate, Utils.Date.getEnd(model.getEndDate()));
            }
            queryWrapper.eq(Refund::getStatus,Constants.TWO);//退款完成
            queryWrapper.orderByAsc(Refund::getDoneDate);
            queryWrapper.orderByAsc(Refund::getDoneDate);;
            goodsorderList = refundJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
        }
        if (!CollectionUtils.isEmpty(goodsorderList)){
@@ -300,7 +301,7 @@
        queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
        queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(Goodsorder::getPayStatus,Constants.ONE);
        queryWrapper.orderByDesc(Goodsorder::getPayDate);

        return  queryWrapper;
    }

@@ -309,6 +310,7 @@
    public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
        IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
        queryWrapper.orderByDesc(Goodsorder::getPayDate);
        queryWrapper.select("(select  er.status from member_rides  er  where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus");
        if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ZERO)){
            queryWrapper.ne(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
@@ -477,13 +479,12 @@
    @Override
    public void closeGoodsorder( Goodsorder goodsorder ,int type ) {

//
        List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());
        //默认结算为押金金额
        BigDecimal closeMoney = new BigDecimal(0.00);
        if (!CollectionUtils.isEmpty(memberRides)){
            //骑行总时长
            closeMoney = getCloseMoneyByRides(memberRides,true).getAmount();
            closeMoney = getCloseMoneyByRides(memberRides,true,goodsorder.getMoney()).getAmount();
            //实际结算价格，记录在最高车型记录上
            memberRides.get(0).setActualPrice(closeMoney);
            for(MemberRides model :memberRides){
@@ -552,18 +553,22 @@
        goodsorderMapper.updateById(update);
    }

    private RidesDetailResponse    getCloseMoneyByRides(List<MemberRides> memberRides,boolean isClose) {
    private RidesDetailResponse    getCloseMoneyByRides(List<MemberRides> memberRides,boolean isClose,BigDecimal yjMoney) {
        RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
        BigDecimal closeMoney = new BigDecimal(0.00);
        int durationSum = 0;
        MemberRides topRides =memberRides.get(0);
        //取最高车型计算方案结算订单
        for(MemberRides rides : memberRides){
            if ( isClose && Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(rides.getStatus()))){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"当前订单有未完成的骑行，无法强制结算");
            }
            durationSum += Constants.formatIntegerNum(rides.getDuration());//累计骑行（计费）时长
            if(Constants.formatIntegerNum(topRides.getSortnum())<Constants.formatIntegerNum(rides.getSortnum())){
                topRides = rides;
            }
        }
        MemberRides topRides =memberRides.get(0);
//      MemberRides topRides =memberRides.get(0);
        if(durationSum > 0 && topRides != null){
            int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
            closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
@@ -577,6 +582,10 @@
                }
            }
        }
        //如果订单价格封顶了，取订单 价格
        if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){
            closeMoney = yjMoney;
        }
        ridesDetailResponse.setDuration(durationSum);
        ridesDetailResponse.setAmount(closeMoney);
        ridesDetailResponse.setBikeType(topRides.getParamName());
@@ -588,7 +597,9 @@
        MPJLambdaWrapper<MemberRides> wrapper = new MPJLambdaWrapper<>();
        wrapper.eq(MemberRides::getOrdreId,id);
        wrapper.ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
        wrapper.selectAll(MemberRides.class).selectAs(BaseParam::getName, MemberRides::getParamName);
        wrapper.selectAll(MemberRides.class)
                .selectAs(BaseParam::getSortnum, MemberRides::getSortnum)
                .selectAs(BaseParam::getName, MemberRides::getParamName);
        wrapper.leftJoin(BaseParam.class, BaseParam::getId, MemberRides::getParamId);
        wrapper.orderByDesc(BaseParam::getSortnum);
        //取最高车型作为计价方案
@@ -731,6 +742,7 @@
        List<MemberRides> memberRides = memberRidesJoinMapper.selectJoinList(MemberRides.class,new MPJLambdaWrapper<MemberRides>()
                .selectAll(MemberRides.class)
                .selectAs(BaseParam::getName,MemberRides::getParamName)
                .selectAs(BaseParam::getSortnum,MemberRides::getSortnum)
                .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
                .eq(MemberRides::getOrdreId,id)
                .in(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey())
@@ -769,7 +781,7 @@
                return memberRidesResponse;
            }).collect(Collectors.toList());
            //累计和预算结算金额
            RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,false);;
            RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,false,goodsorder.getMoney());
            if(Constants.formatIntegerNum(goodsorder.getStatus())!= Constants.goodsorderStatus.pay){
                //如果非已支付但未结算，使用订单金额
                ridesDetailResponse.setAmount(goodsorder.getCloseMoney());