Pu Zhibing
2 天以前 6011b014ae65b7a1bea456c02af4e2cd3596d8a1
Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
2个文件已修改
19 ■■■■ 已修改文件
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/GovernmentCloudTask.java
@@ -276,8 +276,8 @@
    @Resource
    private JianGuanSystemClient  jianGuanSystemClient;
    // 每两小时执行一次的定时任务
//    @Scheduled(cron = "0 0 0/2 * * ?")
    // 每天下午3点执行的定时任务
    @Scheduled(cron = "0 0 15 * * *")
    public void taskMonth() {
        log.info("市政云传数据");
        // account服务
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -2408,4 +2408,19 @@
        return R.ok(String.valueOf(chargingOrder.getId()));
    }
//    @GetMapping(value = "/getOrderByCode")
//    @ApiOperation(value = "H5通过编号查询订单", tags = {"H5-首页-用户充电订单信息"})
//    public R<String> getOrderByCode(@RequestParam("code") String code) {
//        Long userId = tokenService.getLoginUserApplet().getUserId();
//        TChargingOrder chargingOrder = chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class)
//                .eq(TChargingOrder::getAppUserId, userId)
//                .in(TChargingOrder::getStatus, Arrays.asList(1,2,3,4))
//                .orderByDesc(TChargingOrder::getCreateTime)
//                .last("LIMIT 1"));
//        if(Objects.isNull(chargingOrder)){
//            return R.ok();
//        }
//        return R.ok(String.valueOf(chargingOrder.getId()));
//    }
}