111

k94314517

2025-02-19 18cf2f252338e52fb531cd2ca1cc49e39bf6efe0

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

@@ -34,6 +34,7 @@
import com.doumee.dao.business.web.response.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.MemberRidesService;
import com.doumee.service.business.PricingRuleService;
@@ -48,6 +49,7 @@
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.A;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -81,12 +83,17 @@

    @Autowired
    private DiscountLogMapper discountLogMapper;
    @Autowired
    private DiscountMapper discountMapper;

    @Autowired
    GoodsorderJoinMapper goodsorderJoinMapper;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Autowired
    private BikesMapper bikesMapper;



@@ -117,6 +124,10 @@

    @Autowired
    RefundService refundService;

    @Autowired
    private HolidaysMapper holidaysMapper;


    @Override
    public String create(Goodsorder goodsorder) {
@@ -200,13 +211,6 @@
            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);
@@ -328,6 +332,7 @@
        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");
        queryWrapper.select("( select s.realname from refund r left join system_user s on r.creator = s.id where r.obj_id = t.id order by r.id desc  limit 1  ) ",Goodsorder::getRefundUserName);
        if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ZERO)){
            queryWrapper.ne(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
        }
@@ -348,16 +353,11 @@
    }





    @Override
    public long count(Goodsorder goodsorder) {
        QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
        return goodsorderMapper.selectCount(wrapper);
    }



    @Override
    public HomeResponse getHome(String memberId){
@@ -375,11 +375,25 @@
        homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0);
        homeResponse.setIsBusiness(this.checkBusiness()?0:1);
        homeResponse.setUnBusinessTips("营业时间为"+ systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_STARTTIME).getCode() +" ~ "+systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_ENDTIME).getCode()+"，请在营业时间内使用本系统");

        homeResponse.setAdList(adMapper.selectList(new QueryWrapper<Ad>()
                .eq("isdeleted",Constants.ZERO)
                .eq("status",Constants.ZERO)
                .orderByAsc("sortnum")
        ));;
        homeResponse.setDiscountList(
                discountMapper.selectList(new QueryWrapper<Discount>().lambda()
                        .eq(Discount::getIsdeleted,Constants.ZERO)
                        .eq(Discount::getStatus,Constants.ZERO)
                        .orderByDesc(Discount::getId)
                        .last(" limit 3 ")
                )
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(homeResponse.getDiscountList())){
            for (Discount discount:homeResponse.getDiscountList()) {
                discount.setDayPrice(discount.getPrice().divide(new BigDecimal(Integer.toString(discount.getUseDays())),2));
            }
        }
        if(!Objects.isNull(homeResponse.getAdList())&&homeResponse.getAdList().size()>Constants.ZERO){
            homeResponse.getAdList().forEach(i->{
                i.setImgfullurl(fullPath + i.getImgurl());
@@ -412,13 +426,14 @@
                        .ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey())
                        .orderByDesc(MemberRides::getCreateDate)
                        .last(" limit 1  "));
                if (!Objects.isNull(memberRides)) {
                if (Objects.nonNull(memberRides)) {
                    homeResponse.setRideStatus(memberRides.getStatus());
                    MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
                    BaseParam baseParam = baseParamMapper.selectById(memberRides.getParamId());
                    if(!Objects.isNull(baseParam)){
                        memberRidesResponse.setBikeType(baseParam.getName());
                    }
                    memberRidesResponse.setRidesType(memberRides.getType());
                    memberRidesResponse.setRideId(memberRides.getId());
                    memberRidesResponse.setRideStartTime(memberRides.getRentDate());
                    memberRidesResponse.setRideStartTimeStr(DateUtil.DateToStr(memberRides.getRentDate(),"HH:mm"));
@@ -434,19 +449,32 @@
                            memberRidesResponse.getBasePrice(),memberRidesResponse.getBaseTime(),
                            memberRidesResponse.getUnitPrice()
                            ,memberRidesResponse.getUnitTime()));
                    if(Constants.equalsInteger(memberRides.getType(),Constants.ONE)){
                        Bikes bikes = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda().eq(Bikes::getCode,memberRides.getBikeCode()).eq(Bikes::getType,Constants.ONE).last("limit 1"));
                        memberRidesResponse.setVoltageStatus(this.getVoltageStatus(bikes));
                    }
                    //查询当前的骑行套餐
                    memberRidesResponse.setDiscountMember(this.getUseDiscount(memberId,Constants.ZERO));
                    homeResponse.setMemberRidesResponse(memberRidesResponse);
                }
            }
        }


        return homeResponse;
    }

    @Override
    public Integer getVoltageStatus(Bikes bikes){
        //低电量电压
        BigDecimal lowVoltage = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.LOW_VOLTAGE).getCode());
        if(Objects.isNull(bikes)||Objects.isNull(bikes.getVoltage())||Objects.isNull(lowVoltage)){
            return 0;
        }
        return bikes.getVoltage().compareTo(lowVoltage)>0?0:1;
    }


    @Override
    public GoodsorderDetailDTO getGoodsorderDetailDTO(String id) {

        List<PayOrderDTO> payOrderDTOList = new ArrayList<>();
        Goodsorder goodsorder = goodsorderMapper.selectById(id);
        if(goodsorder == null){
@@ -495,6 +523,45 @@
        goodsorderDetailDTO.setModel(goodsorder);//订单对象
        return goodsorderDetailDTO;
    }



    @Override
    public GoodsorderDetailVO getGoodsorderDetailForDisCount(String id){
        GoodsorderDetailVO goodsorderDetailVO = new GoodsorderDetailVO();
        Goodsorder goodsorder = goodsorderMapper.selectById(id);
        if(goodsorder == null){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY );
        }
        if(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED);
        }
        goodsorderDetailVO.setGoodsOrder(goodsorder);
        Member member = memberMapper.selectById(goodsorder.getMemberId());
        if(Objects.nonNull(member)){
            goodsorderDetailVO.setMember(member);
        }
        //查询商品信息
        DiscountMember discountMember = discountMemberMapper.selectById(goodsorder.getObjId());
        if(Objects.nonNull(discountMember)){
            goodsorderDetailVO.setDiscountMember(discountMember);
        }
        //查询所有有退款记录
        List<Refund> refunds = refundJoinMapper.selectJoinList(Refund.class,
                new MPJLambdaWrapper<Refund>()
                        .selectAll(Refund.class)
                        .selectAs(SystemUser::getRealname,Refund::getCreatorName)
                        .leftJoin(SystemUser.class,SystemUser::getId,Refund::getCreator)
                        .eq(Refund::getObjId,goodsorder.getId())
                        .orderByDesc(Refund::getId)
        );
        goodsorderDetailVO.setRefundList(refunds);

        return goodsorderDetailVO;
    }



    @Override
    public void forceCloseGoodsorder(String orderId) {
        //查询订单 信息
@@ -547,7 +614,7 @@
                freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
            }catch (Exception e){
            }
            closeMoney = getCloseMoneyByRides(memberRides,freeTime,true,goodsorder.getMoney()).getAmount();
            closeMoney = getCloseMoneyByRides(memberRides,freeTime,true,goodsorder.getMoney(),goodsorder.getMemberId()).getAmount();
            //实际结算价格，记录在最高车型记录上
