修改bug

liujie

2023-10-26 e030255c23c7ba3e2cbad1036a810d6d72fa864f

 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java

@@ -108,7 +108,27 @@
    @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);
                }
            }
        }else {
            result=result1;
        }
        if (result.size() > 0){
            for (Map<String, Object> stringObjectMap : result) {
                Integer o = (Integer) stringObjectMap.get("id");
@@ -193,13 +213,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;
//
//        }



@@ -645,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()));
@@ -654,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);
                        }

                    }
                }
@@ -1119,7 +1161,9 @@
        try {
            Integer pointMerchandiseId = (Integer) map.get("pointMerchandiseId");
            PointsMerchandise byId1 = pmdsService.getById(pointMerchandiseId);

            if(Integer.valueOf(map.get("type").toString())!=1){
                byId1.setStatus(2);
            }
            Integer quantityIssued = (Integer) map.get("quantityIssued");
            Integer pickUpQuantity = (Integer) map.get("pickUpQuantity");
            String redemptionInstructions = (String) map.get("redemptionInstructions");
@@ -1145,7 +1189,6 @@
    }



    @PostMapping("/base/pointMerchars/add")
    public Integer add(@RequestBody PointsMerchandise pointsMerchandise){
        Integer storeId = pointsMerchandise.getShelves();
@@ -1168,6 +1211,7 @@




    @PostMapping("/base/pointMerchars/addOther")
    public Boolean addOther(@RequestBody String pam){
        Boolean save =false;