充电桩

liuhaonan

2022-06-29 430ec88e92370b785fbed7d0243ba22a6aabf2ce

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

@@ -55,13 +55,13 @@
     * 退款
     *
     * @param outTradeNo
     * @param refundAmount
     * @return
     */
    public boolean orderRefund(String outTradeNo, Double refundAmount/*, Long userId, String username*/) {
    public boolean orderRefund(String outTradeNo,Double amt) {
        Long userId = SecurityUtils.getUserId();
        String username = SecurityUtils.getUsername();
        C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo);
        Double refundAmount=orderByOutTradeNo.getSurplusAmount();
        if (orderByOutTradeNo.getTotalAmount() < refundAmount) {
            throw new BusinessException("退款金额错误,不能大于付款金额");
        }
@@ -103,7 +103,7 @@
                    C3mOrder.getPoleId()
            );
        }
        C3mOrder.setRefundTimestamp(new Date().getTime());
        C3mOrder.setRefundTimestamp(System.currentTimeMillis());
        C3mOrder.setRefundMsg(msg);
        if (b) {
            C3mOrder.setOrderStatus(OrderStatus.REFUND.getStatus());
@@ -206,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);
@@ -226,6 +225,7 @@
        if (s.isEmpty() || s == null) {
            throw new BusinessException("开启充电失败");
        }
        //开启充电成功后，更新订单状态为充电中
        userOrder.setChargingStates(0);
        if (!updateById(userOrder)) {
            return WxPayNotifyResponse.fail("更新数据已失效");
@@ -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,7 +291,7 @@
    /**
     * 获取创建时间超过10分钟的订单 并且没有支付的订单
     */
    public void getOrderListByCreateTime() {
    public void deleteOrderListByCreateTime() {
        // 获取当前时间戳
        Long time = System.currentTimeMillis();
        //删除超过10分钟未付款的订单