java/PlayPai.git

			@@ -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;
			@@ -450,9 +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";
			}

			@@ -529,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());
			}
			@@ -741,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,Integer px10,
			String c1,String c2,String c3,String c4,String c5,String c6,String c7,String c8,String c10,
			Integer r1,Integer r2,Integer r3,Integer r4,Integer r5,Integer r6,Integer r7,Integer r8,Integer r10,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);
			@@ -755,6 +760,7 @@
			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);
			@@ -764,6 +770,7 @@
			storeConfigs.add(collect7);
			storeConfigs.add(collect8);
			storeConfigs.add(collect10);
			storeConfigs.add(collect11);
			storeConfigService.saveOrUpdateBatch(storeConfigs);

			// 修改世界杯
			@@ -780,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);
			}
			@@ -796,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")