changes

liuhaonan

2022-08-22 52a3bda95de2e73e5958644f57b2a3d32168a4a1

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

@@ -30,6 +30,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
import java.util.List;

@@ -57,11 +59,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("退款金额错误,不能大于付款金额");
        }
@@ -108,28 +110,19 @@
        if (b) {
            C3mOrder.setOrderStatus(OrderStatus.REFUND.getStatus());
            c3mOrderMapper.updateRefundOrder(C3mOrder);
           /* logService.log(
                    userId,
                    ServerTask.SERVER_TASK,
                    "C3m订单处理",
                    null,
                    "{ 操作者("+username+")" +
                            "订单退款: "+C3mOrder.getOutTradeNo()
                            +",订单总金额:"+C3mOrder.getTotalAmount()
                            +",退款金额: "+C3mOrder.getTotalAmount()+"}");*/

            log.error("充电桩退款 " + "{ 操作者(" + username + ")" +
                    "订单退款: " + C3mOrder.getOutTradeNo()
                    + ",订单总金额:" + C3mOrder.getTotalAmount()
                    + ",退款金额: " + C3mOrder.getRefundAmount() + "}");
            return true;
        } else {
            C3mOrder.setOrderStatus(OrderStatus.REFUND_FAILED.getStatus());
            c3mOrderMapper.updateRefundOrder(C3mOrder);
           /* logService.log(
                    userId,
                    ServerTask.SERVER_TASK,
                    "C3m订单处理",
                    null,
                    "{ 操作者("+username+")" +
                            "订单退款(失败): "+C3mOrder.getOutTradeNo()
                            +",订单总金额:"+C3mOrder.getTotalAmount()
                            +",退款金额: "+C3mOrder.getTotalAmount()+"}");*/
            log.error("充电桩退款 " + "{ 操作者(" + username + ")" +
                    "订单退款: " + C3mOrder.getOutTradeNo()
                    + ",订单总金额:" + C3mOrder.getTotalAmount()
                    + ",退款金额: " + C3mOrder.getRefundAmount() + "}");
            return false;
        }
    }
@@ -147,24 +140,26 @@
    @Transactional(rollbackFor = Exception.class)
    public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
                                    Integer subscribeChargingCapacity, String wxCode) {

        //  判断该充电桩是否存在正在进行中的订单
        String chargingJson = redisUtils.get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3m.getC3Mac());
        if (null != chargingJson) {
            throw new BusinessException("该充电桩已存在正在进行中的订单");
        }
        //查询充电桩是否存在正在进行中的订单
        C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
                .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getChargingStates, 1).last("limit 1"));
                .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).last("limit 1"));

        if (c3mOrder != null && !c3mOrder.getUserCode().equals(wxCode)) {
            throw new BusinessException("该充电桩正在被别人使用");
        //充电桩正在充电中
        if (c3mOrder != null && c3mOrder.getChargingStates() == 0) {
            throw new BusinessException("充电桩正在被占用!");
        }

        //存在订单,但是未支付,需要取消订单
        if (c3mOrder != null) {
            c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
            updateById(c3mOrder);
        }

        Pole pole = poleService.getById(streetlightId);
        if (null == pole) {
            return null;
            throw new BusinessException("充电桩灯杆信息不存在!");
        }
        //  生成订单，并加载到redis缓存，设置超时时间为5分钟
        //  生成订单
        C3mOrder c3mOrderEntity = new C3mOrderVO().generateOrder(
                streetlightId,
                pole.getDeviceCode(),
@@ -173,13 +168,6 @@
                totalAmount,
                subscribeChargingCapacity
        );
        //  加载到redis缓存中, 查询模块自动查询状态并处理
//        boolean b = redisUtils.set(
//                C3mRedisConstant.C3_NO_PAY_ORDER.getCode() + c3m.getC3Mac() + c3mOrderEntity.getOutTradeNo(),
//                JSON.toJSONString(c3mOrderEntity),
//                C3mRedisConfig.ORDER_MAX_TIME  // TODO  测试时关闭
//        );
        boolean b = true;
        c3mOrderEntity.setOrderId(snowflake.nextId());
        c3mOrderEntity.setC3Mac(c3m.getC3Name());
        c3mOrderEntity.setPoleId(streetlightId);
@@ -190,13 +178,15 @@
        c3mOrderEntity.setUserCode(wxCode);
        c3mOrderEntity.setC3Udid(c3m.getMcuUdid());

        //
        c3mOrderEntity.setC3Name("创建订单");

        //  推送到自动查询模块，进行扫描启动
//        orderQueryListener.startScan(OrderScanType.C3M.getType());   // TODO  测试时关闭
        if (b) {
            this.save(c3mOrderEntity);

        if (save(c3mOrderEntity)) {
            return c3mOrderEntity;
        } else {
            throw new BusinessException("创建订单失败,请重新扫码!");
        }
        return b ? c3mOrderEntity : null;
    }

    /**
@@ -207,6 +197,8 @@
        String orderSn = wxPayOrderNotifyResult.getOutTradeNo();
        String transactionId = wxPayOrderNotifyResult.getOutTradeNo();
        C3mOrder userOrder = getByOrderSn(orderSn);
        userOrder.setC3Name("回调成功");
        updateById(userOrder);
        if (userOrder == null) {
            return WxPayNotifyResponse.fail("订单不存在 sn=" + orderSn);
        }
@@ -259,7 +251,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) {
@@ -280,10 +272,38 @@
     * @param baseConditionVO
     * @return
     */
    public List<C3mOrderBo> orderList(BaseConditionVO baseConditionVO) {
    public List<C3mOrderBo> orderList(BaseConditionVO baseConditionVO, String keyword,
                                      Integer orderStatus, Integer timeType) {
        if (orderStatus != null && (orderStatus > 5 || orderStatus < 0)) {
            throw new BusinessException("订单状态不正确");
        }
        Long userId = SecurityUtils.getClientId();
        //查询近一个月的订单
        LocalDateTime now = LocalDateTime.now();
        LocalDateTime startTime = null;
        ;
        Long startTimeStamp = null;
        Long nowTimeStamp = null;
        if (timeType != null) {
            if (timeType == 1) {
                //查询近一个月的订单
                startTime = now.minusMonths(1);
            } else if (timeType == 2) {
                //查询近三个月的订单
                startTime = now.minusMonths(3);
            } else if (timeType == 3) {
                //查询近半年的订单
                startTime = now.minusMonths(6);
            } else {
                throw new BusinessException("时间类型不正确");
            }
            //startTime转换为时间戳
            startTimeStamp = startTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
            //endTime转换为时间戳
            nowTimeStamp = now.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<C3mOrderBo> list = baseMapper.orderList(userId);
        List<C3mOrderBo> list = baseMapper.orderList(userId, keyword, orderStatus, startTimeStamp, nowTimeStamp);
        return list;
    }

@@ -294,8 +314,12 @@
    public void deleteOrderListByCreateTime() {
        // 获取当前时间戳
        Long time = System.currentTimeMillis();

        //当前时间减去10分钟
        Long timeMinus10 = time - 600000;

        //删除超过10分钟未付款的订单
        remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, time).eq(C3mOrder::getOrderStatus, 0));
        remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, timeMinus10).eq(C3mOrder::getOrderStatus, 0));
    }

    /**