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

puzhibing

2 天以前 f2f73975fdc5e79b2eddb0cb3fc07f65c11636a5

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.dto.MGtOneClinkSyncingShopPageDTO;
@@ -18,8 +19,11 @@
import com.ruoyi.system.service.config.OneClinkSyncingService;
import org.springframework.stereotype.Service;

import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.Arrays;
import java.util.Base64;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -43,8 +47,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);
    }

@@ -69,7 +83,12 @@
        oneClinkSyncing.setPlatformCouponFlag(dto.getPlatformCouponFlag());
        oneClinkSyncing.setShopNum(dto.getShopNum());
        oneClinkSyncing.setShopIds(dto.getShopIds());
        oneClinkSyncing.setShopDetail(dto.getShopDetail());
        String shopDetail = dto.getShopDetail();
        if(StringUtils.isNotBlank(shopDetail)){
            byte[] decodedBytes = Base64.getDecoder().decode(shopDetail);
            shopDetail = new String(decodedBytes, StandardCharsets.UTF_8);
            oneClinkSyncing.setShopDetail(shopDetail);
        }

        this.saveOrUpdate(oneClinkSyncing);
        return R.ok();
@@ -104,7 +123,7 @@
    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);
@@ -118,7 +137,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()) {