From 1af77abfa06a1a0d537bb120ae0c362aae9d3b83 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 30 七月 2025 10:14:40 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java
index c419c1c..f45b187 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java
@@ -18,6 +18,8 @@
import com.ruoyi.system.service.config.OneClinkSyncingService;
import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -42,8 +44,18 @@
@Override
public IPage<MgtOneClinkSyncPageVO> pageOneClinkSyncing(MgtOneClinkSyncingPageDTO mgtPageDto) {
+ if (null != mgtPageDto.getSyncingStartTime()){
+ LocalDateTime startTime = mgtPageDto.getSyncingStartTime().atStartOfDay();
+ mgtPageDto.setStartTime(startTime);
+ }
+ if(null != mgtPageDto.getSyncingEndTime()){
+ LocalDateTime endTime = mgtPageDto.getSyncingEndTime().atTime(LocalTime.MAX);
+ mgtPageDto.setEndTime(endTime);
+ }
+
//分页查询
IPage<MgtOneClinkSyncPageVO> page = new Page<>(mgtPageDto.getPageNum(),mgtPageDto.getPageSize());
+
return this.baseMapper.pageOneClinkSyncing(page,mgtPageDto);
}
@@ -55,11 +67,11 @@
if(oneClinkSyncing.getDelFlag() != 0 ){
return R.fail("该一键同步不存在");
}
- oneClinkSyncing.setUpdateTime(new Date());
+ oneClinkSyncing.setUpdateTime(LocalDateTime.now());
oneClinkSyncing.setUpdateUserId(dto.getUserId());
}else {
oneClinkSyncing.setCreateUserId(dto.getUserId());
- oneClinkSyncing.setCreateTime(new Date());
+ oneClinkSyncing.setCreateTime(LocalDateTime.now());
}
oneClinkSyncing.setSyncingName(dto.getSyncingName());
oneClinkSyncing.setCoverUrl(dto.getCoverUrl());
@@ -103,11 +115,11 @@
public R deleteOneClinkSyncing(Integer syncingId) {
//删除
OneClinkSyncing oneClinkSyncing = this.getById(syncingId);
- if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()==0){
+ if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()!=0){
return R.ok();
}
oneClinkSyncing.setDelFlag(1);
- oneClinkSyncing.setUpdateTime(new Date());
+ oneClinkSyncing.setUpdateTime(LocalDateTime.now());
oneClinkSyncing.setUpdateUserId(SecurityUtils.getUserId());
this.updateById(oneClinkSyncing);
return R.ok();
@@ -117,7 +129,7 @@
public R executeOneClinkSyncing(Integer syncingId) {
//根据oneClinkSyncing,修改门店信息
OneClinkSyncing oneClinkSyncing = this.getById(syncingId);
- if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()==0){
+ if (null == oneClinkSyncing || oneClinkSyncing.getDelFlag()!=0){
return R.fail("该一键同步不存在");
}
if (oneClinkSyncing.getShopIds() == null || oneClinkSyncing.getShopIds().trim().isEmpty()) {
@@ -126,7 +138,7 @@
R r = remoteShopService.updateShopByOneClinkSyncing(oneClinkSyncing);
- oneClinkSyncing.setSyncingTime(new Date());
+ oneClinkSyncing.setSyncingTime(LocalDateTime.now());
oneClinkSyncing.setSyncingUserId(SecurityUtils.getUserId());
this.updateById(oneClinkSyncing);
return R.ok();
--
Gitblit v1.7.1