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,7 +479,6 @@
    @Override
    public void closeGoodsorder( Goodsorder goodsorder ,int type ) {

//
        List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());
        //默认结算为押金金额
        BigDecimal closeMoney = new BigDecimal(0.00);
@@ -567,7 +568,7 @@
                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());