changes

liuhaonan

2022-08-22 52a3bda95de2e73e5958644f57b2a3d32168a4a1

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java

@@ -140,27 +140,26 @@
    @Transactional(rollbackFor = Exception.class)
    public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
                                    Integer subscribeChargingCapacity, String wxCode) {

        //  判断该充电桩是否存在正在进行中的订单
        String chargingJson = redisUtils.get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3m.getC3Mac());
        if (null != chargingJson) {
            throw new BusinessException("该充电桩已存在正在进行中的订单");
        }
        //查询充电桩是否存在正在进行中的订单
        C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
                .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getChargingStates, 0).last("limit 1"));
                .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).last("limit 1"));

        if (c3mOrder != null && !c3mOrder.getUserCode().equals(wxCode)) {
            throw new BusinessException("该充电桩正在被别人使用");
        //充电桩正在充电中
        if (c3mOrder != null && c3mOrder.getChargingStates() == 0) {
            throw new BusinessException("充电桩正在被占用!");
        }

        //存在订单,但是未支付,需要取消订单
        if (c3mOrder != null) {
            throw new BusinessException("该充电桩已存在正在进行中的订单");
            c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
            updateById(c3mOrder);
        }

        Pole pole = poleService.getById(streetlightId);
        if (null == pole) {
            return null;
            throw new BusinessException("充电桩灯杆信息不存在!");
        }
        //  生成订单，并加载到redis缓存，设置超时时间为5分钟
        //  生成订单
        C3mOrder c3mOrderEntity = new C3mOrderVO().generateOrder(
                streetlightId,
                pole.getDeviceCode(),
@@ -169,7 +168,6 @@
                totalAmount,
                subscribeChargingCapacity
        );
        boolean b = true;
        c3mOrderEntity.setOrderId(snowflake.nextId());
        c3mOrderEntity.setC3Mac(c3m.getC3Name());
        c3mOrderEntity.setPoleId(streetlightId);
@@ -180,10 +178,15 @@
        c3mOrderEntity.setUserCode(wxCode);
        c3mOrderEntity.setC3Udid(c3m.getMcuUdid());

        if (b) {
            this.save(c3mOrderEntity);
        //
        c3mOrderEntity.setC3Name("创建订单");


        if (save(c3mOrderEntity)) {
            return c3mOrderEntity;
        } else {
            throw new BusinessException("创建订单失败,请重新扫码!");
        }
        return b ? c3mOrderEntity : null;
    }

    /**
@@ -194,6 +197,8 @@
        String orderSn = wxPayOrderNotifyResult.getOutTradeNo();
        String transactionId = wxPayOrderNotifyResult.getOutTradeNo();
        C3mOrder userOrder = getByOrderSn(orderSn);
        userOrder.setC3Name("回调成功");
        updateById(userOrder);
        if (userOrder == null) {
            return WxPayNotifyResponse.fail("订单不存在 sn=" + orderSn);
        }
@@ -309,8 +314,12 @@
    public void deleteOrderListByCreateTime() {
        // 获取当前时间戳
        Long time = System.currentTimeMillis();

        //当前时间减去10分钟
        Long timeMinus10 = time - 600000;

        //删除超过10分钟未付款的订单
        remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, time).eq(C3mOrder::getOrderStatus, 0));
        remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, timeMinus10).eq(C3mOrder::getOrderStatus, 0));
    }

    /**