From f2f73975fdc5e79b2eddb0cb3fc07f65c11636a5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 七月 2025 14:17:56 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java | 1 -
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java | 10 +++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
index 25e953d..1967a52 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
@@ -510,7 +510,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) {
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 f45b187..269229b 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
@@ -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();
--
Gitblit v1.7.1