From a78ac968018e42634cfb37a6a1ef3aa2dd10acc9 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 03 四月 2025 15:20:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index 4bd9598..f4c730d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -42,6 +42,7 @@
import com.dsh.guns.modular.system.service.TStoreOtherService;
import com.dsh.guns.modular.system.service.TTurnService;
import com.dsh.guns.modular.system.util.HttpRequestUtil;
+import com.dsh.guns.modular.system.util.ImageUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -52,6 +53,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -780,6 +782,9 @@
worldCupStore.setSort(sort);
worldCupStore.setId(id1);
worldCupStore.setBackgroundImage(backgroundImage);
+ if (ToolUtil.isNotEmpty(backgroundImage)) {
+ worldCupStore.setDisplayType(ImageUtils.getImageDimensions(backgroundImage).getDisplayType());
+ }
worldCupStore.setIsOpen(isOpen);
worldCupStores.add(worldCupStore);
}
@@ -796,24 +801,31 @@
StoreConfig one = storeConfigService.getOne(new QueryWrapper<StoreConfig>()
.eq("storeId", id)
.eq("type", type));
- if (one!=null){
- one.setSort(sort);
- one.setIsOpen(isOpen);
- if(ToolUtil.isNotEmpty(img)){
- one.setBackgroundImage(img);
+ try {
+ if (one != null) {
+ one.setSort(sort);
+ one.setIsOpen(isOpen);
+ if (ToolUtil.isNotEmpty(img)) {
+ one.setBackgroundImage(img);
+ one.setDisplayType(ImageUtils.getImageDimensions(img).getDisplayType());
+ }
}
+ if (one == null) {
+ StoreConfig storeConfig = new StoreConfig();
+ storeConfig.setStoreId(id);
+ storeConfig.setType(type);
+ storeConfig.setIsOpen(isOpen);
+ storeConfig.setSort(sort);
+ storeConfig.setBackgroundImage(img);
+ if (ToolUtil.isNotEmpty(img)) {
+ storeConfig.setDisplayType(ImageUtils.getImageDimensions(img).getDisplayType());
+ }
+ storeConfigService.save(storeConfig);
+ return storeConfig;
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
- if (one == null){
- StoreConfig storeConfig = new StoreConfig();
- storeConfig.setStoreId(id);
- storeConfig.setType(type);
- storeConfig.setIsOpen(isOpen);
- storeConfig.setSort(sort);
- storeConfig.setBackgroundImage(img);
- storeConfigService.save(storeConfig);
- return storeConfig;
- }
-
return one;
}
@RequestMapping(value = "/oneChangeNext")
--
Gitblit v1.7.1