Merge branch 'devPartner' of http://139.186.142.91:10010/r/productDev/parkB...

MrShi

2023-12-12 9088209cdd7e3158d2a04caae05e6726ba3b3ad6

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

@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,9 +19,11 @@
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.WxMiniConfig;
import com.doumee.core.wx.WxMiniUtilService;
import com.doumee.core.wx.WxPayProperties;
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;
@@ -37,11 +41,11 @@
import com.doumee.service.business.MemberRidesService;
import com.doumee.service.business.PricingRuleService;
import com.doumee.service.business.RefundService;
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
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 lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.A;
@@ -63,8 +67,10 @@
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

@Service
@Slf4j
public class GoodsorderServiceImpl implements GoodsorderService {


@@ -86,6 +92,8 @@

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

    @Autowired
    private MemberRidesJoinMapper memberRidesJoinMapper;
@@ -170,8 +178,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());
        IPage<GoodsorderExportVO> goodsorderExportVOIPage = goodsorderJoinMapper.selectJoinPage(page, GoodsorderExportVO.class, queryWrapper);
        Goodsorder model = pageWrap.getModel();
        Utils.MP.blankToNull(model);
        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);
        }

        if (!CollectionUtils.isEmpty(goodsorderExportVOIPage.getRecords())){
            goodsorderExportVOIPage.getRecords().forEach(s->{
                s.setMoney(Constants.translateMoney(s.getMoney()));
@@ -184,8 +243,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()));
@@ -193,27 +280,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);
@@ -235,7 +306,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;
    }

@@ -244,6 +315,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());
@@ -290,7 +362,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->{
@@ -408,19 +480,79 @@
        closeGoodsorder(  goodsorder,Constants.REFUND_TYPE.PLAT_FORCE.getKey());
    }

    /**
     * 发起退款申请
     * @param goodsorder
     * @param type
     */
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    @Override
    public void closeGoodsorder( Goodsorder goodsorder ,int type ) {

//
        Refund r = 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){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "该订单存在退款申请正在处理中，请稍后查看订单信息哦~");
        }
        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);
        }
        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);
    }

    /**
     * 退款成功回调
     */
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    @Override
    public void closeGoodsorderDone(RefundNotification param) {
        //查询退款申请订单
        Refund refund = refundMapper.selectById(param.getOutRefundNo());
        if(refund == null
                || Constants.formatIntegerNum(refund.getIsdeleted()) == Constants.ONE
                || Constants.formatIntegerNum(refund.getStatus()) == Constants.TWO){
            return;
        }
        if (!"SUCCESS".equals(param.getRefundStatus().name())) {
            // 如果退款状态不正确，修改退款单状态
            refund.setStatus(Constants.ONE);
            refund.setEditDate(new Date());
            refund.setOnlineOrderid(param.getTransactionId());
            refund.setDoneDate(refund.getEditDate());
            //更新退款单状态
            refundMapper.updateById(refund);
            return;
        }
        refund.setOnlineOrderid(param.getTransactionId());
        doRefundTransactions(refund);

        Goodsorder goodsorder = goodsorderMapper.selectById(refund.getObjId());
        if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getCloseStatus()) != Constants.ZERO){
            return;
        }
        //进行订单结算业务处理
        List<MemberRides> memberRides = getMemberRidesForClose(refund.getObjId());
        //默认结算为押金金额
        if (!CollectionUtils.isEmpty(memberRides)){
            //骑行总时长
            for(MemberRides model :memberRides){
                MemberRides up = new MemberRides();
                up.setId(model.getId());
@@ -433,12 +565,15 @@
                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.setCloseDate(new Date());
        update.setCloseInfo(Constants.REFUND_TYPE.get(type).getInfo());
        update.setCloseInfo(Constants.REFUND_TYPE.get(refund.getType()).getInfo());
        update.setCloseUserId(goodsorder.getEditor());
        if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
            //如果是强制结算
@@ -452,21 +587,7 @@
            //如果是平台自动结算
            update.setCloseType(Constants.TWO);
        }
        int refundMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(closeMoney)).intValue();//计算价格
        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(update.getEditor());
            refundDTO.setType(type);
            Refund refund = wxMiniUtilService.wxRefund(refundDTO);
            update.setCloseId(refund.getId());
        }
        update.setCloseId(refund.getId());
        //存储 消费交易流水
        Transactions transactions = new Transactions();
        transactions.setId(Constants.getUUID());
