App预约场地操作

无关风月

2025-10-30 7ab89c134470bd8931901e4aec839cd3a626716f

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

@@ -1,6 +1,7 @@
package com.dsh.activity.controller;


import com.alipay.api.domain.ArrangementVORes;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.activity.entity.*;
@@ -92,9 +93,13 @@
     */
    @RequestMapping("/base/pointMerchars/changeState")
    public void changeState(@RequestBody CoachChangeStateVO dto) {


        pmdsService.changeState(dto);
    }

    @ResponseBody
    @PostMapping("/base/pointMerchars/goodsList")
    public List<PointsMerchandise> goodsList() {
        return pmdsService.list();
    }

    /**
@@ -206,7 +211,7 @@
                    List<Integer> storeIds = ofSearch.getStoreIds();
                    // 优惠券指定的门店
                    List<Integer> collect5 = cstoreService.list(new QueryWrapper<CouponStore>().eq("couponId", id3)
                            .in("storeId", storeIds)).stream().map(CouponStore::getStoreId)
                                    .in("storeId", storeIds)).stream().map(CouponStore::getStoreId)
                            .collect(Collectors.toList());
                    // 判断两个集合是否相交
                    // 比较两个集合中是否有相同的元素；当两个集合中没有相同元素时返回true，
@@ -300,7 +305,7 @@
        List<IntegralCommodity> commodity = new ArrayList<>();

        Map<String, String> geocode = gdMapGeocodingUtil.geocode(location.getLon(), location.getLat());
        if(null == geocode){
        if (null == geocode) {
            return new ArrayList<>();
        }
        String provinceCode = geocode.get("provinceCode");
@@ -328,7 +333,7 @@
                .eq("shelves", 1)
                .gt("endTime", new Date())
                .eq("status", 1);
        if(cIds.size() > 0){
        if (cIds.size() > 0) {
            wrapper.in("id", cIds);
        }
        List<PointsMerchandise> merchandises = pmdsService.list(wrapper.last("ORDER BY sort desc,insertTime desc"));
@@ -338,14 +343,14 @@
                integralCommodity.setCommodityId(merchandise.getId());
                integralCommodity.setCommodityImg(merchandise.getCover());
                integralCommodity.setCommodityName(merchandise.getName());
                if(merchandise.getRedemptionMethod() == 1){
                if (merchandise.getRedemptionMethod() == 1) {
                    integralCommodity.setIntegral(merchandise.getIntegral());
                }
                if(merchandise.getRedemptionMethod() == 2){
                if (merchandise.getRedemptionMethod() == 2) {
                    integralCommodity.setCommodityPrice(merchandise.getPrice());
                    integralCommodity.setIntegral(merchandise.getIntegral());
                }
                if(merchandise.getRedemptionMethod() == 3){
                if (merchandise.getRedemptionMethod() == 3) {
                    integralCommodity.setCommodityPrice(merchandise.getPrice());
                }
                integralCommodity.setRedemptionMethod(merchandise.getRedemptionMethod());
@@ -363,20 +368,20 @@
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        QueryWrapper<Coupon> queryWrapper = new QueryWrapper<Coupon>()
                .eq("state", 1).gt("endTime", sdf.format(new Date()));
        if(storeCoupons.size() > 0){
        if (storeCoupons.size() > 0) {
            queryWrapper.in("id", storeCoupons);
        }
        List<Coupon> list = couponService.list(queryWrapper.last(" ORDER BY insertTime desc"));
        if (!list.isEmpty()){
        if (!list.isEmpty()) {
            for (Coupon coupon : list) {
                IntegralCommodity integralCommodity = new IntegralCommodity();
                integralCommodity.setCommodityId(coupon.getId());
                integralCommodity.setCommodityImg(coupon.getCover());
                integralCommodity.setCommodityName(coupon.getName());
                if(coupon.getRedemptionMethod() == 1){
                if (coupon.getRedemptionMethod() == 1) {
                    integralCommodity.setIntegral(coupon.getIntegral().intValue());
                }
                if(coupon.getRedemptionMethod() == 2){
                if (coupon.getRedemptionMethod() == 2) {
                    integralCommodity.setCommodityPrice(coupon.getCash());
                    integralCommodity.setIntegral(coupon.getIntegral().intValue());
                }
@@ -833,13 +838,15 @@

    @ResponseBody
    @PostMapping("/base/pointMerchars/getDetailsOfExchange")
    public ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId) {
    public ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId) throws ParseException {
        ExchangeDetailsVo detailsVo = new ExchangeDetailsVo();
        List<ExchangeDetailsResponse> responses = new ArrayList<>();
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
        List<UserPointsMerchandise> pointsMerchandises = upmseService.list(new QueryWrapper<UserPointsMerchandise>()
                .eq("userId", appUserId).eq("payStatus", 2));

        List<PointsMerchandiseStore> pointsMerchandiseStoreList = pointsMerchandiseStoreService.list();
        Map<Integer, List<PointsMerchandiseStore>> pointsMerchandiseStoreMap = pointsMerchandiseStoreList.stream().collect(Collectors.groupingBy(PointsMerchandiseStore::getPointsMerchandiseId));

        List<Coupon> list1 = couponService.list();
        List<Integer> ids = new ArrayList<>();
@@ -850,7 +857,8 @@
        }
        List<UserCoupon> userCoupons = new ArrayList<>();
        if (ids.size() > 0) {
            userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId).in("couponId", ids));
            userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId).in("couponId", ids)
                    .ne("status", 3));
        }
        if (pointsMerchandises.size() > 0) {
            for (UserPointsMerchandise pointsMerchandise : pointsMerchandises) {
@@ -858,6 +866,7 @@
                if (merchandise == null) {
                    continue;
                }

                ExchangeDetailsResponse detailsResponse = new ExchangeDetailsResponse();
                detailsResponse.setDetailsId(pointsMerchandise.getId());
                detailsResponse.setGoodName(merchandise.getName());
@@ -877,6 +886,8 @@
                detailsResponse.setUseStatus(pointsMerchandise.getStatus() == 1 ? 2 : 1);
                detailsResponse.setGoodType(merchandise.getType());
                if (merchandise.getType() == 3) {
                    detailsResponse.setCodeType(3);
                    detailsResponse.setDataId(pointsMerchandise.getPointsMerchandiseId());
                    detailsResponse.setCardType(merchandise.getCardType());
                    List<Integer> sids = new ArrayList<>();
                    detailsResponse.setUserId(appUserId);
@@ -915,77 +926,94 @@
                            // 以下代码均为临时代码===============================
                            for (Integer integer : collect) {
                                ArrayList<Integer> list2 = new ArrayList<>();
                                if (integer==2024){
                                if (integer == 2024) {
                                    list2.add(32);
                                    detailsResponse.setRid(list2);
                                }
                                // 临时 根据门票id 指定的区域
                                if (integer==9919){
                                    if (pointsMerchandise.getPointsMerchandiseId()==196||pointsMerchandise.getPointsMerchandiseId()==198){
                                if (integer == 9919) {
                                    if (pointsMerchandise.getPointsMerchandiseId() == 196 || pointsMerchandise.getPointsMerchandiseId() == 198) {
                                        // 返回儿童区id
                                        ArrayList<Integer> list3 = new ArrayList<>();
                                        list3.add(44);
                                        detailsResponse.setRid(list3);
                                    }else if(pointsMerchandise.getPointsMerchandiseId()==197) {
                                    } else if (pointsMerchandise.getPointsMerchandiseId() == 197) {
                                        ArrayList<Integer> list4 = new ArrayList<>();
                                        list4.add(43);
                                        detailsResponse.setRid(list4);
                                    }
                                }
                            }
                            if (detailsResponse.getRid() == null) {
                                List<Integer> integers = stoClient.querySiteIdById(collect);
                                detailsResponse.setRid(integers);
                            }
                            //======================================================
                        }
                    }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);
                    } 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);
                        System.err.println("门票rid" + list4);
                        System.err.println("门票sid" + list3);
                    }


                    if (merchandise.getCardType() == 1) {
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                        Calendar calendar = Calendar.getInstance();
                        calendar.setTime(pointsMerchandise.getInsertTime());
                        calendar.add(Calendar.DAY_OF_MONTH, 1);
                        Date end = calendar.getTime();
                        String startDate = dateFormat.format(pointsMerchandise.getInsertTime());
                        String endDate = dateFormat.format(end);
                        detailsResponse.setStartTime(startDate);
                        detailsResponse.setEndTime(startDate);
                        Date now = new Date();
                        Calendar cal1 = Calendar.getInstance();
                        cal1.setTime(pointsMerchandise.getInsertTime());
                        Calendar cal2 = Calendar.getInstance();
                        cal2.setTime(now);
                        // Compare the year, month, and day of the two Calendar instances
                        boolean isSameDate = cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
                                cal1.get(Calendar.MONTH) == cal2.get(Calendar.MONTH) &&
                                cal1.get(Calendar.DAY_OF_MONTH) == cal2.get(Calendar.DAY_OF_MONTH);
                        // 日卡开始时间和结束时间根据门店营业时间来
                        // 查询门店
                        List<Integer> storeIds = pointsMerchandiseStoreMap.get(merchandise.getId()).stream().map(PointsMerchandiseStore::getStoreId)
                                .collect(Collectors.toList());
                        List<Store> stores = storeClient.queryStoreByIds(storeIds);
                        String startTime = "";
                        String endTime = "";

                        // Print the result
                        if (isSameDate) {
                        } else {
                            System.out.println("The two dates do not have the same date.");
                            detailsResponse.setUseStatus(3);
                        if (stores != null && !stores.isEmpty()) {
                            // 初始化为第一个门店的时间
                            startTime = stores.get(0).getStartTime();
                            endTime = stores.get(0).getEndTime();
                            // 遍历所有门店，找出最早的开始时间和最晚的结束时间
                            for (Store store : stores) {
                                String storeStartTime = store.getStartTime();
                                String storeEndTime = store.getEndTime();

                                if (storeStartTime != null && startTime != null) {
                                    // 比较开始时间，找出最早的
                                    if (storeStartTime.compareTo(startTime) < 0) {
                                        startTime = storeStartTime;
                                    }
                                }

                                if (storeEndTime != null && endTime != null) {
                                    // 比较结束时间，找出最晚的
                                    if (storeEndTime.compareTo(endTime) > 0) {
                                        endTime = storeEndTime;
                                    }
                                }
                            }
                        }


                        String format = simpleDateFormat1.format(pointsMerchandise.getInsertTime());
                        detailsResponse.setStartTime(format + " " + startTime + ":00");
                        detailsResponse.setEndTime(format + " " + endTime + ":00");
                        if (simpleDateFormat.parse(format + " " + endTime + ":00").before(new Date())) {
                            System.err.println("过期了，当前门店中最晚营业时间为" + format + " " + endTime + ":00");
                            detailsResponse.setUseStatus(3);
                        }
                    } else if (merchandise.getCardType() == 2) {
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        Calendar calendar = Calendar.getInstance();
                        calendar.setTime(pointsMerchandise.getInsertTime());
                        calendar.add(Calendar.DAY_OF_MONTH, 31);
@@ -1001,7 +1029,7 @@
                        }

                    } else if (merchandise.getCardType() == 3) {
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        Calendar calendar = Calendar.getInstance();
                        calendar.setTime(pointsMerchandise.getInsertTime());
                        calendar.add(Calendar.DAY_OF_MONTH, 93);
@@ -1017,7 +1045,7 @@
                        }

                    } else if (merchandise.getCardType() == 4) {
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        Calendar calendar = Calendar.getInstance();
                        calendar.setTime(pointsMerchandise.getInsertTime());
                        calendar.add(Calendar.DAY_OF_MONTH, 372);
@@ -1045,24 +1073,23 @@
        List<VipDetail> list = vipDetailService.lambdaQuery()
                .eq(VipDetail::getAppUserId, appUserId).eq(VipDetail::getType, 2).list();
        for (VipDetail vipDetail : list) {
                ExchangeDetailsResponse detailsResponse = new ExchangeDetailsResponse();
                // 添加-用于区分会员权益门票
                detailsResponse.setDetailsId(Long.valueOf("-"+vipDetail.getId()));
                detailsResponse.setGoodName(vipDetail.getTicketName());
                detailsResponse.setStartTime(simpleDateFormat.format(vipDetail.getStartTime()));
                detailsResponse.setEndTime(simpleDateFormat.format(vipDetail.getEndTime()));


                detailsResponse.setUseStatus(vipDetail.getStatus());
                detailsResponse.setGoodType(3);
                // 表明是会员赠送的门票
                detailsResponse.setExchangeType(3);
                // 全国通用
            ExchangeDetailsResponse detailsResponse = new ExchangeDetailsResponse();
            // 添加-用于区分会员权益门票
            detailsResponse.setDetailsId(Long.valueOf("-" + vipDetail.getId()));
            detailsResponse.setGoodName(vipDetail.getTicketName());
            detailsResponse.setStartTime(simpleDateFormat.format(vipDetail.getStartTime()));
            detailsResponse.setEndTime(simpleDateFormat.format(vipDetail.getEndTime()));
            detailsResponse.setUseStatus(vipDetail.getStatus() == 1 ? 2 : 1);
            detailsResponse.setGoodType(3);
            detailsResponse.setCardType(3);
            // 表明是会员赠送的门票
            detailsResponse.setExchangeType(4);
            // 全国通用
            detailsResponse.setRid(Collections.singletonList(0));
            detailsResponse.setSid(Collections.singletonList(0));

                responses.add(detailsResponse);
            }
            responses.add(detailsResponse);
        }
        if (userCoupons.size() > 0) {
            for (UserCoupon userCoupon : userCoupons) {

@@ -1082,13 +1109,14 @@
                    detailsResponse.setIntegral(c.getIntegral().intValue());
                    detailsResponse.setCash(c.getCash());
                }
                if (userCoupon.getIsVipGrant() != null && userCoupon.getIsVipGrant() == 1) {
                    detailsResponse.setExchangeType(4);
                }
                detailsResponse.setStartTime(simpleDateFormat.format(c.getStartTime()));
                detailsResponse.setEndTime(simpleDateFormat.format(c.getEndTime()));
                detailsResponse.setUseStatus(userCoupon.getStatus() == 1 ? 2 : 1);
                detailsResponse.setGoodType(4);
                responses.add(detailsResponse);


            }
            Comparator<ExchangeDetailsResponse> comparator = Comparator.comparing(ExchangeDetailsResponse::getStartTime).reversed();
            Collections.sort(responses, comparator);
@@ -1108,10 +1136,10 @@
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        PointDetailsVo detailsVo = new PointDetailsVo();

        if (speMercharsId.toString().contains("-1")){
            // 会员门票
        if (speMercharsId.toString().contains("-1")) {
            // 会员优惠券
            VipDetail vipDetail = vipDetailService.getById(Math.abs(speMercharsId));
            if (vipDetail.getType()==1){
            if (vipDetail.getType() == 1) {
                Coupon coupon = iCouponService.getById(vipDetail.getCouponId());
                detailsVo.setDetailsId(Long.valueOf(coupon.getId()));
                List<String> list3 = new ArrayList<>();
@@ -1160,12 +1188,12 @@

                detailsVo.setContents(coupon.getIllustrate());
                detailsVo.setGoodType(4);
            }else{
            } else {

                // 门票
                detailsVo.setDetailsId(Long.valueOf("-"+vipDetail.getId()));
                detailsVo.setDetailsId(Long.valueOf("-" + vipDetail.getId()));
                detailsVo.setGoodName(vipDetail.getTicketName());
                switch (vipDetail.getStatus()){
                switch (vipDetail.getStatus()) {
                    case 1:
                        detailsVo.setUseType(2);
                        break;
@@ -1179,10 +1207,10 @@
                detailsVo.setStartTime(simpleDateFormat.format(vipDetail.getStartTime()));
                detailsVo.setEndTime(simpleDateFormat.format(vipDetail.getEndTime()));
                detailsVo.setOrderTime(simpleDateFormat.format(vipDetail.getInsertTime()));
                if (vipDetail.getUseTime()!=null){
                if (vipDetail.getUseTime() != null) {
                    detailsVo.setWriteOffTime(simpleDateFormat.format(vipDetail.getUseTime()));
                }
                if (vipDetail.getUseStoreId()!=null){
                if (vipDetail.getUseStoreId() != null) {
                    StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(vipDetail.getUseStoreId());
                    detailsVo.setWriteOffName(courseOfStore.getStoreName());
                }
@@ -1192,7 +1220,7 @@
                detailsVo.setCardType(1);
                detailsVo.setExchangeAddrType(1);
            }
            detailsVo.setDetailsId(Long.valueOf("-"+vipDetail.getId()));
            detailsVo.setDetailsId(Long.valueOf("-" + vipDetail.getId()));
            return detailsVo;
        }
        UserPointsMerchandise byId = upmseService.getById(speMercharsId);
@@ -1338,7 +1366,7 @@
                    list1.add(coursePackage.getCoverDrawing());
                    detailsVo.setPics(list1);
                    detailsVo.setClassHours(0);
                    if(coursePackage.getType() != 3){
                    if (coursePackage.getType() != 3) {
                        CoursePackagePaymentConfig coursePackagePaymentConfig = cpClient.queryConfigCoursePackData(pmdsServiceById.getCoursePackageConfigId());
                        detailsVo.setClassHours(coursePackagePaymentConfig.getClassHours());
                    }
@@ -1485,6 +1513,15 @@
        merchandise.setInsertTime(new Date());
        upmseService.save(merchandise);
        return merchandise.getId();
    }

    @PostMapping("/base/pointMerchars/saveDetailsUserPointMercaseList")
    public Boolean saveDetailsUserPointMercaseList(@RequestBody List<UserPointsMerchandise> merchandises) {
        for (UserPointsMerchandise merchandise : merchandises) {
            merchandise.setInsertTime(new Date());
        }

        return upmseService.saveBatch(merchandises);
    }


@@ -1816,7 +1853,7 @@

        if (list.size() > 0) {

            if (byId.getUseScope()==3){
            if (byId.getUseScope() == 3) {
                // 如果是指定门店
                List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());

@@ -1826,9 +1863,9 @@
                    for (Store store : stores) {
                        StoreVos storeVos1 = new StoreVos();
                        storeVos1.setNum1(store.getProvince() + "省" + store.getCity() + "市");
                        if (store.getOperatorId()==null){
                        if (store.getOperatorId() == null) {
                            storeVos1.setNum2("平台");
                        }else if (store.getOperatorId() == 0) {
                        } else if (store.getOperatorId() == 0) {
                            storeVos1.setNum2("平台");
                        } else {
                            storeVos1.setNum2(store.getOName());
@@ -1838,10 +1875,10 @@
                        storeVos.add(storeVos1);
                    }
                }
            }else if (byId.getUseScope()==4){
            } else if (byId.getUseScope() == 4) {
                // 如果是指定场地
                List<Integer> collect1 = list.stream().map(PointsMerchandiseStore::getSiteId).distinct().collect(Collectors.toList());
                int temp =0;
                int temp = 0;
                List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
                List<Store> stores1 = new ArrayList<>();
                for (Integer integer : collect) {
@@ -1851,16 +1888,16 @@
                    stores1.addAll(stores);
                }
                List<Store> stores = stoClient.queryStoreByIds(collect);
                while (temp!=collect1.size()){
                while (temp != collect1.size()) {
                    for (Store store : stores1) {
                        Integer integer = collect1.get(temp);
                        Site site = siteClient.querySiteById(integer);
                        StoreVos storeVos1 = new StoreVos();
                        storeVos1.setNum5(site.getName());
                        storeVos1.setNum1(store.getProvince() + "省" + store.getCity() + "市");
                        if (store.getOperatorId()==null){
                        if (store.getOperatorId() == null) {
                            storeVos1.setNum2("平台");
                        }else if (store.getOperatorId() == 0) {
                        } else if (store.getOperatorId() == 0) {
                            storeVos1.setNum2("平台");
                        } else {
                            storeVos1.setNum2(store.getOName());
@@ -1880,7 +1917,6 @@
    }



    @ResponseBody
    @PostMapping("/base/pointMerchars/updateGoodsDetail")
    public boolean updateGoodsDetail(@RequestBody Map<String, Object> map) {
@@ -1891,7 +1927,7 @@
            if (Integer.valueOf(map.get("type").toString()) != 1) {
                byId1.setStatus(2);
            }
            if(StringUtils.hasLength(name)){
            if (StringUtils.hasLength(name)) {
                byId1.setName(name);
            }
            Integer quantityIssued = (Integer) map.get("quantityIssued");
@@ -1945,19 +1981,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();
@@ -2061,7 +2097,7 @@
        List<Integer> ids = queryDataFee.getIds();
        if (ids.size() == 0) {
            ids.add(-1);
        }else{
        } else {

        }
        List<PointsMerchandise> list1 = pmdsService.list(new LambdaQueryWrapper<PointsMerchandise>().eq(PointsMerchandise::getRedemptionMethod, 3));