jtt808初始化

jiangping

2025-02-19 da045f4ac67ac3d4f55b2dd34e9a59fb7afc0c58

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

@@ -30,10 +30,7 @@
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
import com.doumee.dao.business.web.request.BikeRepairDTO;
import com.doumee.dao.business.web.request.GoodsorderCanBanlanceDTO;
import com.doumee.dao.business.web.request.MemberRidesQuery;
import com.doumee.dao.business.web.request.RefundDTO;
import com.doumee.dao.business.web.request.*;
import com.doumee.dao.business.web.response.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
@@ -45,6 +42,7 @@
import com.wechat.pay.java.service.partnerpayments.jsapi.JsapiServiceExtension;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.*;
import com.wechat.pay.java.service.refund.model.RefundNotification;
import com.wechat.pay.java.service.refund.model.Status;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -79,19 +77,26 @@
    private GoodsorderMapper goodsorderMapper;

    @Autowired
    private DiscountMemberMapper discountMemberMapper;

    @Autowired
    private DiscountLogMapper discountLogMapper;

    @Autowired
    GoodsorderJoinMapper goodsorderJoinMapper;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;



    @Autowired
    private MemberMapper memberMapper;
    @Autowired
    private BaseParamMapper baseParamMapper;

    @Autowired
    private RefundMapper refundMapper;

    @Autowired
    private RefundJoinMapper refundJoinMapper;

@@ -240,6 +245,8 @@
        }
        return PageData.from(goodsorderExportVOIPage);
    }


    @Override
    public   List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model){
        model.setPayStatus(Constants.ONE); //只查询支付成功的
@@ -287,7 +294,9 @@
        MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Goodsorder.class);
        queryWrapper.selectAs(Member::getOpenid, Goodsorder::getOpenid);
        queryWrapper.selectAs(DiscountMember::getName, Goodsorder::getDiscountName);
        queryWrapper.leftJoin(Member.class, Member::getId  ,Goodsorder::getMemberId);
        queryWrapper.leftJoin(DiscountMember.class, DiscountMember::getId  ,Goodsorder::getObjId);
        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");
        //时间段筛选
@@ -316,23 +325,30 @@
        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");
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Goodsorder::getType,pageWrap.getModel().getType());
        queryWrapper.select("(select  sum(er.discount_price) from member_rides  er  where er.ordre_id=t.id and er.isdeleted=0) as discountMoney," +
                "(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());
        }
        if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ONE)){
            queryWrapper.eq(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
        }
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getDiscountName()),Goodsorder::getDiscountName,pageWrap.getModel().getDiscountName());
        IPage<Goodsorder> goodsorderIPage = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper);
        if (!CollectionUtils.isEmpty(goodsorderIPage.getRecords())){
            goodsorderIPage.getRecords().forEach(s->{
                s.setMoney(Constants.translateMoney(s.getMoney()));
                s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()));
                s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
                s.setDiscountMoney(Constants.translateMoney(s.getDiscountMoney()));
            });
        }
        return PageData.from(goodsorderIPage);
    }





    @Override
