changes

liuhaonan

2022-08-26 7d6e1271ecd1b386c409c910df866aa8cccb46c2

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

@@ -149,7 +149,7 @@
                                    Integer subscribeChargingCapacity, String wxCode) {
        //查询充电桩是否存在正在进行中的订单
        C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
                .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).last("limit 1"));
                .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getC3Mac, c3m.getC3Mac()).last("limit 1"));

        //充电桩正在充电中
        if (c3mOrder != null && c3mOrder.getChargingStates() != null && c3mOrder.getChargingStates() == 0) {
@@ -362,27 +362,6 @@
        remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, timeMinus10).eq(C3mOrder::getOrderStatus, 0));
    }

    /**
     * 恢复继续充电
     *
     * @param c3Mac
     * @param mcuUdid
     */
    public void recoverContinueCharing(String c3Mac, String mcuUdid) {
        C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class).
                eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getC3Udid, mcuUdid).eq(C3mOrder::getChargingStates, 0).last("limit 1"));
        if (c3mOrder != null) {
            c3mOrder.setActualChargingCapacity(c3mOrder.getActualChargingCapacityHide());
            c3mOrder.setActualChargingCapacityHide(0.00);

            //再次充电电量
            double electricity = c3mOrder.getSubscribeChargingCapacity() - c3mOrder.getActualChargingCapacity();
            Integer chargingCapacity = Integer.valueOf(String.valueOf(Math.floor(electricity)));
            //再次充电金额
            double chargeAmount = c3mOrder.getSurplusAmount();
            SpringContextHolder.getBean(C3ChargingService.class).startCharging(c3Mac, chargingCapacity, chargeAmount);
        }
    }


    /**
@@ -412,6 +391,8 @@
            c3mOrder.setSurplusAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
            //结束充电(订单)时间
            c3mOrder.setStopChargingTimestamp(System.currentTimeMillis());
            //充电时长
            c3mOrder.setAlreadyChargingTime(dataPackage.getAlreadyChargingTime());
            updateById(c3mOrder);
        }
    }