@@ -474,7 +595,7 @@
        transactions.setCreateDate(new Date());
        transactions.setIsdeleted(Constants.ZERO);
        transactions.setOrderId(goodsorder.getId());
        transactions.setMoney(goodsorder.getMoney().subtract(new BigDecimal(refundMoney)));
        transactions.setMoney(goodsorder.getMoney().subtract(Constants.formatDecimalNum(refund.getMoney())));
        transactions.setType(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getKey());
        transactions.setDoneDate(new Date());
        transactions.setTitle(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getName());
@@ -487,18 +608,62 @@
        goodsorderMapper.updateById(update);
    }

    private RidesDetailResponse    getCloseMoneyByRides(List<MemberRides> memberRides,boolean isClose) {
    private void doRefundTransactions(Refund refund ) {
        //存储交易流水表
        refund.setStatus(Constants.TWO);
        refund.setEditDate(new Date());
        refund.setDoneDate(refund.getEditDate());
        //更新退款单状态
        refundMapper.updateById(refund);

        Transactions transactions = new Transactions();
        transactions.setId(Constants.getUUID());
        transactions.setMemberId(refund.getMemberId());
        transactions.setCreateDate(new Date());
        transactions.setIsdeleted(Constants.ZERO);
        transactions.setOrderId(refund.getObjId());
        transactions.setMoney(refund.getMoney());
        transactions.setPreOrderid(refund.getObjId());
        transactions.setOnlineOrderid(refund.getId());
        transactions.setDoneDate(new Date());
        if(refund.getType().equals(Constants.REFUND_TYPE.PLAT_AUTO.getKey())||refund.getType().equals(Constants.REFUND_TYPE.PLAT_FORCE.getKey())){
            //平台自动退款 或 强制退款
            transactions.setType(Constants.TRANSACTIONS_TYPE.REFUND.getKey());
            transactions.setTitle(Constants.REFUND_TYPE.PLAT_AUTO.getInfo());
            transactions.setContent(Constants.REFUND_TYPE.PLAT_AUTO.getInfo());
        }else if(refund.getType().equals(Constants.REFUND_TYPE.NORMAL.getKey())){
            //用户主动退款
            transactions.setType(Constants.TRANSACTIONS_TYPE.REFUND.getKey());
            transactions.setTitle(Constants.REFUND_TYPE.NORMAL.getInfo());
            transactions.setContent(Constants.REFUND_TYPE.NORMAL.getInfo());
        }else if(refund.getType().equals(Constants.REFUND_TYPE.BACK.getKey())){
            //结算后退款
            transactions.setType(Constants.TRANSACTIONS_TYPE.REFUND.getKey());
            transactions.setTitle(Constants.REFUND_TYPE.BACK.getInfo());
            transactions.setContent(Constants.REFUND_TYPE.BACK.getInfo());
        }
        transactions.setBalance(BigDecimal.ZERO);
        transactions.setObjId(refund.getId());
        transactions.setObjType(Constants.ONE);
        transactionsMapper.insert(transactions);
    }

    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());
@@ -512,6 +677,10 @@
                }
            }
        }
        //如果订单价格封顶了，取订单 价格
        if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){
            closeMoney = yjMoney;
        }
        ridesDetailResponse.setDuration(durationSum);
        ridesDetailResponse.setAmount(closeMoney);
        ridesDetailResponse.setBikeType(topRides.getParamName());
@@ -523,7 +692,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);
        //取最高车型作为计价方案
@@ -562,7 +733,8 @@
            refundDTO.setCreator(principal.getId());
            refundDTO.setReason(reason);
            refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
            Refund refund = wxMiniUtilService.wxRefund(refundDTO);
            //发起退款申请
            wxMiniUtilService.wxRefund(refundDTO);
        }else {
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，退款金额不允许超过"+canBalance+"元");
        }
@@ -623,7 +795,8 @@
                if(Constants.formatIntegerNum(goodsorder.getStatus()) == Constants.GOODSORDER_STATUS.CLOSE.getKey()){
                    //已结算
                    model.setClosedNum(model.getClosedNum()+goodsorder.getCountNum());
                    model.setClosedMoney(model.getClosedMoney().add(Constants.translateMoney(goodsorder.getCloseMoney())));
                    //修改bug 结算收入 = 支付金额-退款-未结算
//                    model.setClosedMoney(model.getClosedMoney().add(Constants.translateMoney(goodsorder.getCloseMoney())));

                    model.setPayNum(model.getPayNum()+goodsorder.getCountNum());
                    model.setPayMoney(model.getPayMoney().add(Constants.translateMoney(goodsorder.getMoney())));
@@ -652,6 +825,7 @@
            model.setRefundNum(Constants.formatIntegerNum(refund.getCountNum()));
            model.setRefundMoney(Constants.translateMoney(Constants.formatDecimalNum(refund.getMoney())));
        }
        model.setClosedMoney(model.getPayMoney().subtract(model.getRefundMoney()).subtract(model.getUnClosedMoney()));
        return  model;
    }
    @Override