@@ -375,41 +391,55 @@
                .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>().lambda()
                    .eq(MemberRides::getMemberId, memberId)
                    .eq(MemberRides::getOrdreId,goodsorder.getId())
                    .ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey())
                    .orderByDesc(MemberRides::getCreateDate)
                    .last(" limit 1  "));
            if (!Objects.isNull(memberRides)) {
                homeResponse.setRideStatus(memberRides.getStatus());
                MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
                BaseParam baseParam = baseParamMapper.selectById(memberRides.getParamId());
                if(!Objects.isNull(baseParam)){
                    memberRidesResponse.setBikeType(baseParam.getName());
        homeResponse.setDepositStatus(Constants.ZERO);
        if(goodsorder!=null){
            Refund r =  this.refundMapper.selectOne(new QueryWrapper<Refund>().lambda()
                    .eq(Refund::getObjId,goodsorder.getId())
                    .eq(Refund::getIsdeleted,Constants.ZERO)
                    .eq(Refund::getStatus,Constants.ZERO)
                    .last("limit 1" ));
            if(r!=null){
                homeResponse.setDepositStatus(Constants.TWO);
            }else{
                homeResponse.setDepositStatus(Constants.ONE);
            }
            if( goodsorder.getStatus().equals(Constants.goodsorderStatus.pay)){
                homeResponse.setGoodsOrderId(goodsorder.getId());
                //查询当前骑行状态
                MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().lambda()
                        .eq(MemberRides::getMemberId, memberId)
                        .eq(MemberRides::getOrdreId,goodsorder.getId())
                        .ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey())
                        .orderByDesc(MemberRides::getCreateDate)
                        .last(" limit 1  "));
                if (!Objects.isNull(memberRides)) {
                    homeResponse.setRideStatus(memberRides.getStatus());
                    MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
                    BaseParam baseParam = baseParamMapper.selectById(memberRides.getParamId());
                    if(!Objects.isNull(baseParam)){
                        memberRidesResponse.setBikeType(baseParam.getName());
                    }
                    memberRidesResponse.setRideId(memberRides.getId());
                    memberRidesResponse.setRideStartTime(memberRides.getRentDate());
                    memberRidesResponse.setRideStartTimeStr(DateUtil.DateToStr(memberRides.getRentDate(),"HH:mm"));
                    memberRidesResponse.setRideEndTime(memberRides.getBackDate());
                    memberRidesResponse.setRideEndTimeStr(DateUtil.DateToStr(memberRides.getBackDate(),"HH:mm"));
                    memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRides.getRentDate(),memberRides.getBackDate()));
                    memberRidesResponse.setBikeCode(memberRides.getBikeCode());
                    memberRidesResponse.setBasePrice(memberRides.getBasePrice());
                    memberRidesResponse.setBaseTime(memberRides.getBaseTime());
                    memberRidesResponse.setUnitTime(memberRides.getUnitTime());
                    memberRidesResponse.setUnitPrice(memberRides.getUnitPrice());
                    memberRidesResponse.setPriceRole(PricingDetailServiceImpl.getRoleNameByParam(
                            memberRidesResponse.getBasePrice(),memberRidesResponse.getBaseTime(),
                            memberRidesResponse.getUnitPrice()
                            ,memberRidesResponse.getUnitTime()));
                    homeResponse.setMemberRidesResponse(memberRidesResponse);
                }
                memberRidesResponse.setRideId(memberRides.getId());
                memberRidesResponse.setRideStartTime(memberRides.getRentDate());
                memberRidesResponse.setRideStartTimeStr(DateUtil.DateToStr(memberRides.getRentDate(),"HH:mm"));
                memberRidesResponse.setRideEndTime(memberRides.getBackDate());
                memberRidesResponse.setRideEndTimeStr(DateUtil.DateToStr(memberRides.getBackDate(),"HH:mm"));
                memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRides.getRentDate(),memberRides.getBackDate()));
                memberRidesResponse.setBikeCode(memberRides.getBikeCode());
                memberRidesResponse.setBasePrice(memberRides.getBasePrice());
                memberRidesResponse.setBaseTime(memberRides.getBaseTime());
                memberRidesResponse.setUnitTime(memberRides.getUnitTime());
                memberRidesResponse.setUnitPrice(memberRides.getUnitPrice());
                memberRidesResponse.setPriceRole(PricingDetailServiceImpl.getRoleNameByParam(
                        memberRidesResponse.getBasePrice(),memberRidesResponse.getBaseTime(),
                        memberRidesResponse.getUnitPrice()
                        ,memberRidesResponse.getUnitTime()));
                homeResponse.setMemberRidesResponse(memberRidesResponse);
            }
        }


        return homeResponse;
    }

@@ -456,6 +486,12 @@
        GoodsorderDetailDTO goodsorderDetailDTO = new GoodsorderDetailDTO();
        goodsorderDetailDTO.setPayOrderDTOList(payOrderDTOList);//交易明细
        goodsorderDetailDTO.setMemberRidesList(memberRides);//骑行记录
        if(memberRides!=null){
            for(BikeLogDTO dd: memberRides){
                goodsorder.setDiscountMoney(Constants.formatDecimalNum(goodsorder.getDiscountMoney()).add(Constants.formatDecimalNum(dd.getDiscountPrice())));
            }
            goodsorder.setDiscountMoney(Constants.translateMoney(goodsorder.getDiscountMoney()));
        }
        goodsorderDetailDTO.setModel(goodsorder);//订单对象
        return goodsorderDetailDTO;
    }
