整理接口

jiangping

2023-10-12 b1c1c20ef382dd2be0f6bdf81f5d2913e749faef

整理接口

 server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java

@@ -3,6 +3,7 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -127,7 +128,7 @@
    @PostMapping("/closerGoodsorder")
    @RequiresPermissions("business:goodsorder:query")
    public ApiResponse closerGoodsorder(@RequestParam String id){
        goodsorderService.closerGoodsorder(id);
        goodsorderService.forceCloseGoodsorder(id);
        return ApiResponse.success(null);
    }


 server/platform/src/main/java/com/doumee/task/ScheduleTool.java

@@ -3,10 +3,12 @@

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.WxBillService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
@@ -24,6 +26,7 @@
 */
@Component
@EnableScheduling
@Slf4j
public class ScheduleTool {


@@ -50,19 +53,11 @@
     * 測試
     * @throws Exception
     */
//    @Scheduled(fixedDelay = 1000*60)
    @Scheduled(cron = "0 0 21 * * ? ")
    public void getYesterdayBill() throws Exception {

        Goodsorder goodsorder = new Goodsorder();
        goodsorder.setIsdeleted(Constants.ZERO);
        goodsorder.setStatus(Constants.goodsorderStatus.pay);
        List<Goodsorder> list = goodsorderService.findList(goodsorder);
        if (!CollectionUtils.isEmpty(list)){
            list.forEach(s->{
                goodsorderService.closerGoodsorder(s.getId());
            });

        }
        log.info("=====================开始每天自动结算=======================");
        goodsorderService.autoCloseOrder();
        log.info("=====================结束每天自动结算=======================");

    }
}

 server/services/src/main/java/com/doumee/core/constants/Constants.java

@@ -25,6 +25,7 @@
    public static final String SYSTEM ="SYSTEM" ;
    public static final String DINGDING ="DINGDING" ;
    public static final String MINI_PROGRAMME ="MINI_PROGRAMME" ;
    public static final String FREE_RENT_TIME ="FREE_RENT_TIME" ;
    public static final String IMG_DIR = "IMG_DIR";
    public static final String FILE_DIR ="FILE_DIR" ;
    public static final String PRIVATE_KEY = "PRIVATE_KEY";
