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

@@ -20,6 +20,7 @@
import com.doumee.dao.business.*;
import com.doumee.dao.business.MemberRidesMapper;
import com.doumee.dao.business.join.GoodsorderJoinMapper;
import com.doumee.dao.business.join.RefundJoinMapper;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Member;
@@ -86,6 +87,8 @@

    @Autowired
    private RefundMapper refundMapper;
    @Autowired
    private RefundJoinMapper refundJoinMapper;

    @Autowired
    private MemberRidesJoinMapper memberRidesJoinMapper;
@@ -170,39 +173,59 @@
    public PageData<GoodsorderExportVO> findAccountDetailPage(PageWrap<Goodsorder> pageWrap) {
        IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        pageWrap.getModel().setPayStatus(Constants.ONE); //只查询支付成功的
        // 因为修改排序问题
//        MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());

        MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
        Goodsorder model = pageWrap.getModel();
        Utils.MP.blankToNull(model);
        queryWrapper.selectAll(Goodsorder.class);
        queryWrapper.selectAs(Member::getOpenid, Goodsorder::getOpenid);
        queryWrapper.leftJoin(Member.class, Member::getId  ,Goodsorder::getMemberId);
        queryWrapper.select("(select max(r.done_date) from refund r where r.obj_id=t.id  and r.status=2 ) as refund_date");
        queryWrapper.select("(select sum(r.money) from refund r where r.obj_id=t.id and r.status=2) as refund_money");
        //时间段筛选
        if (Objects.nonNull(model.getStartDate())){
            queryWrapper.ge(Goodsorder::getPayDate, Utils.Date.getStart(model.getStartDate()));
        }
        if (Objects.nonNull(model.getEndDate())){
            queryWrapper.le( Goodsorder::getPayDate, Utils.Date.getEnd(model.getEndDate()));
        IPage<GoodsorderExportVO> goodsorderExportVOIPage = null;
        if (Constants.formatIntegerNum(model.getType())==Constants.ZERO){
            MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
            queryWrapper.selectAll(Goodsorder.class);
            queryWrapper.selectAs(Member::getOpenid, Goodsorder::getOpenid);
            queryWrapper.leftJoin(Member.class, Member::getId  ,Goodsorder::getMemberId);
            queryWrapper.select("(select max(r.done_date) from refund r where r.obj_id=t.id  and r.status=2 ) as refund_date");
            queryWrapper.select("(select sum(r.money) from refund r where r.obj_id=t.id and r.status=2) as refund_money");
            //时间段筛选
            if (Objects.nonNull(model.getStartDate())){
                queryWrapper.ge(Goodsorder::getPayDate, Utils.Date.getStart(model.getStartDate()));
            }
            if (Objects.nonNull(model.getEndDate())){
                queryWrapper.le( Goodsorder::getPayDate, Utils.Date.getEnd(model.getEndDate()));
            }

//            queryWrapper.eq(model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus());
//            queryWrapper.like(model.getCode() !=null,Goodsorder::getCode,model.getCode());
//            queryWrapper.like(model.getId() !=null,Goodsorder::getId,model.getId());
//            queryWrapper.eq(model.getStatus() !=null,Goodsorder::getStatus,model.getStatus());
//            queryWrapper.like(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid());
//            queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
            queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
            queryWrapper.eq(Goodsorder::getPayStatus,Constants.ONE);
            queryWrapper.orderByAsc(Goodsorder::getPayDate);
            goodsorderExportVOIPage = goodsorderJoinMapper.selectJoinPage(page, GoodsorderExportVO.class, queryWrapper);
        }else{
            MPJLambdaWrapper<Refund> queryWrapper = new MPJLambdaWrapper<>();
            queryWrapper.selectAs(Refund::getMoney,GoodsorderExportVO::getRefundMoney);
            queryWrapper.selectAs(Refund::getDoneDate,GoodsorderExportVO::getRefundDate);
            queryWrapper.selectAs(Goodsorder::getCloseMoney,GoodsorderExportVO::getCloseMoney);
            queryWrapper.selectAs(Goodsorder::getMoney,GoodsorderExportVO::getMoney);
            queryWrapper.selectAs(Goodsorder::getId,GoodsorderExportVO::getId);
            queryWrapper.selectAs(Goodsorder::getCode,GoodsorderExportVO::getCode);
            queryWrapper.selectAs(Goodsorder::getPayDate,GoodsorderExportVO::getPayDate);
            queryWrapper.selectAs(Member::getOpenid, GoodsorderExportVO::getOpenid);
            queryWrapper.leftJoin(Goodsorder.class, Goodsorder::getId  ,Refund::getObjId);
            queryWrapper.leftJoin(Goodsorder.class, Goodsorder::getId  ,Refund::getObjId);
            queryWrapper.leftJoin(Member.class, Member::getId  ,Goodsorder::getMemberId);
            //时间段筛选
            if (Objects.nonNull(model.getStartDate())){
                queryWrapper.ge(Refund::getDoneDate, Utils.Date.getStart(model.getStartDate()));
            }
            if (Objects.nonNull(model.getEndDate())){
                queryWrapper.le( Refund::getDoneDate, Utils.Date.getEnd(model.getEndDate()));
            }
            queryWrapper.eq(Refund::getStatus,Constants.TWO);//退款完成
            queryWrapper.orderByAsc(Refund::getDoneDate);
            goodsorderExportVOIPage = refundJoinMapper.selectJoinPage(page, GoodsorderExportVO.class, queryWrapper);
        }

        queryWrapper.eq(model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus());
        queryWrapper.like(model.getCode() !=null,Goodsorder::getCode,model.getCode());
        queryWrapper.like(model.getId() !=null,Goodsorder::getId,model.getId());
        queryWrapper.eq(model.getStatus() !=null,Goodsorder::getStatus,model.getStatus());
        queryWrapper.like(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid());
        queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
        queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(Goodsorder::getPayStatus,Constants.ONE);
        queryWrapper.orderByAsc(Goodsorder::getPayDate);
        //type 1 为退款记录
        if (Objects.equals(model.getType(),Constants.ONE)){
            queryWrapper.exists("select * from refund re where re.obj_id = t.id");
        }
        IPage<GoodsorderExportVO> goodsorderExportVOIPage = goodsorderJoinMapper.selectJoinPage(page, GoodsorderExportVO.class, queryWrapper);
        if (!CollectionUtils.isEmpty(goodsorderExportVOIPage.getRecords())){
            goodsorderExportVOIPage.getRecords().forEach(s->{
                s.setMoney(Constants.translateMoney(s.getMoney()));
@@ -215,8 +238,36 @@
    @Override
    public   List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model){
        model.setPayStatus(Constants.ONE); //只查询支付成功的
        MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
        List<GoodsorderExportVO> goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
        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{
            MPJLambdaWrapper<Refund> queryWrapper = new MPJLambdaWrapper<>();
            queryWrapper.selectAs(Refund::getMoney,GoodsorderExportVO::getRefundMoney);
            queryWrapper.selectAs(Refund::getDoneDate,GoodsorderExportVO::getRefundDate);
            queryWrapper.selectAs(Goodsorder::getCode,GoodsorderExportVO::getCode);
            queryWrapper.selectAs(Goodsorder::getId,GoodsorderExportVO::getId);
            queryWrapper.selectAs(Goodsorder::getPayDate,GoodsorderExportVO::getPayDate);
            queryWrapper.selectAs(Goodsorder::getCloseMoney,GoodsorderExportVO::getCloseMoney);
            queryWrapper.selectAs(Goodsorder::getMoney,GoodsorderExportVO::getMoney);
            queryWrapper.selectAs(Member::getOpenid, GoodsorderExportVO::getOpenid);
            queryWrapper.leftJoin(Goodsorder.class, Goodsorder::getId  ,Refund::getObjId);
            queryWrapper.leftJoin(Goodsorder.class, Goodsorder::getId  ,Refund::getObjId);
            queryWrapper.leftJoin(Member.class, Member::getId  ,Goodsorder::getMemberId);
            //时间段筛选
            if (Objects.nonNull(model.getStartDate())){
                queryWrapper.ge(Refund::getDoneDate, Utils.Date.getStart(model.getStartDate()));
            }
            if (Objects.nonNull(model.getEndDate())){
                queryWrapper.le( Refund::getDoneDate, Utils.Date.getEnd(model.getEndDate()));
            }
            queryWrapper.eq(Refund::getStatus,Constants.TWO);//退款完成
            queryWrapper.orderByAsc(Refund::getDoneDate);;
            goodsorderList = refundJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
        }
        if (!CollectionUtils.isEmpty(goodsorderList)){
            goodsorderList.forEach(s->{
                s.setMoney(Constants.translateMoney(s.getMoney()));
@@ -224,27 +275,11 @@
                s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
            });
        }
       /*   List<GoodsorderExportVO> list = new ArrayList<>();
        if(goodsorderList!=null){
            for(Goodsorder order : goodsorderList){
                GoodsorderExportVO vo = new GoodsorderExportVO();
                vo.setId(order.getId());
                vo.setCode(order.getCode());
                vo.setOpenid(order.getMemberOpenid());
                vo.setPayDate(order.getPayDate());
                vo.setCloseDate(order.getCloseDate());
                vo.setMoney(Constants.translateMoney(order.getMoney()));
                vo.setCloseMoney(Constants.translateMoney(order.getCloseMoney()));
                vo.setRefundDate(order.getRefundDate());
                vo.setRefundMoney(Constants.translateMoney(order.getRefundMoney()));
                list.add(vo);
            }
        }*/
        return goodsorderList;
    }
    private MPJLambdaWrapper<Goodsorder> initQueryParamByModel(Goodsorder model) {
        MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(model);
        MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Goodsorder.class);
        queryWrapper.selectAs(Member::getOpenid, Goodsorder::getOpenid);
        queryWrapper.leftJoin(Member.class, Member::getId  ,Goodsorder::getMemberId);
@@ -266,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;
    }

@@ -275,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());
@@ -321,7 +357,7 @@
        homeResponse.setAdList(adMapper.selectList(new QueryWrapper<Ad>()
                .eq("isdeleted",Constants.ZERO)
                .eq("status",Constants.ZERO)
                .orderByDesc("create_date")
                .orderByAsc("sortnum")
        ));;
        if(!Objects.isNull(homeResponse.getAdList())&&homeResponse.getAdList().size()>Constants.ZERO){
            homeResponse.getAdList().forEach(i->{
@@ -443,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){
@@ -518,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());
@@ -543,6 +582,10 @@
                }
            }
        }
        //如果订单价格封顶了，取订单 价格
        if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){
            closeMoney = yjMoney;
        }
        ridesDetailResponse.setDuration(durationSum);
        ridesDetailResponse.setAmount(closeMoney);
        ridesDetailResponse.setBikeType(topRides.getParamName());
@@ -554,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);
        //取最高车型作为计价方案
@@ -697,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())
@@ -735,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());