@@ -496,28 +532,111 @@
        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)){
            //骑行总时长
            closeMoney = getCloseMoneyByRides(memberRides,true,goodsorder.getMoney()).getAmount();
            //预计结算价格和计算时长
            int freeTime = 0;
            try {
                freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
            }catch (Exception e){
            }
            closeMoney = getCloseMoneyByRides(memberRides,freeTime,true,goodsorder.getMoney()).getAmount();
            //实际结算价格，记录在最高车型记录上
            memberRides.get(0).setActualPrice(closeMoney);
//            memberRides.get(0).setActualPrice(closeMoney);
        }
        int refundMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(closeMoney)).intValue();//计算价格
        RefundDTO refundDTO = new RefundDTO();
        refundDTO.setOrderId(goodsorder.getId());
        refundDTO.setCanBalance(goodsorder.getMoney());
        refundDTO.setRefundAmount(new BigDecimal(refundMoney));
        refundDTO.setTotalAmount(goodsorder.getMoney());
        refundDTO.setMemberId(goodsorder.getMemberId());
        refundDTO.setReason(Constants.REFUND_TYPE.get(type).getName());
        refundDTO.setCreator(goodsorder.getEditor());
        refundDTO.setType(type);
        wxMiniUtilService.wxRefund(refundDTO);
        if(refundMoney>0){
            RefundDTO refundDTO = new RefundDTO();
            refundDTO.setOrderId(goodsorder.getId());
            refundDTO.setCanBalance(goodsorder.getMoney());
            refundDTO.setRefundAmount(new BigDecimal(refundMoney));
            refundDTO.setTotalAmount(goodsorder.getMoney());
            refundDTO.setMemberId(goodsorder.getMemberId());
            refundDTO.setReason(Constants.REFUND_TYPE.get(type).getName());
            refundDTO.setCreator(goodsorder.getEditor());
            refundDTO.setType(type);
            boolean res =  wxMiniUtilService.wxRefund(refundDTO);
        }else{
            //无退款结算
            closeGoodsorderDoneNoRefund(goodsorder,type,new BigDecimal(0),null,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;
        }
        BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refundMoney));
        //进行订单结算业务处理
        if(memberRides == null){
             memberRides = getMemberRidesForClose(goodsorder.getId());
        }
        //默认结算为押金金额
        if (!CollectionUtils.isEmpty(memberRides)){
            //骑行总时长
            for(MemberRides model :memberRides){
                MemberRides up = new MemberRides();
                up.setId(model.getId());
                up.setActualPrice(model.getActualPrice());
                up.setCloseDate(goodsorder.getEditDate());
                up.setCloseStatus(Constants.ONE);
                up.setEditor(goodsorder.getEditor());
                up.setEditDate(goodsorder.getEditDate());
                //更新骑行记录的计算金额和状态
                memberRidesJoinMapper.updateById(up);
            }
        }
//        BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refund.getMoney()));
        //退款乐行
//       int type =Constants.formatIntegerNum(refund.getType());
        Goodsorder update = new Goodsorder();
        update.setId(goodsorder.getId());
        update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
        update.setCloseMoney(closeMoney);
        update.setCloseStatus(Constants.ONE);
        update.setCloseDate(new Date());
        update.setCloseInfo(Constants.REFUND_TYPE.get(type).getInfo());
        update.setCloseUserId(goodsorder.getEditor());
        if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
            //如果是强制结算
            update.setCloseType(Constants.ONE);
//            LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
//            update.setEditor(principal.getId());
        }else  if(Constants.REFUND_TYPE.NORMAL.getKey() == type){
            //如果是自行結算
            update.setCloseType(Constants.ZERO);
        }else{
            //如果是平台自动结算
            update.setCloseType(Constants.TWO);
        }
        update.setCloseId(closeId);
        //存储 消费交易流水
        Transactions transactions = new Transactions();
        transactions.setId(Constants.getUUID());
        transactions.setMemberId(goodsorder.getMemberId());
        transactions.setCreateDate(new Date());
        transactions.setIsdeleted(Constants.ZERO);
        transactions.setOrderId(goodsorder.getId());
        transactions.setMoney(closeMoney);
        transactions.setType(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getKey());
        transactions.setDoneDate(new Date());
        transactions.setTitle(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getName());
        transactions.setContent(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getInfo());
        transactions.setBalance(BigDecimal.ZERO);
        transactions.setObjId(goodsorder.getId());
        transactions.setObjType(Constants.ONE);
        transactionsMapper.insert(transactions);
        //修改订单信息
        goodsorderMapper.updateById(update);
    }
    /**
     * 退款成功回调
     */
