大屏接口bug修改

无关风月

18 小时以前 b5ead35c1d955f2a0e2e10da79254860d0ba95e9

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisOrderDataController.java

@@ -7,6 +7,7 @@
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import cn.hutool.core.io.resource.ClassPathResource;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.admin.entity.MasterWorker;
@@ -20,6 +21,7 @@
import com.ruoyi.admin.vo.SiteLargeeVO;
import com.ruoyi.admin.vo.WorkersLargeeVO;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.entity.Order;
@@ -38,7 +40,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;

@@ -216,6 +220,7 @@
            while (iterator.hasNext()){
                AnalysisOrderData analysisOrderData = iterator.next();
                try {
                    analysisOrderData.setDataType(1);
                    analysisOrderData.setOrderDate(new SimpleDateFormat("yyyy-MM-dd").parse(analysisOrderData.getOrderDateStr()));
                }catch (Exception e){
                    errors.add("回收订单编号:["+analysisOrderData.getOrderNum()+"],时间格式化错误,忽略导入");
@@ -246,16 +251,27 @@
            orders.forEach(order -> {
                AnalysisOrderData analysisOrderData = new AnalysisOrderData();
                analysisOrderData.setOrderNum(order.getOrderNumber());
                analysisOrderData.setOrderDate(analysisOrderData.getOrderDate());
//                analysisOrderData.setOrderChannel(order.getOrderChannel());
                try {
                    analysisOrderData.setOrderDate(new SimpleDateFormat("yyyy-MM-dd").parse(order.getTime()));
                } catch (ParseException e) {
                    throw new RuntimeException(e);
                }
                analysisOrderData.setOrderChannel(order.getSiteName());
                analysisOrderData.setCity(order.getCity());
                analysisOrderData.setOrderCategory(order.getServeName());
                analysisOrderData.setUserName(order.getReservationName());
                analysisOrderData.setUserPhone(order.getReservationPhone());
                analysisOrderData.setRecyclePerson(order.getServerName());
                analysisOrderData.setState(order.getState());
                analysisOrderData.setImportTime(LocalDateTime.now());
                analysisOrderData.setDataType(2);
                analysisOrderDataList.add(analysisOrderData);
            });
            // 删除今日订单
            analysisOrderDataService.remove(new QueryWrapper<AnalysisOrderData>().lambda()
                            .eq(AnalysisOrderData::getDataType,2)
                    .like(AnalysisOrderData::getOrderDate, new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
            );
            analysisOrderDataService.saveBatch(analysisOrderDataList);
        }
        return R.ok();