From 4ee77a0ee732b1d760b08d986ab308dc8d89f6be Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 01 十一月 2023 10:43:54 +0800
Subject: [PATCH] 支付会员购买bug
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 359 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 300 insertions(+), 59 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 3598333..266e1e8 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,13 +1,16 @@
package com.dsh.guns.modular.system.controller.code;
import cn.hutool.crypto.SecureUtil;
+import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.account.CityClient;
import com.dsh.course.feignClient.account.model.CityListQuery;
import com.dsh.course.feignClient.account.model.TCityManager;
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;
@@ -17,8 +20,10 @@
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.util.HttpRequestUtil;
import io.swagger.models.auth.In;
import org.apache.poi.ss.formula.functions.T;
+import org.bouncycastle.math.raw.Mod;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -28,9 +33,8 @@
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 车辆管理控制器
@@ -76,6 +80,9 @@
@Autowired
private TOperatorService tOperatorService;
+ @Autowired
+ private ITSiteService siteService;
+
/**
* 跳转到车辆管理首页
@@ -94,14 +101,70 @@
*/
@RequestMapping("/tShop_add")
public String tCompetitionAdd(Model model) {
- List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
- model.addAttribute("list",list);
+
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
List<TOperator> list1 = tOperatorService.list();
+ if (UserExt.getUser().getObjectType()==2){
+ // 查询这个运营商管理的省
+ TOperator id = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("id", UserExt.getUser().getObjectId()));
+ if (id.getType()==1){
+ // 全国
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
+ }else{
+ // 找到他管理的省
+ List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", UserExt.getUser().getObjectId()).eq("pid", 0));
+ model.addAttribute("list",list);
+ }
+ }else{
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
+ }
+
+// if (!roleid.equals("1")){
+ TOperator operator1 = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("userId", UserExt.getUser().getId()));
+ if(operator1!=null){
+ model.addAttribute("operator",operator1.getId());
+ }else {
+ model.addAttribute("operator",0);
+ }
+// }
+
model.addAttribute("yysList",list1);
- return PREFIX + "tShop_add.html";
+ model.addAttribute("objectType",UserExt.getUser().getObjectType());
+ return PREFIX + "TShop_add.html";
}
+
+ // 运营商根据省筛选市区
+ @RequestMapping("/getCityYys")
+ @ResponseBody
+ public Object getCityYys(String province) {
+ Integer objectId = UserExt.getUser().getObjectId();
+
+ // 通过选择的省 获取管理的市
+ TOperatorCity byId = operatorCityService.getOne(new QueryWrapper<TOperatorCity>()
+ .eq("code",province).eq("operatorId",objectId));
+ // 如果为null 则说明管理的全国
+ if (byId == null){
+ TCity code = cityService.getOne(new QueryWrapper<TCity>().eq("code", province));
+ return cityService.list(new QueryWrapper<TCity>().eq("parent_id",code.getId()));
+ }else{
+ List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>()
+ .eq("operatorId", UserExt.getUser().getObjectId())
+ .eq("pid",byId.getId()));
+ if (list.size() == 0){
+ // 说明管理整个省
+ TCity code = cityService.getOne(new QueryWrapper<TCity>().eq("code", byId.getCode()));
+ // 获取省下面的所有市
+ return cityService.list(new QueryWrapper<TCity>().eq("parent_id", code.getId()));
+ }else{
+ // 没有管理整个省 获取对应的市
+ return list;
+ }
+ }
+ }
+
@RequestMapping("/tShop_add_one")
public String tCompetitionAddOne(Integer id,Model model) {
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
@@ -109,7 +172,7 @@
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("id",id);
- return PREFIX + "tShop_add_one.html";
+ return PREFIX + "TShop_add_one.html";
}
@RequestMapping("/tShop_add_two")
public String tCompetitionAddTwo(Integer id,Model model) {
@@ -119,6 +182,14 @@
String roleid = UserExt.getUser().getRoleid();
return PREFIX + "TShop_edit_three.html";
}
+ @RequestMapping("/tShop_add_two1")
+ public String tCompetitionAddTwo1(Integer id,Model model) {
+ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list);
+ model.addAttribute("id",id);
+ String roleid = UserExt.getUser().getRoleid();
+ return PREFIX + "TShop_add_two.html";
+ }
/**
@@ -127,20 +198,28 @@
@RequestMapping("/tShop_update/{id}")
public String tCityUpdate(@PathVariable Integer id, Model model) {
TStore byId = storeService.getById(id);
+ System.out.println("======byId========="+byId);
model.addAttribute("item",byId);
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
// TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getProvinceCode()));
- TOperatorCity one = operatorCityService.getOne(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, byId.getOperatorId()).eq(TOperatorCity::getType, 1));
+ List<TOperatorCity> one = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, byId.getOperatorId()).eq(TOperatorCity::getType, 1));
List<TOperatorCity> ones = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, byId.getOperatorId()).eq(TOperatorCity::getType, 1));
- model.addAttribute("list",ones);
- List<TOperatorCity> list3 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getPid, one.getId()).eq(TOperatorCity::getType, 2));
- if(list3.size()>0){
+
+ if(ones.size()>0){
+ model.addAttribute("list",ones);
+ TOperatorCity one1 = operatorCityService.getOne(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, byId.getOperatorId()).eq(TOperatorCity::getType, 1).eq(TOperatorCity::getCode,byId.getProvinceCode()));
+ List<TOperatorCity> list3 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().in(TOperatorCity::getPid, one1.getId()).eq(TOperatorCity::getType, 2));
model.addAttribute("list1",list3);
+ System.out.println("===list3======="+list3);
+
}else {
+ List<TCity> list2 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",list2);
TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getProvinceCode()));
List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId,one1.getId()));
model.addAttribute("list1",list1);
+ System.out.println("===list1======="+list1);
}
CityListQuery cityListQuery = new CityListQuery();
cityListQuery.setOffset(1);
@@ -158,13 +237,13 @@
User byId1 = userMapper.selectById(byId.getStoreStaffId());
model.addAttribute("city",byId1);
model.addAttribute("type",1);
- return PREFIX + "tShop_edit.html";
+ return PREFIX + "TShop_edit.html";
}
@RequestMapping("/tShop_update1/{id}")
public String tCityUpdate1(@PathVariable Integer id, Model model) {
TStoreOther byId = storeOtherService.getById(id);
model.addAttribute("item",byId);
- return PREFIX + "tShop_edit_one.html";
+ return PREFIX + "TShop_edit_one.html";
}
@@ -175,14 +254,16 @@
TStoreOtherConfig byId = storeOtherConfigService.getById(id);
TTurn one = tTurnService.getOne(new LambdaQueryWrapper<TTurn>().eq(TTurn::getName, byId.getName()));
// page list
- List<TTurn> list = tTurnService.list(new LambdaQueryWrapper<TTurn>().eq(TTurn::getPid, one.getId()));
+ if (one!=null) {
+ List<TTurn> list = tTurnService.list(new LambdaQueryWrapper<TTurn>().eq(TTurn::getPid, one.getId()));
+ model.addAttribute("list", list);
+ }
// type list
List<TTurn> list1 = tTurnService.list(new LambdaQueryWrapper<TTurn>().eq(TTurn::getPid, byId.getPageId()));
model.addAttribute("item",byId);
- model.addAttribute("list",list);
model.addAttribute("list1",list1);
- return PREFIX + "tShop_edit_two.html";
+ return PREFIX + "TShop_edit_two.html";
}
@RequestMapping("/tShop_update_one1/{id}")
public String tCityUpdateOne1(@PathVariable Integer id, Model model) {
@@ -196,7 +277,7 @@
model.addAttribute("list",list);
model.addAttribute("list1",list1);
- return PREFIX + "tShop_add_three.html";
+ return PREFIX + "TShop_add_three.html";
}
@@ -213,6 +294,7 @@
cityListQuery.setOffset(1);
cityListQuery.setLimit(10000);
cityListQuery.setCityCode(byId.getCityCode());
+ model.addAttribute("yysList", tOperatorService.list());
Page<TCityManager> list2 = cityClient.list(cityListQuery);
model.addAttribute("list1",list1);
model.addAttribute("list2",list2.getRecords());
@@ -222,14 +304,14 @@
User byId1 = userMapper.selectById(byId.getStoreStaffId());
model.addAttribute("city",byId1);
model.addAttribute("type",0);
- return PREFIX + "tShop_edit.html";
+ return PREFIX + "TShop_edit.html";
}
@RequestMapping("/tShop_gift/{id}")
public String tCityGift(@PathVariable Integer id, Model model) {
TStore byId = storeService.getById(id);
model.addAttribute("welfarePicture",byId.getWelfarePicture());
model.addAttribute("id",id);
- return PREFIX + "tShop_img.html";
+ return PREFIX + "TShop_img.html";
}
@RequestMapping("/tShop_indexSet/{id}")
public String tCityIndexSet(@PathVariable Integer id, Model model) {
@@ -250,7 +332,7 @@
StoreConfig c8 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,8));
model.addAttribute("c8",c8);
model.addAttribute("id",id);
- return PREFIX + "tShop_imgAll.html";
+ return PREFIX + "TShop_imgAll.html";
}
@@ -258,7 +340,15 @@
@ResponseBody
public Object list(String provinceCode, String cityCode , String name, String phone,String shopName) {
Page<TStoreListVo> page = new PageFactory<TStoreListVo>().defaultPage();
- List<TStoreListVo> list = storeService.listAll(page,provinceCode,cityCode,name,phone,shopName);
+ String roleid = UserExt.getUser().getRoleid();
+ List<TStoreListVo> list =new ArrayList<>();
+ if("3".equals(roleid)){
+ Integer objectId = UserExt.getUser().getObjectId();
+ list = storeService.listAllStore(page,provinceCode,cityCode,name,phone,shopName,objectId);
+ }else {
+ Integer objectId = UserExt.getUser().getObjectId();
+ list = storeService.listAll(page,provinceCode,cityCode,name,phone,shopName,objectId);
+ }
page.setRecords(list);
return super.packForBT(page);
}
@@ -289,22 +379,51 @@
@RequestMapping(value = "/add")
@ResponseBody
- public Object list(TStore tStore,String time,String userName,String userPhone,String ids,Integer type,Integer yyId,String lat,String lon) {
+ public Object list(TStore tStore,String time,String userName,String userPhone,String ids,Integer type,Integer yyId,String lat,String lon,String pCode1,String cCode1) {
try {
- if(ToolUtil.isNotEmpty(tStore.getProvinceCode())) {
- TOperatorCity byId = operatorCityService.getById(tStore.getProvinceCode());
- TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getCode()));
- tStore.setProvince(one.getName());
- tStore.setProvinceCode(one.getCode());
- List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getPid, byId.getId()).eq(TOperatorCity::getType, 2));
- if(list.size()>0){
- TOperatorCity byId1 = operatorCityService.getById(tStore.getCityCode());
- TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
+
+
+ if(yyId==null || type==1){
+ yyId=0;
+ }
+ if(yyId!=0) {
+ List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, yyId));
+ if(list1.size()>0){
+ if (ToolUtil.isNotEmpty(tStore.getProvinceCode())) {
+ TOperatorCity byId = operatorCityService.getById(tStore.getProvinceCode());
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getCode()));
+ tStore.setProvince(one.getName());
+ tStore.setProvinceCode(one.getCode());
+ List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getPid, byId.getId()).eq(TOperatorCity::getType, 2));
+ if (list.size() > 0) {
+ TOperatorCity byId1 = operatorCityService.getById(tStore.getCityCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
+ } else {
+ TCity byId1 = cityService.getById(tStore.getCityCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
+ }
+ }
+ }else {
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getProvinceCode()));
+ tStore.setProvince(one.getName());
+ tStore.setProvinceCode(one.getCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getCityCode()));
tStore.setCity(one1.getName());
tStore.setCityCode(one1.getCode());
- }else {
- TCity byId1 = cityService.getById(tStore.getCityCode());
- TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
+ }
+
+ }else {
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, pCode1));
+ if (one !=null){
+ tStore.setProvince(one.getName());
+ tStore.setProvinceCode(one.getCode());
+ }
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, cCode1));
+ if (one1 !=null){
tStore.setCity(one1.getName());
tStore.setCityCode(one1.getCode());
}
@@ -312,9 +431,15 @@
tStore.setStartTime(time.split(" - ")[0]);
tStore.setEndTime(time.split(" - ")[1]);
tStore.setIds(ids);
- tStore.setType(type);
+ if (UserExt.getUser().getObjectType()==2){
+ tStore.setType(2);
+ }else{
+ tStore.setType(type);
+ }
+
tStore.setOperatorId(yyId);
tStore.setState(1);
+ tStore.setCreateTime(new Date());
User user = new User();
List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getAccount, userPhone));
if(users.size()>0){
@@ -322,15 +447,35 @@
}
user.setAccount(userPhone);
user.setName(userName);
- user.setRoleid("2");
+ user.setRoleid("3");
user.setPhone(userPhone);
user.setPassword(SecureUtil.md5("a123456"));
+ user.setObjectType(3);
+ user.setStatus(1);
userMapper.insert(user);
tStore.setStoreStaffId(user.getId());
tStore.setLon(lon);
tStore.setLat(lat);
-
+ tStore.setOperatorId(UserExt.getUser().getObjectId());
storeService.save(tStore);
+ user.setObjectId(tStore.getId());
+
+
+
+
+ // 添加场地
+ TSite tSite = new TSite();
+ tSite.setName(tStore.getName());
+ tSite.setStoreId(tStore.getId());
+ tSite.setSign(1);
+ siteService.save(tSite);
+
+ HashMap<String, String> mapSite = new HashMap<>();
+ mapSite.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ mapSite.put("name",tStore.getName());
+ mapSite.put("space_id",tStore.getId().toString());
+ mapSite.put("area_id",tSite.getId().toString());
+ HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", mapSite);
ArrayList<StoreConfig> storeConfigs = new ArrayList<>();
for (int i = 1; i < 9; i++) {
@@ -342,6 +487,41 @@
storeConfigs.add(storeConfig);
}
storeConfigService.saveBatch(storeConfigs);
+
+
+ // 添加门店
+ HashMap<String, String> map1 = new HashMap<>();
+ map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("name",tStore.getName());
+ map1.put("short_name",tStore.getName());
+ map1.put("location",tStore.getCity());
+ map1.put("address",tStore.getAddress());
+ map1.put("telephone",tStore.getPhone());
+ map1.put("linkman",userName);
+ map1.put("business_time","[{\"start_time\":\""+tStore.getStartTime()+"\",\"close_time\":\""+tStore.getEndTime()+"\"}]");
+ map1.put("logo",tStore.getCoverDrawing());
+ map1.put("remark",tStore.getIntroduce());
+ map1.put("lat",tStore.getLat());
+ map1.put("lng",tStore.getLon());
+ map1.put("space_id",tStore.getId().toString());
+ String result = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpace", map1);
+ System.out.println(result);
+
+
+
+ for (String s : tStore.getIds().split(",")) {
+ HashMap<String, String> map = new HashMap<>();
+ map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ map.put("space_id",tStore.getId()+"");
+ map.put("device_id",s);
+ map.put("region_id",tSite.getId().toString());
+ // 添加门禁
+ String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map);
+ System.out.println(s1);
+ }
+
+
+
return new SuccessTip<>();
}catch (Exception e){
e.printStackTrace();
@@ -351,27 +531,53 @@
@RequestMapping(value = "/update")
@ResponseBody
- public Object update(TStore tStore,String time,String userName,String userPhone,String ids,Integer type,Integer yyId,String lat,String lon) {
+ public Object update(TStore tStore,String time,String userName,String userPhone,String ids,Integer type,Integer yyId,String lat,String lon,String pCode1,String cCode1) {
try {
- TStore byId = storeService.getById(tStore.getId());
+ TStore byIdc = storeService.getById(tStore.getId());
- if(ToolUtil.isNotEmpty(tStore.getProvinceCode())) {
- TOperatorCity tOperatorCity = operatorCityService.getById(tStore.getProvinceCode());
- TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, tOperatorCity.getCode()));
- tStore.setProvince(one.getName());
- tStore.setProvinceCode(one.getCode());
- List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getPid, tOperatorCity.getId()).eq(TOperatorCity::getType, 2));
- if(list.size()>0){
- TOperatorCity byId1 = operatorCityService.getById(tStore.getCityCode());
- TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
- tStore.setCity(one1.getName());
- tStore.setCityCode(one1.getCode());
+ if(yyId==null){
+ yyId=0;
+ }
+ if(tStore.getType()==1){
+ yyId=0;
+ }
+ if(yyId!=0) {
+ List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, yyId));
+ if(list1.size()>0){
+ if (ToolUtil.isNotEmpty(tStore.getProvinceCode())) {
+ TOperatorCity byId = operatorCityService.getById(tStore.getProvinceCode());
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId.getCode()));
+ tStore.setProvince(one.getName());
+ tStore.setProvinceCode(one.getCode());
+ List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getPid, byId.getId()).eq(TOperatorCity::getType, 2));
+ if (list.size() > 0) {
+ TOperatorCity byId1 = operatorCityService.getById(tStore.getCityCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
+ } else {
+ TCity byId1 = cityService.getById(tStore.getCityCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
+ }
+ }
}else {
- TCity byId1 = cityService.getById(tStore.getCityCode());
- TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, byId1.getCode()));
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getProvinceCode()));
+ tStore.setProvince(one.getName());
+ tStore.setProvinceCode(one.getCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getCityCode()));
tStore.setCity(one1.getName());
tStore.setCityCode(one1.getCode());
}
+
+ }else {
+ TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getProvinceCode()));
+ tStore.setProvince(one.getName());
+ tStore.setProvinceCode(one.getCode());
+ TCity one1 = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getId, tStore.getCityCode()));
+ tStore.setCity(one1.getName());
+ tStore.setCityCode(one1.getCode());
}
tStore.setStartTime(time.split(" - ")[0]);
tStore.setEndTime(time.split(" - ")[1]);
@@ -379,9 +585,9 @@
tStore.setType(type);
tStore.setOperatorId(yyId);
if(ToolUtil.isEmpty(tStore.getCoverDrawing())){
- tStore.setCoverDrawing(byId.getCoverDrawing());
+ tStore.setCoverDrawing(byIdc.getCoverDrawing());
}
- User user = userMapper.selectById(byId.getStoreStaffId());
+ User user = userMapper.selectById(byIdc.getStoreStaffId());
List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getAccount, userPhone).ne(User::getId,tStore.getStoreStaffId()));
if(users.size()>0){
return "5001";
@@ -393,6 +599,30 @@
tStore.setLon(lon);
tStore.setLat(lat);
storeService.updateById(tStore);
+ String ids1 = byIdc.getIds();
+
+
+
+ HashMap<String, String> mapx = new HashMap<>();
+ mapx.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ for (String s : ids1.split(",")) {
+ String post = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/deleteDevice/ids/" + s,mapx);
+ System.out.println(post);
+ }
+
+ for (String s : ids.split(",")) {
+ HashMap<String, String> map1 = new HashMap<>();
+ map1.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
+ map1.put("space_id",tStore.getId()+"");
+ map1.put("device_id",s);
+ map1.put("region_id","");
+ // 添加门禁
+ String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map1);
+ System.out.println(s1);
+ }
+
+
+
return new SuccessTip<>();
}catch (Exception e){
e.printStackTrace();
@@ -479,7 +709,13 @@
public Object onChange1(Integer oneId) {
try {
List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, oneId).eq(TOperatorCity::getType, 1));
- return list;
+ if(list.size()==0){
+ List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ return list1;
+ }else {
+
+ return list;
+ }
}catch (Exception e){
e.printStackTrace();
return ERROR;
@@ -490,8 +726,15 @@
@ResponseBody
public Object onChange2(Integer oneId) {
try {
- List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getOperatorId, oneId).eq(TOperatorCity::getType, 1));
+ List<TOperatorCity> list1 = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getId, oneId).eq(TOperatorCity::getType, 1));
List<TOperatorCity> list = operatorCityService.list(new LambdaQueryWrapper<TOperatorCity>().eq(TOperatorCity::getPid, oneId).eq(TOperatorCity::getType, 2));
+
+ // 若是全国 为空 去找这个省下面的市
+ if(list1.size()==0){
+ TCity byId = cityService.getById(oneId);
+ List<TCity> list2 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, byId.getId()));
+ return list2;
+ }
if(list.size()==0){
TOperatorCity tOperatorCity = list1.get(0);
Integer code = tOperatorCity.getCode();
@@ -533,10 +776,8 @@
@RequestMapping(value = "/deleteTwo")
public Object delete2(Integer id) {
try {
- TStoreOtherConfigTrue byId = tStoreOtherConfigTrueService.getById(id);
+ storeOtherConfigService.removeById(id);
- byId.setState(2);
- tStoreOtherConfigTrueService.updateById(byId);
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1