From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 21 +++++-----
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 2
cloud-server-other/src/main/java/com/dsh/other/entity/Site.java | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java | 2
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 3 +
cloud-server-management/src/main/java/com/dsh/course/feignClient/other/SiteClient.java | 8 +++
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 26 +++++++++----
7 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index e674942..fc40208 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -911,11 +911,12 @@
ArrayList<Integer> list3 = new ArrayList<>();
list3.add(44);
detailsResponse.setRid(list3);
- }else {
+ }else if(pointsMerchandise.getPointsMerchandiseId()==197) {
ArrayList<Integer> list4 = new ArrayList<>();
list4.add(43);
detailsResponse.setRid(list4);
}
+
}
}
//======================================================
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/SiteClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/SiteClient.java
index 17f3563..1cdfacf 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/SiteClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/SiteClient.java
@@ -52,7 +52,13 @@
*/
@RequestMapping("/base/site/addSite")
Integer addSite(@RequestBody Site site);
-
+ /**
+ * 添加场地管理 自定义id
+ *
+ * @return
+ */
+ @RequestMapping("/base/site/addSite1")
+ Integer addSite1(@RequestBody Site site);
@RequestMapping("/base/site/listById")
Site listById(@RequestParam("id") Integer id);
@RequestMapping("/base/site/listBooks")
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 381e544..e86fe36 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
@@ -532,16 +532,6 @@
user.setObjectId(tStore.getId());
userService.updateById(user);
- ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
- for (int i = 1; i < 9; i++) {
- StoreConfig storeConfig = new StoreConfig();
- storeConfig.setIsOpen(1);
- storeConfig.setSort(i);
- storeConfig.setType(i);
- storeConfig.setStoreId(tStore.getId());
- storeConfigs.add(storeConfig);
- }
- storeConfigService.saveBatch(storeConfigs);
// 添加门店
HashMap<String, String> map1 = new HashMap<>();
map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
@@ -565,6 +555,17 @@
tStore.setId(integer);
storeService.save(tStore);
System.err.println(tStore);
+ ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
+ for (int i = 1; i < 9; i++) {
+ StoreConfig storeConfig = new StoreConfig();
+ storeConfig.setIsOpen(1);
+ storeConfig.setSort(i);
+ storeConfig.setType(i);
+ storeConfig.setStoreId(tStore.getId());
+ storeConfigs.add(storeConfig);
+ }
+ storeConfigService.saveBatch(storeConfigs);
+
// HashMap<String, String> mapSite = new HashMap<>();
// mapSite.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
// mapSite.put("name",tStore.getName());
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index 90d491e..afe92a2 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -487,7 +487,7 @@
String area_id = data.getString("area_id");
Integer integer = Integer.valueOf(area_id);
site.setId(integer);
- Integer integer1 = siteClient.addSite(site);
+ Integer integer1 = siteClient.addSite1(site);
// Integer integer = Integer.valueOf(spaceId);
if(StringUtils.hasLength( site.getIds())) {
for (String s1 : site.getIds().split(",")) {
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java
index 6b71bf1..38b0835 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java
@@ -12,7 +12,7 @@
@TableName("t_store")
@Data
public class TStore {
- @TableId(type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.INPUT)
private Integer id;
@TableField("name")
private String name;
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index d877677..da42599 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -128,7 +128,16 @@
}
}
-
+ /**
+ * 添加场地管理
+ *
+ * @return
+ */
+ @RequestMapping("/base/site/addSite1")
+ public Integer addSite1(@RequestBody Site site) {
+ boolean save = siteService.save(site);
+ return site.getId();
+ }
/**
* 添加场地管理
*
@@ -482,14 +491,15 @@
byId.setSid(Arrays.asList(storeId));
- List<Site> list = siteService.list(new LambdaQueryWrapper<Site>()
- .eq(Site::getStoreId, storeId)
- .eq(Site::getSign, 1));
- List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
- byId.setRid(collect);
+// List<Site> list = siteService.list(new LambdaQueryWrapper<Site>()
+// .eq(Site::getStoreId, storeId)
+// .eq(Site::getSign, 1));
+// List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
+ Integer siteId = byId.getSiteId();
+ ArrayList<Integer> list1 = new ArrayList<>();
+ list1.add(siteId);
+ byId.setRid(list1);
map.put("data", byId);
-
-
map.put("ids", ids);
return ResultUtil.success(map);
} catch (Exception e) {
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
index 019016c..9399be5 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
@@ -19,7 +19,7 @@
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
* 门店id
--
Gitblit v1.7.1