App预约场地操作

无关风月

2025-10-31 0300f6a0d282236a8339c92268f4031f071101e5

App预约场地操作

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

@@ -398,28 +398,31 @@
                                        jsonArray.add(jsonObject2);
                                    }
                                }
                            }else{
                                // 返回过期的二维码 保证开门失败即可
                                JSONObject jsonObject3 = new JSONObject();
                                Date date1 = new Date();
                                date1.setTime(date1.getTime() - 300 * 1000);
                                jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                                jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                                jsonArray.add(jsonObject3);
                            }
                        }
                        if (jsonArray.isEmpty()){
                            // 返回过期的二维码 保证开门失败即可
                            JSONObject jsonObject3 = new JSONObject();
                            Date date1 = new Date();
                            date1.setTime(date1.getTime() - 300 * 1000);
                            jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                            jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                            jsonArray.add(jsonObject3);
                        }
                    }
                }
                else{
                    // 返回过期的二维码 保证开门失败即可
                    JSONObject jsonObject3 = new JSONObject();
                    Date date1 = new Date();
                    date1.setTime(date1.getTime() - 300 * 1000);
                    jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                    jsonObject3.put("start_time", simpleDateFormat1.format( date1));
                    if (jsonArray.isEmpty()){
                        // 返回过期的二维码 保证开门失败即可
                        JSONObject jsonObject3 = new JSONObject();
                        Date date1 = new Date();
                        date1.setTime(date1.getTime() - 300 * 1000);
                        jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                        jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                    jsonArray.add(jsonObject3);
                        jsonArray.add(jsonObject3);
                    }
                }
                if (!jsonArray.isEmpty()) {
                    huiminCardVO1.setEndTime(simpleDateFormat.format(payHuimin.getEndTime()));
@@ -559,7 +562,7 @@
                                    Date start = DateUtil.parse(s1, "yyyy-MM-dd HH:mm:ss");
                                    Date end = DateUtil.parse(e1, "yyyy-MM-dd HH:mm:ss");
                                    if (new Date().after(start) && new Date().before(end)) {
//                                    
//
                                        Date date1 = new Date();
                                        jsonObject2.put("start_time", simpleDateFormat1.format( date1));
                                        date1.setTime(date1.getTime() + 30 * 1000);
@@ -568,27 +571,30 @@
                                            jsonArray.add(jsonObject2);
                                        }
                                    }
                                }else{
                                    // 返回过期的二维码 保证开门失败即可
                                    JSONObject jsonObject3 = new JSONObject();
                                    Date date1 = new Date();
                                    date1.setTime(date1.getTime() - 300 * 1000);
                                    jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                                    jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                                    jsonArray.add(jsonObject3);
                                }
                            }
                            if (jsonArray.isEmpty()){
                                // 返回过期的二维码 保证开门失败即可
                                JSONObject jsonObject3 = new JSONObject();
                                Date date1 = new Date();
                                date1.setTime(date1.getTime() - 300 * 1000);
                                jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                                jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                                jsonArray.add(jsonObject3);
                            }
                        }
                    }else{
                        // 返回过期的二维码 保证开门失败即可
                        JSONObject jsonObject = new JSONObject();
                        Date date1 = new Date();
                        date1.setTime(date1.getTime() - 300 * 1000);
                        jsonObject.put("end_time", simpleDateFormat1.format( date1));
                        jsonObject.put("start_time", simpleDateFormat1.format( date1));
                        if (jsonArray.isEmpty()){
                            // 返回过期的二维码 保证开门失败即可
                            JSONObject jsonObject3 = new JSONObject();
                            Date date1 = new Date();
                            date1.setTime(date1.getTime() - 300 * 1000);
                            jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                            jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                        jsonArray.add(jsonObject);
                            jsonArray.add(jsonObject3);
                        }
                    }
                    if (!jsonArray.isEmpty()) {
                        // 将学员加入
@@ -698,27 +704,30 @@
                                        jsonArray.add(jsonObject2);
                                    }
                                }
                            }else{
                                // 返回过期的二维码 保证开门失败即可
                                JSONObject jsonObject3 = new JSONObject();
                                Date date1 = new Date();
                                date1.setTime(date1.getTime() - 300 * 1000);
                                jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                                jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                                jsonArray.add(jsonObject3);
                            }
                        }
                        if (jsonArray.isEmpty()){
                            // 返回过期的二维码 保证开门失败即可
                            JSONObject jsonObject3 = new JSONObject();
                            Date date1 = new Date();
                            date1.setTime(date1.getTime() - 300 * 1000);
                            jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                            jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                            jsonArray.add(jsonObject3);
                        }
                    }
                }else{
                    // 返回过期的二维码 保证开门失败即可
                    JSONObject jsonObject = new JSONObject();
                    Date date1 = new Date();
                    date1.setTime(date1.getTime() - 300 * 1000);
                    jsonObject.put("end_time", simpleDateFormat1.format( date1));
                    jsonObject.put("start_time", simpleDateFormat1.format( date1));
                    if (jsonArray.isEmpty()){
                        // 返回过期的二维码 保证开门失败即可
                        JSONObject jsonObject3 = new JSONObject();
                        Date date1 = new Date();
                        date1.setTime(date1.getTime() - 300 * 1000);
                        jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                        jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                    jsonArray.add(jsonObject);
                        jsonArray.add(jsonObject3);
                    }
                }
                TStudent tStudent = tStudents.stream().filter(e -> e.getId().equals(studentId)).findFirst().orElse(null);
                if (tStudent!=null){
@@ -963,27 +972,30 @@
                                    jsonArray.add(jsonObject2);
                                }
                            }
                        }else{
                            // 返回过期的二维码 保证开门失败即可
                            JSONObject jsonObject3 = new JSONObject();
                            Date date1 = new Date();
                            date1.setTime(date1.getTime() - 300 * 1000);
                            jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                            jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                            jsonArray.add(jsonObject3);
                        }
                    }
                    if (jsonArray.isEmpty()){
                        // 返回过期的二维码 保证开门失败即可
                        JSONObject jsonObject3 = new JSONObject();
                        Date date1 = new Date();
                        date1.setTime(date1.getTime() - 300 * 1000);
                        jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                        jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                        jsonArray.add(jsonObject3);
                    }
                }
            }else{
                // 返回过期的二维码 保证开门失败即可
                JSONObject jsonObject = new JSONObject();
                Date date1 = new Date();
                date1.setTime(date1.getTime() - 300 * 1000);
                jsonObject.put("end_time", simpleDateFormat1.format( date1));
                jsonObject.put("start_time", simpleDateFormat1.format( date1));
                if (jsonArray.isEmpty()){
                    // 返回过期的二维码 保证开门失败即可
                    JSONObject jsonObject3 = new JSONObject();
                    Date date1 = new Date();
                    date1.setTime(date1.getTime() - 300 * 1000);
                    jsonObject3.put("end_time", simpleDateFormat1.format( date1));
                    jsonObject3.put("start_time", simpleDateFormat1.format( date1));

                jsonArray.add(jsonObject);
                    jsonArray.add(jsonObject3);
                }
            }

            String temp = "{\"id\":"+tPayHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tPayHuimin.getStudentId().split(",")[0] + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";

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

