From 7109e2fefaa46caffcd36b44828f48e0f8a790ba Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 11 七月 2023 09:36:50 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index 1a0a4f2..5bf7f88 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -30,6 +30,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.util.*;
import java.util.function.Function;
@@ -202,6 +203,12 @@
newShop = true;
}
BeanUtils.copyProperties(mgtEditShopDto,shop);
+ String shopDetail = shop.getShopDetail();
+ if(StringUtils.isNotBlank(shopDetail)){
+ byte[] decodedBytes = Base64.getDecoder().decode(shopDetail);
+ shopDetail = new String(decodedBytes, StandardCharsets.UTF_8);
+ shop.setShopDetail(shopDetail);
+ }
//商户编号
if(mgtEditShopDto.getShopId()==null){
String shopNo = CodeFactoryUtil.getShopNo();
@@ -495,6 +502,12 @@
Shop shop = this.getById(shopId);
//基本信息拷贝
BeanUtils.copyProperties(shop,mgtShopInfoVo);
+ String shopDetail = mgtShopInfoVo.getShopDetail();
+ if(StringUtils.isNotBlank(shopDetail)){
+ byte[] encodedBytes = Base64.getEncoder().encode(shopDetail.getBytes(StandardCharsets.UTF_8));
+ shopDetail = new String(encodedBytes, StandardCharsets.UTF_8);
+ mgtShopInfoVo.setShopDetail(shopDetail);
+ }
//商户标签
List<ShopRelTag> shopRelTagList = shopRelTagService.listShopRelTagByShopId(shopId);
if(shopRelTagList!=null&&!shopRelTagList.isEmpty()){
--
Gitblit v1.7.1