bug修改

44323

2024-03-11 a1cadd023734d1e33f6455ec87fb7e2783d808fe

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

@@ -886,7 +886,7 @@
                        detailsResponse.setSid(collect);
                        if (collect.size() > 0) {
                            // 获取rid
//                            List<Integer> rid= stoClient.querySiteIdById(collect);
//                          List<Integer> rid= stoClient.querySiteIdById(collect);
                            //detailsResponse.setRid(rid);
                            // todo 修改区域id 临时
                            // 根据门店id 写死区域id 后续调整为门票指定多个区域
@@ -909,11 +909,27 @@
                                        list4.add(43);
                                        detailsResponse.setRid(list4);
                                    }

                                }
                            }
                            //======================================================
                        }
                    }else{
                        // todo 返回门店id 和场地id
                        // 查询指定场地
                        List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>()
                                .eq(PointsMerchandiseStore::getPointsMerchandiseId, merchandise.getId()));
                        // 门店
                        ArrayList<Integer> list3 = new ArrayList<>();
                        // 场地
                        ArrayList<Integer> list4 = new ArrayList<>();
                        for (PointsMerchandiseStore temp : list) {
                            Integer storeId = temp.getStoreId();
                            Integer siteId = temp.getSiteId();
                            list3.add(storeId);
                            list4.add(siteId);
                        }
                        detailsResponse.setRid(list4);
                        detailsResponse.setSid(list3);
                    }


@@ -1787,19 +1803,19 @@
    public Boolean addOther(@RequestBody String pam) {
        Boolean save = false;
        String[] split = pam.split("_");
        if (split.length>2){
        if (StringUtils.hasLength(split[2])){
            for (String s : split[2].split(",")) {
                PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
                pointsMerchandiseStore.setPointsMerchandiseId(Integer.valueOf(split[0]));
                pointsMerchandiseStore.setSiteId(Integer.valueOf(s));
                Site site = siteClient.querySiteById(Integer.valueOf(s));
                pointsMerchandiseStore.setStoreId(site.getStoreId());
                save = pmdstoService.save(pointsMerchandiseStore);
        if (split.length > 2) {
            if (StringUtils.hasLength(split[2])) {
                for (String s : split[2].split(",")) {
                    PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
                    pointsMerchandiseStore.setPointsMerchandiseId(Integer.valueOf(split[0]));
                    pointsMerchandiseStore.setSiteId(Integer.valueOf(s));
                    Site site = siteClient.querySiteById(Integer.valueOf(s));
                    pointsMerchandiseStore.setStoreId(site.getStoreId());
                    save = pmdstoService.save(pointsMerchandiseStore);
                }
                // 这个门票是选择的场地
                return save;
            }
            // 这个门票是选择的场地
            return save;
        }
        }
        for (String s : split[1].split(",")) {
            PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();