bug修改

无关风月

5 天以前 2b9dd95a59836284b5df6d49de247354b340e8a0

bug修改

 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.*;
@@ -936,6 +937,10 @@
                                    }
                                }
                            }
                            if (detailsResponse.getRid()==null){
                                List<Integer> integers = stoClient.querySiteIdById(collect);
                                detailsResponse.setRid(integers);
                            }
                            //======================================================
                        }
                    }else{
@@ -955,6 +960,8 @@
                            }
                            detailsResponse.setRid(list4);
                            detailsResponse.setSid(list3);
                        System.err.println("门票rid"+list4);
                        System.err.println("门票sid"+list3);
                    }



 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java

@@ -294,7 +294,12 @@
            if(tStudent==null || tStudent.getIdCard()==null || "".equals(tStudent.getIdCard())){
                return ResultUtil.error("选择人员未进行实名认证!");
            }

            if (competition.getStartAge() > (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(tStudent.getBirthday())))) {
                return ResultUtil.error("【" + tStudent.getName() + "】年龄不符合要求");
            }
            if (competition.getEndAge() < (Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(tStudent.getBirthday())))) {
                return ResultUtil.error("【" + tStudent.getName() + "】年龄不符合要求");
            }
            Integer isStudent = jsonObject.getInteger("isStudent");
            UserCompetition userCompetition = new UserCompetition();
            userCompetition.setAppUserId(uid);

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipController.java

@@ -158,14 +158,14 @@
        return PREFIX + "vip_edit.html";
    }

    public static void main(String[] args) {
        String temp = "[{\"id\":\"36\",\"value\":\"1\"}]";
        JSONArray couponJsonArray = JSONArray.parseArray(temp);
        for (Object o : couponJsonArray) {
            JSONObject couponJsonObject = (JSONObject) o;
            Integer couponId = couponJsonObject.getInteger("id");
        }
    }
//    public static void main(String[] args) {
//        String temp = "[{\"id\":\"36\",\"value\":\"1\"}]";
//        JSONArray couponJsonArray = JSONArray.parseArray(temp);
//        for (Object o : couponJsonArray) {
//            JSONObject couponJsonObject = (JSONObject) o;
//            Integer couponId = couponJsonObject.getInteger("id");
//        }
//    }
    @RequestMapping("/detail/{id}")
    public String detail(@PathVariable("id")Integer id, Model model) {
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java

@@ -551,14 +551,14 @@
        return null;
    }

    public static void main(String[] args) throws Exception {
        String blueS = "{\"vipDetail\":1,role\":1,\"time\":[{\"start_time\":\"2025-08-25 09:00:00\",\"end_time\":\"2025-08-30 23:00:00\"}]}";
        MyQrCodeUtil.createCodeToFile(blueS);
        BufferedImage blueImage = QRCodeUtil.createImage(blueS);
        MultipartFile blueFile = convert(blueImage, new Date().getTime() + UUIDUtil.getRandomCode(3) + ".PNG");
        String s = OssUploadUtil.ossUpload("img/", blueFile);
        System.err.println(s);
    }
//    public static void main(String[] args) throws Exception {
//        String blueS = "{\"vipDetail\":1,role\":1,\"time\":[{\"start_time\":\"2025-08-25 09:00:00\",\"end_time\":\"2025-08-30 23:00:00\"}]}";
//        MyQrCodeUtil.createCodeToFile(blueS);
//        BufferedImage blueImage = QRCodeUtil.createImage(blueS);
//        MultipartFile blueFile = convert(blueImage, new Date().getTime() + UUIDUtil.getRandomCode(3) + ".PNG");
//        String s = OssUploadUtil.ossUpload("img/", blueFile);
//        System.err.println(s);
//    }

    @RequestMapping("/pre_add")
    public String add(Model model) {

 cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard.js

@@ -99,14 +99,17 @@
 */
THuiminCard.delete = function () {
    if (this.check()) {
        var ajax = new $ax(Feng.ctxPath + "/tHuiminCard/delete", function (data) {
            Feng.success("删除成功!");
            THuiminCard.table.refresh();
        }, function (data) {
            Feng.error("删除失败!" + data.responseJSON.message + "!");
        // 添加二次确认
        Feng.confirm("确定要删除该玩湃惠民卡吗？", function () {
            var ajax = new $ax(Feng.ctxPath + "/tHuiminCard/delete", function (data) {
                Feng.success("删除成功!");
                THuiminCard.table.refresh();
            }, function (data) {
                Feng.error("删除失败!" + data.responseJSON.message + "!");
            });
            ajax.set("tHuiminCardId", THuiminCard.seItem.id);
            ajax.start();
        });
        ajax.set("tHuiminCardId",this.seItem.id);
        ajax.start();
    }
};


 cloud-server-management/src/main/webapp/static/modular/system/tHuiminCard/tHuiminCard2.js

@@ -74,6 +74,7 @@
                return
            }
            const mv = this
            Feng.confirm("确定要删除该玩湃惠民卡吗？", function () {
            this.ids.forEach(id => {

                const ajax = new $ax(Feng.ctxPath + "/tHuiminCard/delete", function (data) {
@@ -85,6 +86,7 @@
                ajax.set("ids",mv.ids.join(","));
                ajax.start();
            })
            });
        },
        handleShelves(status) {
            // 上架逻辑