@@ -543,9 +662,12 @@
        }
        refund.setOnlineOrderid(param.getTransactionId());
        doRefundTransactions(refund);

        //退款乐行
        int type =Constants.formatIntegerNum(refund.getType());
        Goodsorder goodsorder = goodsorderMapper.selectById(refund.getObjId());
        if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getCloseStatus()) != Constants.ZERO){
        closeGoodsorderDoneNoRefund(goodsorder,refund.getType(),refund.getMoney(),refund.getId(),null);
       /* log.error("========================================"+JSONObject.toJSONString(goodsorder));
        if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
            return;
        }
        //进行订单结算业务处理
@@ -565,21 +687,20 @@
                memberRidesJoinMapper.updateById(up);
            }
        }
        BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refund.getMoney()));
        //退款乐行
        int type =Constants.formatIntegerNum(refund.getType());

        Goodsorder update = new Goodsorder();
        update.setId(goodsorder.getId());
        update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
        update.setCloseMoney(closeMoney);
        update.setCloseStatus(Constants.ONE);
        update.setCloseDate(new Date());
        update.setCloseInfo(Constants.REFUND_TYPE.get(refund.getType()).getInfo());
        update.setCloseUserId(goodsorder.getEditor());
        if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
            //如果是强制结算
            update.setCloseType(Constants.ONE);
            LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
            update.setEditor(principal.getId());
//            LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
//            update.setEditor(principal.getId());
        }else  if(Constants.REFUND_TYPE.NORMAL.getKey() == type){
            //如果是自行結算
            update.setCloseType(Constants.ZERO);
@@ -605,7 +726,7 @@
        transactions.setObjType(Constants.ONE);
        transactionsMapper.insert(transactions);
        //修改订单信息
        goodsorderMapper.updateById(update);
        goodsorderMapper.updateById(update);*/
    }

    private void doRefundTransactions(Refund refund ) {
@@ -648,23 +769,26 @@
        transactionsMapper.insert(transactions);
    }

    private RidesDetailResponse    getCloseMoneyByRides(List<MemberRides> memberRides,boolean isClose,BigDecimal yjMoney) {
    private RidesDetailResponse    getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney) {
        RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
        BigDecimal closeMoney = new BigDecimal(0.00);
        int durationSum = 0;
        MemberRides topRides =memberRides.get(0);
        MemberRides topRides =null;
        //取最高车型计算方案结算订单
        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;
            if(durationSum-freeTime > 0 ){//只算超出免费时长的数据
                if(topRides == null ||( Constants.formatIntegerNum(topRides.getSortnum())<Constants.formatIntegerNum(rides.getSortnum())
                        && Constants.formatIntegerNum(rides.getDuration())>0)){
                    topRides = rides;
                }
            }
        }
//      MemberRides topRides =memberRides.get(0);
        if(durationSum > 0 && topRides != null){
        if( topRides != null){
            int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
            closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
            //如果是一口价方式，价格直接为一口价baseMoney,如果不是计算正常价格
@@ -676,6 +800,7 @@
                    closeMoney = closeMoney.add(unit.multiply(Constants.formatDecimalNum(topRides.getUnitPrice())));
                }
            }
            topRides.setActualPrice(closeMoney);
        }
        //如果订单价格封顶了，取订单 价格
        if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){
@@ -683,12 +808,12 @@
        }
        ridesDetailResponse.setDuration(durationSum);
        ridesDetailResponse.setAmount(closeMoney);
        ridesDetailResponse.setBikeType(topRides.getParamName());
        ridesDetailResponse.setBikeType(topRides!=null?topRides.getParamName():"-");
        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());
@@ -699,14 +824,21 @@
        wrapper.orderByDesc(BaseParam::getSortnum);
        //取最高车型作为计价方案
        //查询所有骑行记录
        List<MemberRides> memberRides = memberRidesJoinMapper.selectList(wrapper);
        List<MemberRides> memberRides = memberRidesJoinMapper.selectJoinList(MemberRides.class,wrapper);
        return memberRides;
    }

    @Override
    public void backGoodsorder(String orderId, BigDecimal money,String reason) {
    public void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO) {
        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
        if(Objects.isNull(goodsorderBackDTO)
        || StringUtils.isBlank(goodsorderBackDTO.getOrderId())
                || StringUtils.isBlank(goodsorderBackDTO.getReason())
                || Objects.isNull(goodsorderBackDTO.getBackType())
                || Objects.isNull(goodsorderBackDTO.getMoney())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Goodsorder goodsorder = goodsorderMapper.selectById(goodsorderBackDTO.getOrderId());
        if(goodsorder == null){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "对不起，订单信息不存在，请刷新页面重试！");
        }
@@ -715,7 +847,7 @@
        }
        QueryWrapper<Refund> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(Refund::getObjId,orderId)
                .eq(Refund::getObjId,goodsorderBackDTO.getOrderId())
                .eq(Refund::getStatus,Constants.TWO)
                .eq(Refund::getIsdeleted,Constants.ZERO) ;
        wrapper.select("sum(money) as money").last(" limit 1");
