cloud-server-account/src/main/java/com/dsh/account/feignclient/course/model/RecordAppoint.java
@@ -36,4 +36,9 @@ private List<Integer> ids; private List<Integer> sid; private List<Integer> rid; } cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
@@ -39,6 +39,8 @@ private Integer userId; private List<Integer> rid; private List<Integer> sid; @ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡") private Integer cardType; cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -676,6 +676,7 @@ if(merchandise.getUseScope()==1){ sids.add(0); detailsResponse.setSid(sids); detailsResponse.setRid(new ArrayList<>()); }else if(merchandise.getUseScope()==2){ // 指定城市 List<PointsMerchandiseCity> list = pmdsCityService.list(new LambdaQueryWrapper<PointsMerchandiseCity>().eq(PointsMerchandiseCity::getPointsMerchandiseId, merchandise.getId())); @@ -685,13 +686,23 @@ } List<Integer> storeIds = stoClient.queryStoreIdByCityCode(collect); detailsResponse.setSid(storeIds); if(storeIds.size()>0){ // 获取rid List<Integer> rid= stoClient.querySiteIdById(storeIds); detailsResponse.setRid(rid); } }else if(merchandise.getUseScope()==3){ // 指定门店 List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>().eq(PointsMerchandiseStore::getPointsMerchandiseId, merchandise.getId())); List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList()); detailsResponse.setSid(collect); if(collect.size()>0){ // 获取rid List<Integer> rid= stoClient.querySiteIdById(collect); detailsResponse.setRid(rid); } } } cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java
@@ -40,6 +40,11 @@ private Integer userId; private List<Integer> rid; private List<Integer> sid; @ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡") cloud-server-activity/src/main/java/com/dsh/activity/feignclient/other/StoreClient.java
@@ -23,5 +23,8 @@ @PostMapping("/store/queryStoreIdByCityCode") List<Integer> queryStoreIdByCityCode(@RequestBody List<String> collect); @PostMapping("/store/querySiteIdById") List<Integer> querySiteIdById(@RequestBody List<Integer> storeIds); } cloud-server-course/src/main/java/com/dsh/course/feignclient/model/RecordAppoint.java
@@ -35,4 +35,9 @@ private List<Integer> ids; private List<Integer> sid; private List<Integer> rid; } cloud-server-course/src/main/java/com/dsh/course/feignclient/other/StoreClient.java
@@ -43,4 +43,8 @@ //查询运营商 @PostMapping("/store/queryByStoreId") OperatorUser queryByStoreId(Integer storeId); @PostMapping("/store/querySiteId") List<Integer> querySiteId(Integer storeId); } cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -782,6 +782,10 @@ coursePackage = tcpmapper.selectById(coursePackageStudent.getCoursePackageId()); coursePackageId = coursePackageStudent.getCoursePackageId(); } recordVo.setSid(Arrays.asList(coursePackage.getStoreId())); List<Integer> rid = stoClient.querySiteId(coursePackage.getStoreId()); recordVo.setRid(rid); recordVo.setUserId(appUserId); recordVo.setSiteId(coursePackage.getSiteId()); List<Integer> ids1 = getIds(coursePackage.getSiteId()); cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -10,6 +10,7 @@ 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; @@ -77,6 +78,9 @@ @Autowired private TOperatorService tOperatorService; @Autowired private ITSiteService siteService; /** @@ -411,6 +415,22 @@ user.setObjectId(tStore.getId()); userMapper.insert(user); // 添加场地 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++) { StoreConfig storeConfig = new StoreConfig(); @@ -448,7 +468,7 @@ map.put("sign","0DB011836143EEE2C2E072967C9F4E4B"); map.put("space_id",tStore.getId()+""); map.put("device_id",s); map.put("region_id",""); 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); cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -477,7 +477,8 @@ HashMap<String, String> map = new HashMap<>(); map.put("sign","0DB011836143EEE2C2E072967C9F4E4B"); map.put("name",site.getName()); map.put("space_id",integer1.toString()); map.put("space_id",site.getStoreId().toString()); map.put("area_id",integer1.toString()); String s = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addSpaceArea", map); // 添加门禁 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TSite.java
@@ -129,4 +129,6 @@ private String imgs; @TableField("ids") private String ids; @TableField("sign") private Integer sign; } cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -4,6 +4,7 @@ import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.other.entity.*; import com.dsh.other.feignclient.account.CityManagerClient; @@ -35,6 +36,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.PrintWriter; import java.util.*; import java.util.stream.Collectors; /** * @author zhibing.pu @@ -402,7 +404,14 @@ List<Integer> ids = getIds(byId.getSiteId()); byId.setStorePhone(byId1.getPhone()); 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); map.put("data",byId); map.put("ids",ids); return ResultUtil.success(map); }catch (Exception e){ cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -246,6 +246,14 @@ } } @ResponseBody @PostMapping("/store/querySiteIdById") public List<Integer> querySiteIdById(@RequestBody List<Integer> storeIds){ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().in(Site::getStoreId, storeIds)); List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList()); return collect; } @ResponseBody @@ -313,6 +321,17 @@ } @Autowired private ISiteService siteService; @ResponseBody @PostMapping("/store/querySiteId") public List<Integer> querySiteId(@RequestBody Integer 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()); return collect; } @PostMapping("/store/addBackRecord") public void addBackRecord(@RequestBody String s){ TBackRecord tBackRecord = new TBackRecord(); cloud-server-other/src/main/java/com/dsh/other/entity/Site.java
@@ -128,5 +128,6 @@ private Double playPaiCoinOne; @TableField("ids") private String ids; @TableField("sign") private Integer sign; } cloud-server-other/src/main/java/com/dsh/other/entity/SiteBooking.java
@@ -9,6 +9,7 @@ import lombok.Data; import java.util.Date; import java.util.List; /** * @author zhibing.pu @@ -180,4 +181,8 @@ private String money; @TableField(exist = false) private String storePhone; @TableField(exist = false) private List<Integer> sid; @TableField(exist = false) private List<Integer> rid; } cloud-server-other/src/main/resources/mapper/SiteMapper.xml
@@ -76,7 +76,8 @@ select t1.*,t2.name storeName,t3.name siteTypeName from t_site t1 inner join t_store t2 on t1.storeId = t2.id left join t_site_type t3 on t1.siteTypeId = t3.id <where> where t1.sign=0 <if test="query.objectType == 2"> and t1.cityManagerId = #{query.objectId} </if> @@ -99,7 +100,7 @@ and t1.name like concat('%',#{query.name},'%') </if> and t1.state != 3 </where> </select> <select id="listExipre" resultType="com.dsh.other.model.dto.siteDto.TSiteDTO"> select t1.*,t2.name storeName,t3.name siteTypeName ,t4.name operator from t_site t1
