bug修改

huliguo

1 天以前 3397a979ede9401b6053341a6f319a768ca6aa58

bug修改

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java

@@ -511,7 +511,6 @@
        List<TLotteryEventPrize> prizeList = lotteryEventPrizeService.getPrizeListByLotteryEventId(lotteryEvent.getId());
        vo.setLotteryEventPrizeList(prizeList);
        if(null!=lotteryEvent.getShopId()){
            vo.setActivityType(6);
            //线下抽奖 取商户名称
            Shop data = remoteShopService.getShop(Long.valueOf(lotteryEvent.getShopId())).getData();
            if (null != data) {

 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,9 +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;
@@ -80,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();