@@ -664,6 +838,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())
@@ -702,7 +877,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());
@@ -748,23 +923,43 @@
        goodsorder.setPayWay(Constants.ZERO);
        this.goodsorderMapper.insert(goodsorder);
        //调起支付
        Object response = null;
        try {
            Object response = null;
            WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest();
            request.setBody("支付押金");
            request.setAttach("createGoodsOrder");
            request.setOutTradeNo(goodsorder.getId());
            request.setTotalFee(goodsorder.getMoney().intValue());
            request.setSpbillCreateIp(this.getIpAddr());
            request.setTimeStart(DateUtil.DateToString(new Date(), "yyyyMMddHHmmss"));
            request.setOpenid(member.getOpenid());
            response = WxMiniConfig.wxPayService.createOrder(request);
            return response;
        } catch (WxPayException e) {
            e.printStackTrace();
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),e.getMessage());
            response = getWxPayResponse(goodsorder,member.getOpenid());
        }  catch (Exception e) {
            throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，发起支付失败~");
        }

        return response;
    }

    private Object getWxPayResponse(Goodsorder goodsorder,String openid) throws Exception {
        //调起支付
            Object response = null;
        PrepayRequest request = new PrepayRequest();
        request.setAttach("createGoodsOrder");
        request.setDescription("森林公园自行车骑行押金支付");
        request.setSpMchid(WxMiniConfig.wxProperties.getMchId());
        request.setSpAppid(WxMiniConfig.wxProperties.getAppId());
        request.setSubMchid(WxMiniConfig.wxProperties.getSubMchId());
        request.setSubAppid(WxMiniConfig.wxProperties.getSubAppId());
        Payer payer = new Payer();
        payer.setSubOpenid(openid);
        request.setPayer(payer);
        request.setOutTradeNo(goodsorder.getId());
        request.setNotifyUrl(WxMiniConfig.wxProperties.getNotifyUrl());//这个回调url必须是https开头的
        Amount amount = new Amount();
        amount.setTotal(goodsorder.getMoney().intValue());
        request.setAmount(amount);
//        PrepayResponse res = WxMiniConfig.wxPayService.prepay(request);
            // 跟之前下单示例一样，填充预下单参数
        PrepayWithRequestPaymentResponse resParam =  WxMiniConfig.jsapiExtService.prepayWithRequestPayment(request,WxMiniConfig.wxProperties.getSubAppId());
        response =resParam;

        return response;

    }


    /**
     * 验证营业时间
@@ -820,10 +1015,8 @@
                    s.setEditDate(date);
                    s.setEditor(null);
                    s.setCloseDate(date);

                    closeGoodsorder(s,Constants.REFUND_TYPE.PLAT_AUTO.getKey());
                }catch (BusinessException e){

                }catch (Exception e){

                }
@@ -838,10 +1031,7 @@
                .eq("status",Constants.goodsorderStatus.pay)
                .last(" limit 1 "));
        if(Objects.isNull(goodsorder)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无骑行订单记录");
        }
        if(goodsorder == null  ){
            throw new BusinessException(ResponseStatus.DATA_EMPTY );
            throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"无骑行订单记录");
        }
        if(Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey() ){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该订单当前状态不支持结算操作，请尝试刷新列表重试！" );
@@ -858,7 +1048,7 @@
    public String payNotify(String preOrderId,String paymentNo){
        Goodsorder goodsorder = this.goodsorderMapper.selectById(preOrderId);
        if(goodsorder.getStatus()==Constants.goodsorderStatus.pay){
            return WxPayNotifyResponse.success("处理成功!");
            return  ("处理成功!");
        }
        goodsorder.setOnlineOrderid(paymentNo);
        goodsorder.setPayStatus(Constants.goodsorderPayStatus.pay);
@@ -883,7 +1073,7 @@
        transactions.setObjId(goodsorder.getId());
        transactions.setObjType(Constants.ZERO);
        transactionsMapper.insert(transactions);
        return WxPayNotifyResponse.success("处理成功!");
        return  ("处理成功!");
    }