Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-12-08 f88cfa02e36752e4acad7adc4b045155e8e50f21

 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){
@@ -918,6 +918,7 @@
                                    }
                                }
                            }
                            //======================================================
                        }
                    }

@@ -1729,6 +1730,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();