fix

zhanzhiqin

2022-06-29 2e91f5c17fb67d24d16365ea4bc91a8d423ce6a0

fix

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java

@@ -67,9 +67,8 @@
            if (netRequestFrame.isValidate()) {
                //保存充电桩硬件信息
                boolean b = SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
                //检查是否有正在进行的订单
                //TODO

                //检查是否有正在进行的订单，有的话继续充电
                SpringContextHolder.getBean(C3mOrderService.class).recoverContinueCharing(netRequestFrame.getDestinationAddress(), netRequestFrame.getMcuUdid());
                if (!b) {
                    return;
                }

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

@@ -9,6 +9,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
import com.sandu.ximon.admin.pay.OrderStatusEnums;
@@ -49,6 +50,7 @@

    /**
     * 退款
     *
     * @param outTradeNo
     * @param refundAmount
     * @return
@@ -241,7 +243,7 @@
     */
    public void updateOrderStatusByHeartbeat(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
        C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class).eq(C3mOrder::getC3Mac, dataPackage.getC3Mac())
                .eq(C3mOrder::getChargingStates,1).last("limit 1"));
                .eq(C3mOrder::getChargingStates, 1).last("limit 1"));
        if (c3mOrder == null) {
            return;
        }
@@ -277,4 +279,26 @@
        remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, time).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);
        }
    }

}