优化

liuhaonan

2022-07-22 d9a9d8a2dad1d1e57b184bf8f972a03d654d883a

 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;

@@ -107,30 +109,20 @@
        C3mOrder.setRefundMsg(msg);
        if (b) {
            C3mOrder.setOrderStatus(OrderStatus.REFUND.getStatus());
            c3mOrderMapper.updateRefundOrder(C3mOrder);  // TODO: 退款日志
            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;
        }
    }
@@ -177,12 +169,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());
@@ -194,9 +180,6 @@
        c3mOrderEntity.setUserCode(wxCode);
        c3mOrderEntity.setC3Udid(c3m.getMcuUdid());


        //  推送到自动查询模块，进行扫描启动
//        orderQueryListener.startScan(OrderScanType.C3M.getType());   // TODO  测试时关闭
        if (b) {
            this.save(c3mOrderEntity);
        }
@@ -284,10 +267,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;
    }