kongdeqiang
2023-04-06 33574d5287d1a098ef72b6bbd65dc23100c2974e
增加功能
2个文件已修改
28 ■■■■ 已修改文件
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/OrderTaskController.java
@@ -83,6 +83,8 @@
    @Autowired
    private ICustomerReceiveService iCustomerReceiveService;
    boolean b = false;
    @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
    @ApiOperation(value = "通过id获取")
@@ -446,6 +448,16 @@
    @RequestMapping(value = "/insertOrders", method = RequestMethod.GET)
    @ApiOperation(value = "解析订单")
    public Result<Object> insertOrders(String sendTime) {
        if(b){
            return ResultUtil.error("正在处理");
        }
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        Date parse = null;
        try {
            parse = sdf.parse(sendTime);
        } catch (ParseException e) {
            e.printStackTrace();
        }
        String formatDate = getFormatDate(sendTime);
        QueryWrapper<OrderTask> wrapper2 = new QueryWrapper<OrderTask>();
        wrapper2.eq("order_date", formatDate);
@@ -454,9 +466,11 @@
            return ResultUtil.error("已存在今日数据");
        }else {
            QueryWrapper<OrderTaskOriginal> queryWrapper = new QueryWrapper<>();
            queryWrapper.between("order_date",dateStringFormat(getDate(sendTime)),dateStringFormat2(getDate(sendTime)));
            queryWrapper.between("order_date",DateUtil.beginOfDay(parse),DateUtil.endOfDay(parse));
            List<OrderTaskOriginal> originals = iOrderTaskOriginalService.list(queryWrapper);
            if(originals.size()>0){
                b=true;
            }
            int sumNum = 0;
            for(OrderTaskOriginal original:originals){
                try {
@@ -501,7 +515,7 @@
                    }
                    iOrderDetailService.saveBatch(detailList);
                }catch (Exception e){
                    System.out.println("报错了");
                    System.out.println(original.getId()+"报错了");
                }
            }
@@ -510,6 +524,7 @@
            orderLog.setType(0);
            iOrderLogService.save(orderLog);
            System.out.println("处理订单结束");
            b=false;
            return ResultUtil.success("导入成功");
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/schedulings/OrderSynScheduleImpl.java
@@ -7,6 +7,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -43,12 +44,12 @@
    @Autowired
    private IOrderLogService iOrderLogService;
    @Scheduled(cron="0 40 15 * * ?")//每晚凌晨1点执行
    @Scheduled(cron="0 59 15 * * ?")//每晚凌晨1点执行
    //@Scheduled(cron="0 11 15 * * ?")//每晚凌晨1点执行
    public void execute(){
        System.out.println("开始处理订单");
        QueryWrapper<OrderTaskOriginal> queryWrapper = new QueryWrapper<>();
        queryWrapper.between("create_time",dateStringFormat(new Date()),dateStringFormat2(new Date()));
        queryWrapper.between("order_date",DateUtil.beginOfDay(new Date()),DateUtil.endOfDay(new Date()));
        List<OrderTaskOriginal> list = iOrderTaskOriginalService.list(queryWrapper);
        int sumNum = 0;
@@ -95,7 +96,7 @@
                }
                iOrderDetailService.saveBatch(detailList);
            }catch (Exception e){
                System.out.println(original.getId()+"定时转换报错");
            }
        }