//            memberRides.get(0).setActualPrice(closeMoney);
        }
@@ -596,7 +663,7 @@
        }
//        BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refund.getMoney()));
        //退款乐行
//        int type =Constants.formatIntegerNum(refund.getType());
//       int type =Constants.formatIntegerNum(refund.getType());
        Goodsorder update = new Goodsorder();
        update.setId(goodsorder.getId());
        update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
@@ -769,11 +836,13 @@
        transactionsMapper.insert(transactions);
    }

    private RidesDetailResponse    getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney) {
    private RidesDetailResponse  getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney,String memberId) {
        RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
        ridesDetailResponse.setHaveDisCount(Constants.ZERO);
        BigDecimal closeMoney = new BigDecimal(0.00);
        int durationSum = 0;
        MemberRides topRides =null;

        //取最高车型计算方案结算订单
        for(MemberRides rides : memberRides){
            if ( isClose && Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(rides.getStatus()))){
@@ -787,7 +856,8 @@
                }
            }
        }
//      MemberRides topRides =memberRides.get(0);

        //计算应付金额
        if( topRides != null){
            int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
            closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
@@ -801,6 +871,49 @@
                }
            }
            topRides.setActualPrice(closeMoney);
        } 
        //查询是否存在套餐信息
        DiscountMember discountMember = this.getUseDiscount(memberId,durationSum);
        //计算抵扣金额
        if(Objects.nonNull(discountMember) && discountMember.getSurplusTime() > Constants.ZERO && Objects.nonNull(topRides)){
            //存储抵扣记录
            DiscountLog discountLog = new DiscountLog();
            discountLog.setIsdeleted(Constants.ZERO);
            discountLog.setCreator(memberId);
            discountLog.setCreateDate(new Date());
            discountLog.setDiscountMemberId(discountMember.getId());
            discountLog.setType(Constants.ZERO);
            discountLog.setInfo("骑行抵扣");
            discountLog.setEditInfo("骑行抵扣");
            discountLog.setGoodsorderId(topRides.getOrdreId());
            //如果骑行时间小于等于剩余时间 则直接添加 骑行卡使用数据  修正实际支付金额
            if(discountMember.getSurplusTime() >= durationSum){
                discountLog.setRideTime(durationSum);
                discountLog.setRidePrice(closeMoney);
                discountLogMapper.insert(discountLog);
                topRides.setActualPrice(BigDecimal.ZERO);
                closeMoney = BigDecimal.ZERO;
            }else{
                int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
                BigDecimal closeDisCountMoney = Constants.formatDecimalNum(topRides.getBasePrice());
                //如果是一口价方式，价格直接为一口价baseMoney,如果不是计算正常价格
                Integer durationDisCountSum = durationSum - discountMember.getSurplusTime();
                discountLog.setRideTime(discountMember.getSurplusTime());
                if(baseTime != -1){//不是一口价
                    if(durationDisCountSum > baseTime && Constants.formatIntegerNum(topRides.getUnitTime())>0){
                        //如果超出了起步价格，计算超出价格
                        BigDecimal unit = new BigDecimal(durationSum-baseTime).divide(new BigDecimal(topRides.getUnitTime()), 0, BigDecimal.ROUND_UP);
                        //计算金额累计超出部门价格（超出时间单位*超出单位时间价格）
                        closeDisCountMoney = closeDisCountMoney.add(unit.multiply(Constants.formatDecimalNum(topRides.getUnitPrice())));
                    }
                    discountLog.setRidePrice(closeMoney.subtract(closeDisCountMoney));
                }else{
                    discountLog.setRidePrice(BigDecimal.ZERO);
                }
            }
            discountLogMapper.insert(discountLog);
            ridesDetailResponse.setHaveDisCount(Constants.ONE);
            ridesDetailResponse.setDisCountMoney(discountLog.getRidePrice());
        }
        //如果订单价格封顶了，取订单 价格
        if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){
@@ -818,7 +931,6 @@
        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);
