预约场地bug修改

44323

2023-12-08 2fa137fdda93862d79ef09a75603faef4f4769cd

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

@@ -897,7 +897,7 @@
                            //detailsResponse.setRid(rid);
                            // todo 修改区域id 临时
                            // 根据门店id 写死区域id 后续调整为门票指定多个区域
                            // 以下代码均为临时代码
                            // 以下代码均为临时代码===============================
                            for (Integer integer : collect) {
                                ArrayList<Integer> list2 = new ArrayList<>();
                                if (integer==2024){
@@ -911,13 +911,15 @@
                                        ArrayList<Integer> list3 = new ArrayList<>();
                                        list3.add(44);
                                        detailsResponse.setRid(list3);
                                    }else {
                                    }else if(pointsMerchandise.getPointsMerchandiseId()==197) {
                                        ArrayList<Integer> list4 = new ArrayList<>();
                                        list4.add(43);
                                        detailsResponse.setRid(list4);
                                    }

                                }
                            }
                            //======================================================
                        }
                    }

@@ -1729,6 +1731,7 @@
    public Integer add(@RequestBody PointsMerchandise pointsMerchandise) {
        Integer storeId = pointsMerchandise.getShelves();
        pointsMerchandise.setShelves(1);
        pointsMerchandise.setInsertTime(new Date());
        boolean save = pmdsService.save(pointsMerchandise);
        if (save && ToolUtil.isNotEmpty(storeId) && pointsMerchandise.getType() == 2) {
            PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();