@@ -398,20 +398,22 @@
    @PostMapping("/base/pointMerchars/getCommoditys")
    public PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request) {


        PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
        List<PointsMerchandise> list = new ArrayList<>();
        String provinceCode = "";
        String cityCode = "";
        if (ToolUtil.isEmpty(request.getLon()) && ToolUtil.isEmpty(request.getLat())) {
            return pointMerchandiseVo;
        }else{
            try {
                Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
                provinceCode = geocode.get("provinceCode");
                cityCode = geocode.get("cityCode");
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
        try {
            Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
            provinceCode = geocode.get("provinceCode");
            cityCode = geocode.get("cityCode");
        } catch (Exception e) {
            e.printStackTrace();
        }


        list = pmdsService.list(new QueryWrapper<PointsMerchandise>()
                .eq("state", 1)
@@ -420,6 +422,27 @@
                .ge("endTime", new Date())
                .eq("status", 1)
        );
        if (request.getShopId()!=null){
            List<Integer> storeId = new ArrayList<>();
            storeId.add(request.getShopId());
            List<Store> stores = storeClient.queryStoreByIds(storeId);
            Store store = stores.get(0);
            provinceCode = store.getProvinceCode();
            cityCode = store.getCityCode();
            List<Integer> pointsMerchandiseIds = pmdstoService.lambdaQuery().eq(PointsMerchandiseStore::getStoreId, request.getShopId()).list()
                    .stream().map(PointsMerchandiseStore::getPointsMerchandiseId)
                    .collect(Collectors.toList());
            if (pointsMerchandiseIds.isEmpty()){
                pointMerchandiseVo.setMerchandises(list);
                return pointMerchandiseVo;
            }else{
                List<PointsMerchandise> pointsMerchandiseList = pmdsService.lambdaQuery().in(PointsMerchandise::getId, pointsMerchandiseIds).list();
                list.addAll(pointsMerchandiseList);
                List<PointsMerchandise> listAll = list.stream().distinct().collect(Collectors.toList());
                list = listAll;
            }
        }

        if (list.size() > 0) {
            Iterator<PointsMerchandise> iterator = list.iterator();
            while (iterator.hasNext()) {

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OssUploadUtil.java

@@ -11,10 +11,14 @@
import java.util.UUID;

public class OssUploadUtil {
    // LTAI5tKLeAE1B5n2mvTZ5yy6
    // zradDLTBGdzq26tYz9RUCUh0sPmfhh
    //OSS图片访问域名
    public static String oss_domain = "https://we-park-life.oss-cn-beijing.aliyuncs.com/";
    public static String accessKeyId = "LTAI47eyqWWhBPXM";
    public static String accessKeySecret = "orsYX78NvgXS9KbN7wCwRja1wkUwPc";
//    public static String accessKeyId = "LTAI5tE3ownRhJ7eXsuW7Vn7";
//    public static String accessKeySecret = "Crgi0OhtDRuJafIeyT3JQL9v0P4EgH";
    public static String accessKeyId = "LTAI5tKLeAE1B5n2mvTZ5yy6";
    public static String accessKeySecret = "zradDLTBGdzq26tYz9RUCUh0sPmfhh";
    public static String bucketName="we-park-life";
    public static String endpoint = "oss-cn-beijing.aliyuncs.com";
    

 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java

@@ -1140,7 +1140,7 @@
                map.put("cash", money.doubleValue());
                break;
            case 3:
                map.put("playPaiCoin", money.doubleValue());
                map.put("cash", playCoin.doubleValue());
        }
        return ResultUtil.success(map);
    }