@@ -723,18 +855,42 @@
        BigDecimal refundMoney = total == null?new BigDecimal(0):Constants.formatDecimalNum(total.getMoney());
        //可退剩余 单位元
        BigDecimal canBalance =Constants.translateMoney(Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refundMoney));
        if(canBalance.compareTo(money) >= Constants.ZERO){
        if(canBalance.compareTo(goodsorderBackDTO.getMoney()) >= Constants.ZERO){
            RefundDTO refundDTO = new RefundDTO();
            refundDTO.setOrderId(orderId);
            refundDTO.setOrderId(goodsorderBackDTO.getOrderId());
            refundDTO.setCanBalance(canBalance.multiply(new BigDecimal(100)));
            refundDTO.setRefundAmount(money.multiply(new BigDecimal(100)));
            refundDTO.setRefundAmount(goodsorderBackDTO.getMoney().multiply(new BigDecimal(100)));
            refundDTO.setTotalAmount(goodsorder.getMoney());
            refundDTO.setMemberId(goodsorder.getMemberId());
            refundDTO.setCreator(principal.getId());
            refundDTO.setReason(reason);
            refundDTO.setReason(goodsorderBackDTO.getReason());
            refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
            //退货退款 查看套餐订单状态 更新订单信息
            if(Constants.equalsInteger(goodsorderBackDTO.getBackType(),Constants.ZERO)&&Constants.equalsInteger(goodsorder.getType(),Constants.ONE)){
                DiscountMember discountMember = discountMemberMapper.selectById(goodsorder.getObjId());
                if(Objects.isNull(discountMember)){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到套餐卡信息");
                }
                if(Constants.equalsInteger(discountMember.getStatus(),Constants.ZERO)){
                    discountMemberMapper.update(null,new UpdateWrapper<DiscountMember>().lambda()
                            .set(DiscountMember::getStatus,Constants.ONE)
                            .eq(DiscountMember::getId,discountMember.getId())
                    );
                    //操作日志
                    DiscountLog discountLog = new DiscountLog();
                    discountLog.setIsdeleted(Constants.ZERO);
                    discountLog.setCreator(principal.getId());
                    discountLog.setCreateDate(new Date());
                    discountLog.setDiscountMemberId(discountMember.getId());
                    discountLog.setType(Constants.ONE);
                    discountLog.setEditInfo("退货退卡");
                    discountLog.setGoodsorderId(goodsorderBackDTO.getOrderId());
                    discountLogMapper.insert(discountLog);
                }
            }
            //发起退款申请
            wxMiniUtilService.wxRefund(refundDTO);

        }else {
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，退款金额不允许超过"+canBalance+"元");
        }
@@ -877,7 +1033,7 @@
                return memberRidesResponse;
            }).collect(Collectors.toList());
            //累计和预算结算金额
            RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,false,goodsorder.getMoney());
            RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney());
            if(Constants.formatIntegerNum(goodsorder.getStatus())!= Constants.goodsorderStatus.pay){
                //如果非已支付但未结算，使用订单金额
                ridesDetailResponse.setAmount(goodsorder.getCloseMoney());
@@ -1001,6 +1157,39 @@
    }


    @Override
    public void autoCancelRefunOrder(){
        Date date = new Date(System.currentTimeMillis()-5*60L*1000L);
        List<Refund> list = refundMapper.selectList(new QueryWrapper<Refund>().lambda()
                .eq(Refund::getStatus,Constants.ZERO)
                .lt(Refund::getCreateDate,date));
        if(list !=null && list.size()>0){
            List<String> cancelIds = new ArrayList<>();
            for(Refund r:list){
                com.wechat.pay.java.service.refund.model.Refund res  =wxMiniUtilService.isSuucessRefund(r.getId());
                if(res !=null){
                    //如果退款成功
                    RefundNotification param = new RefundNotification();
                    param.setRefundStatus(Status.SUCCESS);
                    param.setOutRefundNo(r.getId());
                    param.setTransactionId(res.getTransactionId());
                    //执行关闭订单业务
                    closeGoodsorderDone(param);
                }else{
                    //放入取消集合中
                    cancelIds.add(r.getId());
                }
            }
            if(cancelIds.size()>0){
                refundMapper.update(null, new UpdateWrapper<Refund>().lambda()
                        .in(Refund::getId,cancelIds)
                        .set(Refund::getStatus,Constants.ONE)
                        .set(Refund::getEditDate,new Date())
                        .set(Refund::getInfo,"超时未回调，自动取消")
                );
            }
        }
    }

    @Override
    public void autoCloseOrder( ) {