@@ -1034,7 +1146,7 @@
                return memberRidesResponse;
            }).collect(Collectors.toList());
            //累计和预算结算金额
            RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney());
            RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney(),goodsorder.getMemberId());
            if(Constants.formatIntegerNum(goodsorder.getStatus())!= Constants.goodsorderStatus.pay){
                //如果非已支付但未结算，使用订单金额
                ridesDetailResponse.setAmount(goodsorder.getCloseMoney());
@@ -1072,6 +1184,7 @@
        goodsorder.setCreateDate(new Date());
        goodsorder.setIsdeleted(Constants.ZERO);
        goodsorder.setCode(goodsorder.getId());
        goodsorder.setType(Constants.ZERO);
        goodsorder.setMemberId(memberId);
        goodsorder.setMoney(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()).multiply(new BigDecimal(100)));
        goodsorder.setStatus(Constants.goodsorderStatus.waitPay);
@@ -1086,16 +1199,101 @@
        }  catch (Exception e) {
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，发起支付失败~");
        }

        return response;
    }

    private Object getWxPayResponse(Goodsorder goodsorder,String openid) throws Exception {

    @Override
    public Object createDiscountOrderPay(String memberId,String discountId){
        Member member = memberMapper.selectById(memberId);
        if(Objects.isNull(member)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到用户对象信息");
        }
        Discount discount = discountMapper.selectById(discountId);
        this.checkDiscountSaleDate(discount);
        String discountMemberId = Constants.getUUID();
        String goodsorderId = Constants.getUUID();
        DiscountMember discountMember = new DiscountMember();
        BeanUtils.copyProperties(discount,discountMember);
        discountMember.setCreator(null);
        discountMember.setId(discountMemberId);
        discountMember.setCreateDate(new Date());
        discountMember.setEditDate(new Date());
        discountMember.setEditor(null);
        discountMember.setMemberId(memberId);
        discountMember.setStatus(Constants.TWO);
        discountMember.setGoodsorderId(goodsorderId);
        discountMemberMapper.insert(discountMember);

        Goodsorder goodsorder = new Goodsorder();
        goodsorder.setId(goodsorderId);
        goodsorder.setCreateDate(new Date());
        goodsorder.setIsdeleted(Constants.ZERO);
        goodsorder.setCode(goodsorder.getId());
        goodsorder.setMemberId(memberId);
        goodsorder.setType(Constants.ONE);
        goodsorder.setMoney(discount.getPrice().multiply(new BigDecimal(100)));
        goodsorder.setStatus(Constants.goodsorderStatus.waitPay);
        goodsorder.setPreOrderid(goodsorder.getId());
        goodsorder.setPayStatus(Constants.goodsorderPayStatus.waitPay);
        goodsorder.setPayWay(Constants.ZERO);
        goodsorder.setObjType(Constants.ZERO);
        goodsorder.setObjId(discount.getId());
        this.goodsorderMapper.insert(goodsorder);
        //调起支付
            Object response = null;
        Object response = null;
        try {
            response = getWxPayResponse(goodsorder,member.getOpenid());
        }  catch (Exception e) {
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，发起支付失败~");
        }
        return response;

    }

    public void checkDiscountSaleDate(Discount discount){
        if(Objects.isNull(discount)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到套餐信息");
        }
        if(!(Constants.equalsInteger(discount.getIsdeleted(),Constants.ZERO)
            ||Constants.equalsInteger(discount.getStatus(),Constants.ZERO))){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"套餐已下架，无法进行购买，请刷新查看");
        }
        if(!(discount.getStartDate().getTime() < System.currentTimeMillis()
         && Utils.Date.getEnd(discount.getEndDate()).getTime() > System.currentTimeMillis() )){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"套餐开放时间未到,无法进行购买");
        }
        //验证是否超过今日可售卖数量
        if(Objects.nonNull(discount.getSaleDayLimit())){
            if(goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda()
                    .eq(Goodsorder::getType,Constants.ONE)
                    .eq(Goodsorder::getObjId,discount.getId())
                    .in(Goodsorder::getStatus,Constants.ZERO,Constants.ONE)
                    .apply(" EXTRACT(DAY FROM create_date) = EXTRACT(DAY FROM CURRENT_DATE) ")
            )>=discount.getSaleDayLimit()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"套餐今日发行量已售罄，请明日查看！");
            }
        }
        if(Objects.nonNull(discount.getSaleLimit())){
            if(goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda()
                    .eq(Goodsorder::getType,Constants.ONE)
                    .eq(Goodsorder::getObjId,discount.getId())
                    .in(Goodsorder::getStatus,Constants.ZERO,Constants.ONE)
                    .apply(" EXTRACT(YEAR FROM create_date) = EXTRACT(YEAR FROM CURRENT_DATE) ")
            )>=discount.getSaleDayLimit()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"套餐发行量已售罄！");
            }
        }
    }



    private Object getWxPayResponse(Goodsorder goodsorder,String openid){
        //调起支付
        Object response = null;
        PrepayRequest request = new PrepayRequest();
        request.setAttach("createGoodsOrder");
        request.setDescription("森林公园自行车骑行押金支付");
        request.setDescription(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)?"森林公园自行车骑行押金支付":"森林公园自行车购买骑行套餐支付");
        request.setSpMchid(WxMiniConfig.wxProperties.getMchId());
        request.setSpAppid(WxMiniConfig.wxProperties.getAppId());
        request.setSubMchid(WxMiniConfig.wxProperties.getSubMchId());
