fix

zhanzhiqin

2022-06-29 23fd3f969d2e35c40742b6cd69a24ddf0195732a

 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;
@@ -102,7 +103,7 @@
                    C3mOrder.getPoleId()
            );
        }
        C3mOrder.setRefundTimestamp(new Date().getTime());
        C3mOrder.setRefundTimestamp(System.currentTimeMillis());
        C3mOrder.setRefundMsg(msg);
        if (b) {
            C3mOrder.setOrderStatus(OrderStatus.REFUND.getStatus());
@@ -155,10 +156,8 @@
        //查询充电桩是否存在正在进行中的订单
        C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
                .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getChargingStates, 1).last("limit 1"));
        if (c3mOrder != null) {
            throw new BusinessException("该充电桩已存在正在进行中的订单");
        }
        if (!c3mOrder.getUserCode().equals(wxCode)) {

        if (c3mOrder != null && !c3mOrder.getUserCode().equals(wxCode)) {
            throw new BusinessException("该充电桩正在被别人使用");
        }
        Pole pole = poleService.getById(streetlightId);
@@ -207,7 +206,6 @@
        WxPayOrderNotifyResult wxPayOrderNotifyResult = fastPayService.parseOrderNotifyResult(xmlData);
        String orderSn = wxPayOrderNotifyResult.getOutTradeNo();
        String transactionId = wxPayOrderNotifyResult.getOutTradeNo();
        Integer totalFee = wxPayOrderNotifyResult.getTotalFee();
        C3mOrder userOrder = getByOrderSn(orderSn);
        if (userOrder == null) {
            return WxPayNotifyResponse.fail("订单不存在 sn=" + orderSn);
@@ -220,15 +218,17 @@
        userOrder.setOutTradeNo(transactionId);
        userOrder.setPayTimestamp(new Date().getTime());
        userOrder.setOrderStatus(OrderStatusEnums.PAID.getCode());
        if (!updateById(userOrder)) {
            return WxPayNotifyResponse.fail("更新数据已失效");
        }
        /**
         * 调起开始充电接口
         */
        String s = c3ChargingService.startCharging(userOrder.getC3Mac(), userOrder.getSubscribeChargingCapacity(), userOrder.getTotalAmount());
        if (s.isEmpty() || s == null) {
            throw new BusinessException("开启充电失败");
        }
        //开启充电成功后，更新订单状态为充电中
        userOrder.setChargingStates(0);
        if (!updateById(userOrder)) {
            return WxPayNotifyResponse.fail("更新数据已失效");
        }

        return WxPayNotifyResponse.success("更新数据成功");
@@ -258,16 +258,19 @@
     * 根据心跳包更新订单状态
     */
    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"));
        if (c3mOrder == null) {
            return;
        //充电中的心跳包需要去更新订单数据，否则不处理！
        if(dataPackage.getStatusBit().equals("02")){
            C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class).eq(C3mOrder::getC3Mac, dataPackage.getC3Mac())
                    .eq(C3mOrder::getChargingStates, 1).last("limit 1"));
            if (c3mOrder == null) {
                return;
            }
            //更新充电总量
            c3mOrder.setActualChargingCapacityHide(Double.parseDouble(dataPackage.getChargedCapacity()));
            //更新剩余金额
            c3mOrder.setSurplusAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
            updateById(c3mOrder);
        }
        //更新充电总量
        c3mOrder.setActualChargingCapacityHide(Double.parseDouble(dataPackage.getChargedCapacity()));
        //更新剩余金额
        c3mOrder.setSurplusAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
        updateById(c3mOrder);
    }


@@ -288,11 +291,33 @@
    /**
     * 获取创建时间超过10分钟的订单 并且没有支付的订单
     */
    public void getOrderListByCreateTime() {
    public void deleteOrderListByCreateTime() {
        // 获取当前时间戳
        Long time = System.currentTimeMillis();
        //删除超过10分钟未付款的订单
        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);
        }
    }

}