wang-hao-jie
2022-01-06 83e111cb2c6d9ed755bca23df293e412bfa49ebb
违章记录
3个文件已修改
14 ■■■■ 已修改文件
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -252,16 +252,21 @@
    @RequestMapping(value = "/signFor", method = RequestMethod.POST)
    @ApiOperation(value = "签收")
    public Object signFor(String orderId,int status,String content,String customerReceiveId,int time) {
    public Object signFor(String orderId,int status,String content,String customerReceiveId,int time,String carId) {
        if(status==1){
            if(StrUtil.isEmpty(customerReceiveId)){
                return ResultUtil.error("正常签收,接货人id必填");
            }
        }
        if(StrUtil.isEmpty(carId)){
            return ResultUtil.error("车辆id不能为空");
        }
        OrderTask orderTask = iOrderTaskService.getById(orderId);
        orderTask.setStatus(status);
        orderTask.setUserId(securityUtil.getCurrUser().getId());
        orderTask.setTime(time);
        orderTask.setCarId(carId);
        if(StrUtil.isNotEmpty(customerReceiveId)){
            orderTask.setCustomerReceiveId(customerReceiveId);
        }
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
@@ -43,10 +43,11 @@
    private ICustomerReceiveService iCustomerReceiveService;
    @Scheduled(cron="0 30 23 * * ?")//每晚凌晨1点执行
    //@Scheduled(cron="0 22 17 * * ?")//每晚凌晨1点执行
    public void execute(){
        QueryWrapper<OrderTaskOriginal> queryWrapper = new QueryWrapper<>();
        queryWrapper.between("create_time",dateStringFormat(new Date()),dateStringFormat2(new Date()));
        List<OrderTaskOriginal> list = iOrderTaskOriginalService.list();
        List<OrderTaskOriginal> list = iOrderTaskOriginalService.list(queryWrapper);
        for(OrderTaskOriginal original:list){
            OrderTask orderTask = new OrderTask();
@@ -59,7 +60,7 @@
            orderTask.setOrderDate(original.getOrderDate());
            orderTask.setSeq(original.getSeq());
            orderTask.setNum(original.getNum());
            orderTask.setCarId(orderTask.getAreaId());
            //orderTask.setCarId(orderTask.getAreaId());
            iOrderTaskService.saveOrUpdate(orderTask);
            updateCustomerRecive(orderTask.getCustomerId(),original.getLinker(),original.getCustomerPhone());
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/StatisticPcScheduleImpl.java
@@ -53,7 +53,7 @@
    public static final String HEAD = "statistic1::";
    @Scheduled(cron="0 0 * * * ?")//每小时
    @Scheduled(cron="0 15 * * * ?")//每小时15分钟时执行
    public void execute(){
        redisTemplate.set(HEAD+"car",iCarService.count()+"");//车辆
        redisTemplate.set(HEAD+"user",userService.countByType(0)+"");//司机