Bladeren bron

update

shuiqilin
houyi 1 jaar geleden
bovenliggende
commit
c89365132b

+ 2
- 1
src/main/java/com/qtzl/alterSales/manager/service/byd/BydServiceImpl.java Bestand weergeven

@@ -135,10 +135,11 @@ public class BydServiceImpl extends BydAbstract implements BydService {
final AflBydBrandConfig brandConfig = brandConfigs.stream().filter(vo -> vo.getBrandName().equals(infoVo.getVehicleModel())).findFirst().orElse(null);
String source = null == brandConfig ? getSource(brandConfigs, infoVo.getVin()) : brandConfig.getBrandCode();
userLoginInfo = userLoginInfos.stream().max(Comparator.comparing(AflUserLoginInfo::getInsertTime)).orElse(null);
final LocalDateTime localDateTime = null == userLoginInfo || null == userLoginInfo.getInsertTime() ? DateTools.addMinute(infoVo.getCreateTime(), 30) : userLoginInfo.getInsertTime();
// 查询绑定支付渠道时间
final LocalDateTime bindPayTime = getBindPayTime(infoVo.getPlateNo(), infoVo.getPlateColor());
dashboardDetails.add(new AflBydDashboardDetail(dashboard.getId(), infoVo.getVin(), infoVo.getPlateNo(), infoVo.getPlateColor(), infoVo.getOrderNo(),
null != bindPayTime ? DateTools.getDate(bindPayTime) : infoVo.getCreateTime(), DateTools.getDate(userLoginInfo.getInsertTime()), infoVo.getSuccessActivationTime(), source));
null != bindPayTime ? DateTools.getDate(bindPayTime) : infoVo.getCreateTime(), DateTools.getDate(localDateTime), infoVo.getSuccessActivationTime(), source));
}
}


+ 11
- 0
src/main/java/com/qtzl/alterSales/manager/tools/DateTools.java Bestand weergeven

@@ -64,6 +64,17 @@ public class DateTools {
return getDate(dateTime);
}

/***
* 获取时间增减秒数后的时间
* @param date 时间
* @param minute 分钟。可为负数
* @return 、
*/
public static LocalDateTime addMinute(Date date, int minute){
LocalDateTime localDateTime = getLocalDateTime(date);
return localDateTime.plusMinutes(minute);
}

/***
* 获取日期增减天数后的日期(零点)
* @param date 输入日期

+ 1
- 1
src/main/resources/application.yml Bestand weergeven

@@ -1,6 +1,6 @@
spring:
profiles:
active: dev
active: prod
# Redis数据源
# redis:
# # Redis数据库索引(默认为0)

+ 8
- 3
src/test/java/SaleTest.java Bestand weergeven

@@ -8,6 +8,8 @@ import com.qtzl.alterSales.dao.repo.jpa.third.EtcOrderVehicleInfoRepo;
import com.qtzl.alterSales.manager.enums.AflBydDashboardPushStateEnum;
import com.qtzl.alterSales.manager.quartz.AflCancelOrderTask;
import com.qtzl.alterSales.manager.quartz.AflPapersDesensitizationTask;
import com.qtzl.alterSales.manager.quartz.BydDashboardBatchSyncTask;
import com.qtzl.alterSales.manager.quartz.BydDashboardResultTask;
import com.qtzl.alterSales.manager.service.AflBydDashboardService;
import com.qtzl.alterSales.manager.service.byd.BydService;
import com.qtzl.alterSales.manager.service.byd.vo.BydDashBoardResponse;
@@ -49,11 +51,14 @@ public class SaleTest {
@Resource
private RedisUtils redisUtils;
@Resource
private AflPapersDesensitizationTask aflPapersDesensitizationTask;
private BydDashboardBatchSyncTask bydDashboardBatchSyncTask;
@Resource
private BydDashboardResultTask dashboardResultTask;

@Test
public void desensitizationTask(){
aflPapersDesensitizationTask.desensitizationHandler();
//bydDashboardBatchSyncTask.dashboardBatchSync();
dashboardResultTask.dashboardBatchSync();
}

@Test
@@ -103,6 +108,6 @@ public class SaleTest {
public void bydDataIntegration() throws ParseException, ServiceHandleException {
// 指定时间跑对应版本的数据。按天出
final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
bydService.dataIntegration(format.parse("2024-03-18 00:00:00"), format.parse("2024-03-20 23:59:59"));
bydService.dataIntegration(format.parse("2023-11-10 00:00:00"), format.parse("2024-01-31 23:59:59"));
}
}

Laden…
Annuleren
Opslaan