From 5234b3a5f970969cc15b05c52ee9e31d6885d1d5 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 10:36:18 +0800
Subject: [PATCH] 门票 门店权限
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 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 970f217..16ba99f 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
@@ -108,7 +108,25 @@
@ResponseBody
@PostMapping("/base/pointMerchars/ticketList")
public List<Map<String,Object>> ticketList(@RequestBody IntegralGoodsOfSearch ofSearch){
- List<Map<String, Object>> result = pmdsService.ticketList(ofSearch);
+ List<Map<String, Object>> result1 = pmdsService.ticketList(ofSearch);
+ List<Map<String, Object>> result = new ArrayList<>();
+ if(ofSearch.getObjType()==3){
+ for (Map<String, Object> map : result1) {
+ List<PointsMerchandiseStore> id = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>().eq(PointsMerchandiseStore::getPointsMerchandiseId, map.get("id")));
+ List<Integer> collect = id.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ if(collect.contains(ofSearch.getObjId())){
+ if(id.size()>1){
+ map.put("size",1);
+ }else {
+ map.put("size",0);
+ }
+ result.add(map);
+ }
+ }
+ }
if (result.size() > 0){
for (Map<String, Object> stringObjectMap : result) {
Integer o = (Integer) stringObjectMap.get("id");
@@ -193,13 +211,24 @@
}
@Resource
private CoursePackageClient coursePackageClient;
+ @Autowired
+ private PointsMerchandiseService pointsMerchandiseService;
+
@ResponseBody
@PostMapping("/base/pointMerchars/getCommoditys")
public PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request){
- if (request.getShopId()!=null){
- List<CoursePackage> coursePackages = coursePackageClient.queryByStoreId(request.getShopId());
-
- }
+// if (request.getShopId()!=null){
+// List<CoursePackage> coursePackages = coursePackageClient.queryByStoreId(request.getShopId());
+// List<Integer> coursIds = new ArrayList<>();
+// for (CoursePackage coursePackage : coursePackages) {
+// coursIds.add(coursePackage.getId());
+// }
+// List<PointsMerchandise> points = pointsMerchandiseService.list(new QueryWrapper<PointsMerchandise>().eq("state",1).eq("shelves",1).in("coursePackageId", coursIds));
+// PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
+// pointMerchandiseVo.setMerchandises(points);
+// return pointMerchandiseVo;
+//
+// }
--
Gitblit v1.7.1