From d7267c7e475cb544bdd0d3132fc23831cbb0a2aa Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 11:22:47 +0800
Subject: [PATCH] 运营商权限
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index 4a72ddc..6db3b75 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -158,7 +158,7 @@
List<StoreVos> provinces = pointMercharsClient.getProvinces(id);
model.addAttribute("city",provinces);
}
- if (infoOneVo.getUseScope() == 2){
+ if (infoOneVo.getUseScope() == 3){
List<StoreVos> storeVos = pointMercharsClient.getStoreList(id);
model.addAttribute("store",storeVos);
}
@@ -483,7 +483,6 @@
pointsMerchandise.setCoursePackageConfigId(coursePackageConfigId);
// 代替storeId
pointsMerchandise.setShelves(1);
- Integer id = pointMercharsClient.add(pointsMerchandise);
if(typeAll!=2){
if(useScope==2){
ArrayList<Map<String,String>> objects = new ArrayList<>();
@@ -495,11 +494,25 @@
map.put("pCode",pCity.getCode());
map.put("cName",tCity.getName());
map.put("cCode",tCity.getCode());
- map.put("id",id.toString());
+ map.put("id","0");
objects.add(map);
}
pointMercharsClient.addCitys(objects);
}else if(useScope==3){
+
+ Integer oid=null;
+ String[] split = storeIds.split(",");
+ for (int i = 0; i < split.length; i++) {
+ if(i==0){
+ Integer operatorId = storeService.getById(split[0]).getOperatorId();
+ oid=operatorId;
+ }
+ Integer operatorId = storeService.getById(split[i]).getOperatorId();
+ if(oid!=operatorId){
+ return "5003";
+ }
+ }
+ Integer id = pointMercharsClient.add(pointsMerchandise);
String pam = id+"_"+storeIds;
// 添加多个城市 门店
try{
@@ -508,7 +521,14 @@
}catch (Exception e){
e.printStackTrace();
}
+ }else if(useScope==1){
+ Integer id = pointMercharsClient.add(pointsMerchandise);
}
+
+
+
+ }else {
+ Integer id = pointMercharsClient.add(pointsMerchandise);
}
return new SuccessTip<>();
@@ -571,6 +591,7 @@
public String tCityUpdate(@PathVariable Integer id, Model model) {
System.out.println("id:"+id);
PointMercharsVo pointMercharsVo = pointMercharsClient.queryPointMerchaseDetailOfId(id);
+
System.out.println("pointMercharsVo:"+pointMercharsVo);
String[] split = pointMercharsVo.getPics().split(",");
StringBuilder concatenatedString = new StringBuilder();
--
Gitblit v1.7.1