@@ -57,13 +58,63 @@
        int waitPay =0;
        int pay =1;
    }
    public interface transactionsType{
        int deposit =0;
        int consumption =1;
    public enum TRANSACTIONS_TYPE{
      //交易类型 0租车押金 1结算实际消费 2结算退款 3平台退款"
        DEPOSIT(0,"租车押金", "租车押金"),

        int refund =2;
        int platformRefund = 3;
        CONSUMPTION(1,"结算实际消费", "结算实际消费"),

        REFUND(2,"结算退款", "结算退款"),

        PLATFORMREFUND(3,"平台退款", "平台退款")

        ;
        String name;

        Integer key;

        String info;

        TRANSACTIONS_TYPE(Integer key, String name, String info) {
            this.name = name;
            this.key = key;
            this.info = info;
    }
        public static TRANSACTIONS_TYPE get(int key) {
            TRANSACTIONS_TYPE[] values = TRANSACTIONS_TYPE.values();
            for (TRANSACTIONS_TYPE object : values) {
                if (object.key == key) {
                    return object;
                }
            }
            return null;
        }

        public String getName() {
            return name;
        }

        public void setName(String name) {
            this.name = name;
        }

        public Integer getKey() {
            return key;
        }

        public void setKey(Integer key) {
            this.key = key;
        }

        public String getInfo() {
            return info;
        }

        public void setInfo(String info) {
            this.info = info;
        }
    }


public static  String getUUID(){
      return UUID.randomUUID().toString().replace("-","");
@@ -270,6 +321,15 @@
            this.info = info;
        }

        public static REFUND_TYPE get(int key) {
            REFUND_TYPE[] values = REFUND_TYPE.values();
            for (REFUND_TYPE object : values) {
                if (object.key == key) {
                    return object;
                }
            }
            return null;
        }
        public String getName() {
            return name;
        }

 server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java

@@ -20,13 +20,14 @@
        //接收消息回调
        @Override
        public void connectionLost(Throwable cause) {

            // 连接丢失后，一般在这里面进行重连
            System.out.println("连接断开，重连中");
            try {
                MqttClientInit.refreshClient();
            } catch (MqttException e) {
                throw new RuntimeException(e);
            }
            // 连接丢失后，一般在这里面进行重连
            System.out.println("连接断开，可以做重连");
        }

        @Override

 server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java

@@ -52,6 +52,7 @@
            if ("SUCCESS".equals(response.getReturnCode()) && "SUCCESS".equals(response.getResultCode())) {
                //存储退款记录 与 流水记录
                Refund refund = new Refund();
                refund.setId(Constants.getUUID());
                refund.setCreateDate(new Date());
                refund.setMemberId(refundDTO.getMemberId());
                refund.setMoney(refundDTO.getRefundAmount());
@@ -65,17 +66,18 @@
                refundMapper.insert(refund);
                //存储交易流水表
                Transactions transactions = new Transactions();
                transactions.setId(Constants.getUUID());
                transactions.setMemberId(refundDTO.getMemberId());
                transactions.setCreateDate(new Date());
                transactions.setIsdeleted(Constants.ZERO);
                transactions.setOrderId(refundDTO.getOrderId());
                transactions.setMoney(refundDTO.getRefundAmount());
                transactions.setType(refundDTO.getType()==Constants.transactionsType.refund?Constants.transactionsType.platformRefund:Constants.transactionsType.refund);
                transactions.setType(refundDTO.getType()==Constants.TRANSACTIONS_TYPE.REFUND.getKey()?Constants.TRANSACTIONS_TYPE.PLATFORMREFUND.getKey():Constants.REFUND_TYPE.BACK.getKey());
                transactions.setPreOrderid(refundDTO.getOrderId());
                transactions.setOnlineOrderid(refNum);
                transactions.setDoneDate(new Date());
                transactions.setTitle("退款");
                transactions.setContent(refundDTO.getType()==Constants.transactionsType.refund?"平台退款":"结算退款");
                transactions.setTitle(Constants.TRANSACTIONS_TYPE.get(transactions.getType()).getName());
                transactions.setContent(Constants.TRANSACTIONS_TYPE.get(transactions.getType()).getInfo());
                transactions.setBalance(BigDecimal.ZERO);
                transactions.setObjId(refund.getId());
                transactions.setObjType(Constants.ONE);

 server/services/src/main/java/com/doumee/dao/business/join/MemberRidesJoinMapper.java

@@ -1,12 +1,13 @@
package com.doumee.dao.business.join;

import com.doumee.dao.business.model.ActionLog;
import com.doumee.dao.business.model.MemberRides;
import com.github.yulichang.base.mapper.MPJJoinMapper;
import org.springframework.stereotype.Repository;

/**
 * @author T14
 * @author 江蹄蹄
 * @date 2023/09/27 18:06
 */
@Repository
public interface MemberRidesJoinMapper extends MPJJoinMapper<MemberRides> {

}

 server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java

@@ -102,7 +102,7 @@
    @ApiModelProperty(value = "结算操作人编码（关联system_user)")
    private String closeUserId;

    @ApiModelProperty(value = "结算类型 0自动结算 1平台人工结算 2系统自动结算")
    @ApiModelProperty(value = "结算类型 0用户自行结算 1平台人工强制结算 2系统自动结算")
    private Integer closeType;

    @ApiModelProperty(value = "用户openid" )

 server/services/src/main/java/com/doumee/service/business/GoodsorderService.java

@@ -144,8 +144,8 @@
     * @param id
     * @return
     */
    void closerGoodsorder(String id);

    void closeGoodsorder(Goodsorder order,int type );
    void forceCloseGoodsorder(String orderId);

    /**
     * 退款
@@ -184,4 +184,6 @@
    List<GoodsorderExportVO> findExportAccountDetailPage(Goodsorder model);

    void goodsOrderSettlement(String orderId);

    void autoCloseOrder();
}

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

@@ -74,8 +74,6 @@
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Autowired
    private MemberRidesMapper memberRidesMapper;

    @Autowired
    private MemberMapper memberMapper;
@@ -259,7 +257,7 @@
        homeResponse.setRideStatus(-1);
        if(homeResponse.getDepositStatus()==Constants.goodsorderStatus.pay) {
            //查询当前骑行状态
            MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>().eq("member_id", memberId)
            MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().eq("member_id", memberId)
                    .orderByDesc(" create_date ")
                    .last(" limit 1  "));
            if (!Objects.isNull(memberRides)) {
@@ -327,141 +325,134 @@
        goodsorderDetailDTO.setModel(goodsorder);//订单对象
        return goodsorderDetailDTO;
    }

    @Override
    public void forceCloseGoodsorder(String orderId) {
        //查询订单 信息
//        int freeTime = 0;
//        try {
//            freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
//        }catch (Exception e){
//
//        }
        if(StringUtils.isBlank(orderId)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST );
        }
        Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
        if(goodsorder == null  ){
            throw new BusinessException(ResponseStatus.DATA_EMPTY );
        }
        if(Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey() ){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该订单当前状态不支持结算操作，请尝试刷新列表重试！" );
        }
        //订单结算
        Date date = new Date();
        goodsorder.setEditDate(date);
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        goodsorder.setEditor(user.getId());
        closeGoodsorder(  goodsorder,Constants.REFUND_TYPE.PLAT_FORCE.getKey());
    }
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    @Override
    public void closerGoodsorder(String orderId) {
    public void closeGoodsorder( Goodsorder goodsorder ,int type ) {


        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
        QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(MemberRides::getOrdreId,orderId);
        List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
        MPJLambdaWrapper<MemberRides> wrapper = new MPJLambdaWrapper<>();
        wrapper.eq(MemberRides::getOrdreId,goodsorder.getId());
        wrapper.leftJoin(BaseParam.class, BaseParam::getId, MemberRides::getParamId);
        wrapper.orderByDesc(BaseParam::getSortnum);//取最高车型作为计价方案
        //查询所有骑行记录
        List<MemberRides> memberRides = memberRidesJoinMapper.selectList(wrapper);
        //默认结算为押金金额
        BigDecimal closeMoney = new BigDecimal(0.00);
        if (!CollectionUtils.isEmpty(memberRides)){
            boolean exitUnBack = memberRides.stream().anyMatch(s -> !Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey().equals(s.getStatus()));
            if (exitUnBack){
            //骑行总时长
            int durationSum = 0;
            for(MemberRides rides : memberRides){
                if ( Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(rides.getStatus()))){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"当前订单有未完成的骑行，无法强制结算");
            }

            PricingRuleDTO pricingRule = pricingRuleService.getPricingRule(memberRides);
            RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
            List<MemberRidesResponse> collect = memberRides.stream().map(s -> {
                MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
                memberRidesResponse.setRideStartTime(s.getRentDate());
                memberRidesResponse.setRideEndTime(s.getBackDate());
                memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRidesResponse.getRideStartTime(), memberRidesResponse.getRideEndTime()));
                memberRidesResponse.setDuration(s.getDuration());
                memberRidesResponse.setBikeType(s.getParamName());
                memberRidesResponse.setBikeCode(s.getBikeCode());
                memberRidesResponse.setBasePrice(s.getBasePrice());
                memberRidesResponse.setBaseTime(s.getBaseTime());
                memberRidesResponse.setUnitPrice(s.getUnitTime());
                memberRidesResponse.setUnitTime(s.getUnitTime());
                return memberRidesResponse;
            }).collect(Collectors.toList());

            Integer durationSum = memberRides.stream().filter(s -> s.getDuration() > 0).mapToInt(s -> s.getDuration()).sum();
            if (durationSum > pricingRule.getMemberRides().getBaseTime()){
                BigDecimal bigDecimal = new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime()));
                BigDecimal basePrice = pricingRule.getMemberRides().getBasePrice();
                BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice()
                                                .multiply(bigDecimal.divide(pricingRule.getMemberRides().getUnitPrice(),BigDecimal.ROUND_UP));
                ridesDetailResponse.setAmount(basePrice.add(multiply));
            }else {
                ridesDetailResponse.setAmount(pricingRule.getMemberRides().getBasePrice());
                durationSum += Constants.formatIntegerNum(rides.getDuration());//累计骑行（计费）时长
            }
            ridesDetailResponse.setBikeType(pricingRule.getBikeType());
            ridesDetailResponse.setDuration(durationSum);
            ridesDetailResponse.setMemberRidesResponseList(collect);

            if(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())>Constants.ZERO){

                RefundDTO refundDTO = new RefundDTO();
                refundDTO.setOrderId(orderId);
                refundDTO.setCanBalance(goodsorder.getMoney());
                refundDTO.setRefundAmount(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
                refundDTO.setTotalAmount(goodsorder.getMoney());
                refundDTO.setMemberId(goodsorder.getMemberId());
                refundDTO.setReason("平台强制结算退款");
                refundDTO.setType(Constants.REFUND_TYPE.PLAT_AUTO.getKey());
                Refund refund = wxMiniUtilService.wxRefund(refundDTO);

                //存储 消费交易流水
                Transactions transactions = new Transactions();
                transactions.setMemberId(goodsorder.getMemberId());
                transactions.setCreateDate(new Date());
                transactions.setIsdeleted(Constants.ZERO);
                transactions.setOrderId(orderId);
                transactions.setMoney(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())<=Constants.ZERO?goodsorder.getMoney():ridesDetailResponse.getAmount());
                transactions.setType(Constants.transactionsType.consumption);
                transactions.setDoneDate(new Date());
                transactions.setTitle("消费结算");
                transactions.setContent("结算实际消费");
                transactions.setBalance(BigDecimal.ZERO);
                transactions.setObjId(orderId);
                transactions.setObjType(Constants.ONE);
                transactionsMapper.insert(transactions);

                Goodsorder update = new Goodsorder();
                update.setId(goodsorder.getId());
                update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
                update.setCloseMoney(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
                update.setCloseId(refund.getId());
                update.setCloseDate(refund.getDoneDate());
                update.setCloseInfo(refund.getInfo());
                update.setCloseUserId(principal.getId());
                update.setCloseType(Constants.ONE);
                goodsorderMapper.updateById(update);
            //取最高车型计算方案结算订单
            MemberRides topRides = memberRides.get(0);
            if(durationSum > 0){
                int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
                closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
                //如果是一口价方式，价格直接为一口价baseMoney,如果不是计算正常价格
                if(baseTime != -1){//不是一口价
                    if(durationSum > baseTime && Constants.formatIntegerNum(topRides.getUnitTime())>0){
                        //如果超出了起步价格，计算超出价格
                        BigDecimal unit = new BigDecimal(durationSum-baseTime).divide(new BigDecimal(topRides.getUnitTime()), 0, BigDecimal.ROUND_UP);
                        //计算金额累计超出部门价格（超出时间单位*超出单位时间价格）
                        closeMoney = closeMoney.add(unit.multiply(Constants.formatDecimalNum(topRides.getUnitPrice())));
            }
        }else {

            RefundDTO refundDTO = new RefundDTO();
            refundDTO.setOrderId(orderId);
            refundDTO.setCanBalance(goodsorder.getMoney());
            refundDTO.setRefundAmount(goodsorder.getMoney());
            refundDTO.setTotalAmount(goodsorder.getMoney());
            refundDTO.setMemberId(goodsorder.getMemberId());
            refundDTO.setReason("平台强制结算退款");
            refundDTO.setType(Constants.REFUND_TYPE.PLAT_FORCE.getKey());
            Refund refund = wxMiniUtilService.wxRefund(refundDTO);

            //存储 消费交易流水
            Transactions transactions = new Transactions();
            transactions.setMemberId(goodsorder.getMemberId());
            transactions.setCreateDate(new Date());
            transactions.setIsdeleted(Constants.ZERO);
            transactions.setOrderId(orderId);
            transactions.setMoney(goodsorder.getMoney());
            transactions.setType(Constants.transactionsType.consumption);
            transactions.setDoneDate(new Date());
            transactions.setTitle("消费结算");
            transactions.setContent("结算实际消费");
            transactions.setBalance(BigDecimal.ZERO);
            transactions.setObjId(orderId);
            transactions.setObjType(Constants.ONE);
            transactionsMapper.insert(transactions);

                }
            }
            //实际结算价格，记录在最高车型记录上
            topRides.setActualPrice(closeMoney);
            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);
            }
        }
            Goodsorder update = new Goodsorder();
            update.setId(goodsorder.getId());
            update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
            update.setCloseMoney(goodsorder.getMoney());
            update.setCloseId(refund.getId());
            update.setCloseDate(refund.getDoneDate());
            update.setCloseInfo(refund.getInfo());
            update.setCloseUserId(principal.getId());
        update.setCloseDate(goodsorder.getEndDate());
        update.setCloseInfo(Constants.REFUND_TYPE.get(type).getInfo());
        update.setCloseUserId(goodsorder.getEditor());
        if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
            //如果是强制结算
            update.setCloseType(Constants.ONE);
        }else  if(Constants.REFUND_TYPE.NORMAL.getKey() == type){
            //如果是自行結算
            update.setCloseType(Constants.ZERO);
        }else{
            //如果是平台自动结算
            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.setType(type);
            Refund refund = wxMiniUtilService.wxRefund(refundDTO);
            update.setCloseId(refund.getId());
            //存储 消费交易流水
            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(goodsorder.getMoney());
            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);

        }


    }

    @Override
    public void backGoodsorder(String orderId, BigDecimal money,String reason) {

        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
        QueryWrapper<Refund> wrapper = new QueryWrapper<>();
@@ -570,7 +561,7 @@
        QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(MemberRides::getOrdreId,id);
        List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
        List<MemberRides> memberRides = memberRidesJoinMapper.selectList(wrapper);
        if (!CollectionUtils.isEmpty(memberRides)){
            PricingRuleDTO pricingRule = pricingRuleService.getPricingRule(memberRides);
            RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
@@ -688,86 +679,44 @@


    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void autoCloseOrder( ) {
        Goodsorder goodsorder = new Goodsorder();
        goodsorder.setIsdeleted(Constants.ZERO);
        goodsorder.setStatus(Constants.goodsorderStatus.pay);
        List<Goodsorder> list = findList(goodsorder);
        if (!CollectionUtils.isEmpty(list)){
            Date date = new Date();
            list.forEach(s->{
                try {
                    goodsorder.setEditDate(date);
                    goodsorder.setEditor(null);
                    closeGoodsorder(s,Constants.REFUND_TYPE.PLAT_AUTO.getKey());
                }catch (BusinessException e){

                }catch (Exception e){

                }
            });
        }

    }
    @Override
    public void goodsOrderSettlement(String orderId) {
        if(StringUtils.isBlank(orderId)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST );
        }
        Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
        QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
        wrapper.lambda().eq(MemberRides::getOrdreId,orderId);
        List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
        if (!CollectionUtils.isEmpty(memberRides)){
            boolean exitUnBack = memberRides.stream().anyMatch(s -> !Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey().equals(s.getStatus()));
            if (exitUnBack){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"当前订单有未完成的骑行，无法强制结算");
        if(goodsorder == null  ){
            throw new BusinessException(ResponseStatus.DATA_EMPTY );
            }
            PricingRuleDTO pricingRule = pricingRuleService.getPricingRule(memberRides);
            RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
            List<MemberRidesResponse> collect = memberRides.stream().map(s -> {
                MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
                memberRidesResponse.setRideStartTime(s.getRentDate());
                memberRidesResponse.setRideEndTime(s.getBackDate());
                memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRidesResponse.getRideStartTime(), memberRidesResponse.getRideEndTime()));
                memberRidesResponse.setDuration(s.getDuration());
                memberRidesResponse.setBikeType(s.getParamName());
                memberRidesResponse.setBikeCode(s.getBikeCode());
                memberRidesResponse.setBasePrice(s.getBasePrice());
                memberRidesResponse.setBaseTime(s.getBaseTime());
                memberRidesResponse.setUnitPrice(s.getUnitTime());
                memberRidesResponse.setUnitTime(s.getUnitTime());
                return memberRidesResponse;
            }).collect(Collectors.toList());

            Integer durationSum = memberRides.stream().filter(s -> s.getDuration() > 0).mapToInt(s -> s.getDuration()).sum();
            if (durationSum > pricingRule.getMemberRides().getBaseTime()){
                BigDecimal basePrice = pricingRule.getMemberRides().getBasePrice();
                BigDecimal multiply = pricingRule.getMemberRides().getUnitPrice().multiply(new BigDecimal((durationSum - pricingRule.getMemberRides().getBaseTime())).divide(new BigDecimal(pricingRule.getMemberRides().getUnitTime())).setScale(0,BigDecimal.ROUND_CEILING));
                ridesDetailResponse.setAmount(basePrice.add(multiply));
            }else {
                ridesDetailResponse.setAmount(pricingRule.getMemberRides().getBasePrice());
        if(Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey() ){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该订单当前状态不支持结算操作，请尝试刷新列表重试！" );
            }
            ridesDetailResponse.setBikeType(pricingRule.getBikeType());
            ridesDetailResponse.setDuration(durationSum);
            ridesDetailResponse.setMemberRidesResponseList(collect);
            Refund refund = new Refund();

            //若消费金额 大于 订单押金，则不进行退款业务
            if(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())>Constants.ZERO){
                RefundDTO refundDTO = new RefundDTO();
                refundDTO.setOrderId(orderId);
                refundDTO.setCanBalance(goodsorder.getMoney());
                refundDTO.setRefundAmount(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
                refundDTO.setTotalAmount(goodsorder.getMoney());
                refundDTO.setMemberId(goodsorder.getMemberId());
                refundDTO.setReason("用户主动退款");
                refundDTO.setType(Constants.REFUND_TYPE.NORMAL.getKey());
                refund = wxMiniUtilService.wxRefund(refundDTO);
            }

            //存储 消费 交易流水
            Transactions transactions = new Transactions();
            transactions.setMemberId(goodsorder.getMemberId());
            transactions.setCreateDate(new Date());
            transactions.setIsdeleted(Constants.ZERO);
            transactions.setOrderId(orderId);
            transactions.setMoney(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())<=Constants.ZERO?goodsorder.getMoney():ridesDetailResponse.getAmount());
            transactions.setType(Constants.transactionsType.consumption);
            transactions.setDoneDate(new Date());
            transactions.setTitle("消费结算");
            transactions.setContent("结算实际消费");
            transactions.setBalance(BigDecimal.ZERO);
            transactions.setObjId(orderId);
            transactions.setObjType(Constants.ONE);
            transactionsMapper.insert(transactions);

            Goodsorder update = new Goodsorder();
            update.setId(goodsorder.getId());
            update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
            update.setCloseMoney(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
            update.setCloseId(!Objects.isNull(refund)?refund.getId():null);
            update.setCloseDate(!Objects.isNull(refund)?refund.getDoneDate():null);
            update.setCloseInfo(!Objects.isNull(refund)?refund.getInfo():null);
            update.setCloseType(Constants.ONE);
            goodsorderMapper.updateById(update);
        }
        //订单结算
        Date date = new Date();
        goodsorder.setEditDate(date);
        goodsorder.setEditor(null);
        closeGoodsorder( goodsorder,Constants.REFUND_TYPE.NORMAL.getKey());
    }


@@ -790,12 +739,12 @@
        transactions.setIsdeleted(Constants.ZERO);
        transactions.setOrderId(goodsorder.getId());
        transactions.setMoney(goodsorder.getMoney());
        transactions.setType(Constants.transactionsType.deposit);
        transactions.setType(Constants.TRANSACTIONS_TYPE.DEPOSIT.getKey());
        transactions.setPreOrderid(goodsorder.getPreOrderid());
        transactions.setOnlineOrderid(goodsorder.getOnlineOrderid());
        transactions.setDoneDate(new Date());
        transactions.setTitle("支付");
        transactions.setContent("押金支付");
        transactions.setTitle(Constants.TRANSACTIONS_TYPE.DEPOSIT.getName());
        transactions.setContent(Constants.TRANSACTIONS_TYPE.DEPOSIT.getInfo());
        transactions.setBalance(goodsorder.getMoney());
        transactions.setObjId(goodsorder.getId());
        transactions.setObjType(Constants.ZERO);