jiangping
2025-02-18 9d67b4462bf494a0b25c1b40be8198f71666131e
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -89,6 +89,7 @@
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private MemberMapper memberMapper;
    @Autowired
@@ -531,7 +532,11 @@
        if(r != null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "该订单存在退款申请正在处理中,请稍后查看订单信息哦~");
        }
        List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());
        List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());//打车骑行记录
        dealCloseGoodsorderBiz(goodsorder,type,memberRides);
    }
    @Override
    public void dealCloseGoodsorderBiz(Goodsorder goodsorder, int type, List<MemberRides> memberRides) {
        //默认结算为押金金额
        BigDecimal closeMoney = new BigDecimal(0.00);
        if (!CollectionUtils.isEmpty(memberRides)){
@@ -563,7 +568,8 @@
            closeGoodsorderDoneNoRefund(goodsorder,type,new BigDecimal(0),null,memberRides);
        }
    }
    public void closeGoodsorderDoneNoRefund(Goodsorder goodsorder,int type,BigDecimal refundMoney,String closeId,List<MemberRides> memberRides ) {
    public void closeGoodsorderDoneNoRefund(Goodsorder goodsorder,int type,BigDecimal refundMoney,String closeId,List<MemberRides> memberRides) {
        log.error("========================================"+JSONObject.toJSONString(goodsorder));
        if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
            return;
@@ -806,19 +812,20 @@
        return ridesDetailResponse;
    }
    private List<MemberRides> getMemberRidesForClose(String id) {
    @Override
    public List<MemberRides> getMemberRidesForClose(String id) {
        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)
                .select("select b.device_sn from bikes b where b.isdeleted=0 and b.code = t.bike_code limit 1",MemberRides::getDeviceSn)
                .selectAs(BaseParam::getSortnum, MemberRides::getSortnum)
                .selectAs(BaseParam::getName, MemberRides::getParamName);
        wrapper.leftJoin(BaseParam.class, BaseParam::getId, MemberRides::getParamId);
        wrapper.orderByDesc(BaseParam::getSortnum);
        //取最高车型作为计价方案
        //查询所有骑行记录
        List<MemberRides> memberRides = memberRidesJoinMapper.selectList(wrapper);
        List<MemberRides> memberRides = memberRidesJoinMapper.selectJoinList(MemberRides.class,wrapper);
        return memberRides;
    }
@@ -1187,7 +1194,7 @@
    @Override
    public void autoCloseOrder( ) {
         Goodsorder goodsorder = new Goodsorder();
        Goodsorder goodsorder = new Goodsorder();
        goodsorder.setIsdeleted(Constants.ZERO);
        goodsorder.setStatus(Constants.goodsorderStatus.pay);
        List<Goodsorder> list = findList(goodsorder);