From b27efc697f2f81e0d0f247a2708e58af52a5df9b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 23 十月 2025 15:14:33 +0800
Subject: [PATCH] bug修改,后台新增修改用户积分
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 104 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 71 insertions(+), 33 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 b793c91..b037baa 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
@@ -1,7 +1,6 @@
package com.dsh.guns.modular.system.controller.code;
import cn.hutool.crypto.SecureUtil;
-import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,33 +13,52 @@
import com.dsh.course.feignClient.communityWorldCup.Model.WorldCupStoreVO;
import com.dsh.course.feignClient.communityWorldCup.WorldCupStoreClient;
import com.dsh.course.feignClient.competition.CompetitionClient;
-import com.dsh.course.feignClient.other.model.Site;
import com.dsh.course.mapper.UserMapper;
import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.SuccessTip;
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.ToolUtil;
-import com.dsh.guns.modular.system.model.*;
-import com.dsh.guns.modular.system.service.*;
-import com.dsh.guns.modular.system.util.GaoDeMapUtil;
+import com.dsh.guns.modular.system.model.StoreConfig;
+import com.dsh.guns.modular.system.model.TCity;
+import com.dsh.guns.modular.system.model.TOperator;
+import com.dsh.guns.modular.system.model.TOperatorCity;
+import com.dsh.guns.modular.system.model.TStore;
+import com.dsh.guns.modular.system.model.TStoreListVo;
+import com.dsh.guns.modular.system.model.TStoreOther;
+import com.dsh.guns.modular.system.model.TStoreOtherConfig;
+import com.dsh.guns.modular.system.model.TStoreOtherConfigTrue;
+import com.dsh.guns.modular.system.model.TTurn;
+import com.dsh.guns.modular.system.model.User;
+import com.dsh.guns.modular.system.service.ICityService;
+import com.dsh.guns.modular.system.service.IStoreService;
+import com.dsh.guns.modular.system.service.ITSiteService;
+import com.dsh.guns.modular.system.service.IUserService;
+import com.dsh.guns.modular.system.service.StoreConfigService;
+import com.dsh.guns.modular.system.service.TOperatorCityService;
+import com.dsh.guns.modular.system.service.TOperatorService;
+import com.dsh.guns.modular.system.service.TStoreOtherConfigService;
+import com.dsh.guns.modular.system.service.TStoreOtherConfigTrueService;
+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 io.swagger.models.auth.In;
-import org.apache.poi.ss.formula.functions.T;
-import org.bouncycastle.math.raw.Mod;
+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;
import org.springframework.ui.Model;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 车辆管理控制器
@@ -434,6 +452,12 @@
}else{
model.addAttribute("worldCupStores",worldCupStores);
}
+ //玩湃惠民卡
+ StoreConfig c10 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,10));
+ model.addAttribute("c10",c10);
+ //会员卡板块
+ StoreConfig c11 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,11));
+ model.addAttribute("c11",c11);
return PREFIX + "TShop_imgAll.html";
}
@@ -510,10 +534,10 @@
}
}
}else {
- TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getProvinceCode()));
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tStore.getProvinceCode()));
tStore.setProvince(one.getName());
tStore.setProvinceCode(one.getCode());
- TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getCityCode()));
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tStore.getCityCode()));
tStore.setCity(one1.getName());
tStore.setCityCode(one1.getCode());
}
@@ -722,9 +746,9 @@
}
@RequestMapping(value = "/saveImgAll")
@ResponseBody
- public Object saveImgAll(Integer id,Integer px1,Integer px2,Integer px3,Integer px4,Integer px5,Integer px6,Integer px7,Integer px8,
- String c1,String c2,String c3,String c4,String c5,String c6,String c7,String c8,
- Integer r1,Integer r2,Integer r3,Integer r4,Integer r5,Integer r6,Integer r7,Integer r8,String str) {
+ public Object saveImgAll(Integer id,Integer px1,Integer px2,Integer px3,Integer px4,Integer px5,Integer px6,Integer px7,Integer px8,Integer px10,Integer px11,
+ String c1,String c2,String c3,String c4,String c5,String c6,String c7,String c8,String c10,String c111,
+ Integer r1,Integer r2,Integer r3,Integer r4,Integer r5,Integer r6,Integer r7,Integer r8,Integer r10,Integer r11,String str) {
try {
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
StoreConfig collect1 = collect(id, px1, r1, c1, 1);
@@ -735,6 +759,8 @@
StoreConfig collect6 = collect(id, px6, r6, c6, 6);
StoreConfig collect7 = collect(id, px7, r7, c7, 7);
StoreConfig collect8 = collect(id, px8, r8, c8, 8);
+ StoreConfig collect10 = collect(id, px10, r10, c10, 10);
+ StoreConfig collect11 = collect(id, px11, r11, c111, 11);
storeConfigs.add(collect1);
storeConfigs.add(collect2);
storeConfigs.add(collect3);
@@ -743,7 +769,9 @@
storeConfigs.add(collect6);
storeConfigs.add(collect7);
storeConfigs.add(collect8);
- storeConfigService.updateBatchById(storeConfigs);
+ storeConfigs.add(collect10);
+ storeConfigs.add(collect11);
+ storeConfigService.saveOrUpdateBatch(storeConfigs);
// 修改世界杯
JSONArray jsonArray = JSONObject.parseArray(str);
@@ -759,6 +787,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);
}
@@ -775,24 +806,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