充电桩

liuhaonan

2022-06-29 0c7ccc45b410cadda34b3f2cad41d5dc69ce8da0

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

@@ -57,11 +57,11 @@
     * @param outTradeNo
     * @return
     */
    public boolean orderRefund(String outTradeNo,Double amt) {
    public boolean orderRefund(String outTradeNo, Double amt) {
        Long userId = SecurityUtils.getUserId();
        String username = SecurityUtils.getUsername();
        C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo);
        Double refundAmount=orderByOutTradeNo.getSurplusAmount();
        Double refundAmount = orderByOutTradeNo.getSurplusAmount();
        if (orderByOutTradeNo.getTotalAmount() < refundAmount) {
            throw new BusinessException("退款金额错误,不能大于付款金额");
        }
@@ -107,7 +107,8 @@
        C3mOrder.setRefundMsg(msg);
        if (b) {
            C3mOrder.setOrderStatus(OrderStatus.REFUND.getStatus());
            c3mOrderMapper.updateRefundOrder(C3mOrder);
            c3mOrderMapper.updateRefundOrder(C3mOrder);  // TODO: 退款日志

           /* logService.log(
                    userId,
                    ServerTask.SERVER_TASK,
@@ -155,10 +156,13 @@
        }
        //查询充电桩是否存在正在进行中的订单
        C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
                .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getChargingStates, 1).last("limit 1"));
                .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getChargingStates, 0).last("limit 1"));

        if (c3mOrder != null && !c3mOrder.getUserCode().equals(wxCode)) {
            throw new BusinessException("该充电桩正在被别人使用");
        }
        if (c3mOrder != null) {
            throw new BusinessException("该充电桩已存在正在进行中的订单");
        }
        Pole pole = poleService.getById(streetlightId);
        if (null == pole) {
@@ -259,7 +263,7 @@
     */
    public void updateOrderStatusByHeartbeat(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
        //充电中的心跳包需要去更新订单数据，否则不处理！
        if(dataPackage.getStatusBit().equals("02")){
        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) {