@@ -1112,10 +1310,10 @@
            // 跟之前下单示例一样，填充预下单参数
        PrepayWithRequestPaymentResponse resParam =  WxMiniConfig.jsapiExtService.prepayWithRequestPayment(request,WxMiniConfig.wxProperties.getSubAppId());
        response =resParam;

        return response;

    }




    /**
@@ -1241,6 +1439,50 @@
            return  ("处理成功!");
        }
        goodsorder.setOnlineOrderid(paymentNo);
        if(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)){
            this.dealGoodsOrderCallBack(goodsorder);
        }else{
            this.dealDiscountOrderCallBack(goodsorder);
        }
        return  ("处理成功!");
    }

    public void dealDiscountOrderCallBack(Goodsorder goodsorder){
        goodsorder.setPayStatus(Constants.goodsorderPayStatus.pay);
        goodsorder.setStatus(Constants.goodsorderStatus.pay);
        goodsorder.setPayDate(new Date());
        goodsorder.setEditDate(new Date());
        goodsorderMapper.updateById(goodsorder);

        DiscountMember discountMember = discountMemberMapper.selectOne(new QueryWrapper<DiscountMember>().lambda()
                .eq(DiscountMember::getGoodsorderId,goodsorder.getId()).last(" limit 1 "));
        discountMemberMapper.update(null,new UpdateWrapper<DiscountMember>().lambda()
                .set(DiscountMember::getStatus,Constants.ZERO)
                .eq(DiscountMember::getId,discountMember.getId())
        );
        Constants.TRANSACTIONS_TYPE discountConstants = Constants.TRANSACTIONS_TYPE.DISCOUNT;
        //存储交易流水表
        Transactions transactions = new Transactions();
        transactions.setMemberId(goodsorder.getMemberId());
        transactions.setCreateDate(new Date());
        transactions.setIsdeleted(Constants.ZERO);
        transactions.setOrderId(goodsorder.getId());
        transactions.setMoney(goodsorder.getMoney());
        transactions.setType(discountConstants.getKey());
        transactions.setPreOrderid(goodsorder.getPreOrderid());
        transactions.setOnlineOrderid(goodsorder.getOnlineOrderid());
        transactions.setDoneDate(new Date());
        transactions.setTitle(discountConstants.getName());
        transactions.setContent(discountConstants.getInfo());
        //transactions.setContent(discountMember.getName() +" 有效期" + DateUtil.dateToString(discountMember.getUseStartDate(),"yyyy-MM-dd") +"-"+DateUtil.dateToString(discountMember.getUseEndDate(),"yyyy-MM-dd"));
        transactions.setBalance(goodsorder.getMoney());
        transactions.setObjId(discountMember.getId());
        transactions.setObjType(Constants.TWO);
        transactionsMapper.insert(transactions);
    }


    public void dealGoodsOrderCallBack(Goodsorder goodsorder){
        goodsorder.setPayStatus(Constants.goodsorderPayStatus.pay);
        goodsorder.setStatus(Constants.goodsorderStatus.pay);
        goodsorder.setPayDate(new Date());
@@ -1263,9 +1505,7 @@
        transactions.setObjId(goodsorder.getId());
        transactions.setObjType(Constants.ZERO);
        transactionsMapper.insert(transactions);
        return  ("处理成功!");
    }



    /**
@@ -1318,4 +1558,75 @@
    }


    /**
     * 获取当前可使用的套餐
     * @param memberId
     */
    public DiscountMember getUseDiscount(String memberId,Integer driveTime){
        String today = DateUtil.getToday();
        //判断今天是否为节假日
        Holidays holidays = new Holidays();
        holidays.setHoliday(today);
        holidays.setIsdeleted(Constants.ZERO);
        //是否是节假日 1=是；0=否
        Integer holiday = holidaysMapper.selectCount(new QueryWrapper<>(holidays))>0?1:0;
        List<DiscountMember> discountMemberList = discountMemberMapper.selectJoinList(DiscountMember.class,new MPJLambdaWrapper<DiscountMember>()
                .selectAll(DiscountMember.class)
                .select(" select sum(d.ride_time) from discount_log d  where and d.discount_member_id = discount_member.id " +
                        "and  d.isdeleted = 0 and  d.type = 0 and   EXTRACT(DAY FROM d.create_date) = EXTRACT(DAY FROM CURRENT_DATE) " , DiscountMember::getUseTime)//查询今日已使用时间
                .eq(DiscountMember::getStatus,Constants.ZERO)
                .eq(DiscountMember::getMemberId,memberId)
                .ge(DiscountMember::getUseStartDate, Utils.Date.getStart(DateUtil.StringToDate(today)))
                .le(DiscountMember::getUseEndDate, Utils.Date.getEnd(DateUtil.StringToDate(today)))
                .eq(Constants.equalsInteger(holiday,Constants.ONE),DiscountMember::getUseHoliday,Constants.ONE)
                .orderByDesc(DiscountMember::getLimitType)
                .orderByDesc(DiscountMember::getLimitTime)
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(discountMemberList)){
            //查看是否有无期限的套餐 如果存在 则直接返回无期限的套餐
            Optional<DiscountMember> optional = discountMemberList.stream().filter(i->Constants.equalsInteger(i.getLimitType(),Constants.ZERO)).findAny();
            if(optional.isPresent()){
                return optional.get();
            }
            //处理剩余时间
            for (DiscountMember discountMember:discountMemberList) {
                if(Objects.isNull(discountMember.getUseTime())){
                    discountMember.setSurplusTime(discountMember.getLimitTime());
                }else if(discountMember.getUseTime()>=discountMember.getLimitTime()){
                    discountMember.setSurplusTime(0);
                }else{
                    discountMember.setSurplusTime(discountMember.getLimitTime() - discountMember.getUseTime());
                }
            }
            //骑行中 显示剩余时间最大的
            if(Constants.equalsInteger(driveTime,Constants.ZERO)){
                List<DiscountMember>  list =  discountMemberList.stream().filter(i->i.getSurplusTime()>0).collect(Collectors.toList());
                if(list.size()>Constants.ZERO){
                    //d1在前则升序 反之降序
                    list.sort((d1,d2)-> Integer.compare(d2.getSurplusTime(),d1.getSurplusTime()));
                }
                return list.get(Constants.ZERO);
            }else{
                //无无期限的套餐 优先查询剩余时长大于骑行时长的信息(取时间最小的套餐) 再查询小于骑行时长的套餐
                List<DiscountMember>  list =  discountMemberList.stream().filter(i->i.getSurplusTime()>=driveTime).collect(Collectors.toList());
                if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
                    if(list.size()>Constants.ZERO){
                        //d1在前则升序 反之降序
                        list.sort((d1,d2)-> Integer.compare(d2.getSurplusTime(),d1.getSurplusTime()));
                    }
                    return list.get(Constants.ZERO);
                }
                list =  discountMemberList.stream().filter(i->i.getSurplusTime()<driveTime).collect(Collectors.toList());
                if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
                    if(list.size()>Constants.ZERO){
                        list.sort((d1,d2)-> Integer.compare(d1.getSurplusTime(),d2.getSurplusTime()));
                    }
                    return list.get(Constants.ZERO);
                }
            }
        }
        return null;
    }


}