Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

puzhibing

3 天以前 21573e8e02dc47202ca3e1f7d4705795a09c1b60

 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,13 @@

    @Override
    public IPage<MgtOneClinkSyncPageVO> pageOneClinkSyncing(MgtOneClinkSyncingPageDTO mgtPageDto) {
        LocalDateTime startTime = mgtPageDto.getSyncingStartTime().atStartOfDay();
        LocalDateTime endTime = mgtPageDto.getSyncingEndTime().atTime(LocalTime.MAX);
        mgtPageDto.setStartTime(startTime);
        mgtPageDto.setEndTime(endTime);
        //分页查询
        IPage<MgtOneClinkSyncPageVO> page = new Page<>(mgtPageDto.getPageNum(),mgtPageDto.getPageSize());

        return this.baseMapper.pageOneClinkSyncing(page,mgtPageDto);
    }

@@ -55,11 +62,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 +110,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 +124,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 +133,7 @@

        R r = remoteShopService.updateShopByOneClinkSyncing(oneClinkSyncing);

        oneClinkSyncing.setSyncingTime(new Date());
        oneClinkSyncing.setSyncingTime(LocalDateTime.now());
        oneClinkSyncing.setSyncingUserId(SecurityUtils.getUserId());
        this.updateById(oneClinkSyncing);
        return R.ok();