Merge remote-tracking branch 'origin/master'

hjl

2024-07-02 01dc732d940e81b954685705c32a129473eed951

Merge remote-tracking branch 'origin/master'

 ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/model/TGameRecord.java

@@ -45,6 +45,9 @@
     */
    @ApiModelProperty(value = "用时时间 秒")
    private Integer useTime;
    @ApiModelProperty(value = "用时时间 秒")
    @TableField(exist = false)
    private String useTime1;
    @ApiModelProperty(value = "游戏时间")
    @TableField(exist = false)
    private String time;

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java

@@ -81,17 +81,16 @@
        if (tokenService.getLoginUser1() == null) {
            return R.tokenError("登录失效");
        }
        List<String> type = goodQuery.getType();
        String keywords = goodQuery.getKeywords();
        // 初始化条件构造器
        QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
        wrapper = keywords != null && "".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
        wrapper = keywords != null && !"".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;

        // 类型匹配 todo
        if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
            StringBuilder temp = new StringBuilder("");
            for (String s : goodQuery.getType()) {
                wrapper.or().apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
                wrapper.apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
            }
        }
        wrapper.eq("isDelete", 0);
@@ -112,7 +111,7 @@
        if (goodQuery.getType() != null && !goodQuery.getType().isEmpty()) {
            for (String s : goodQuery.getType()) {
                // 将每个类型 ID 应用于 FIND_IN_SET 函数
                wrapper.or().apply("FIND_IN_SET('" + s + "', typeIds)");
                wrapper.apply("FIND_IN_SET('" + s + "', typeIds)");
            }
        }
        wrapper.eq("isDelete", 0);
@@ -773,7 +772,7 @@
            // 随便取一条地址数据
            List<Recipient> list = recipientService.lambdaQuery()
                    .eq(Recipient::getUserId, tokenService.getLoginUser1().getUserid())
                    .eq(Recipient::getIsDefault, 1).list();
                    .list();
            if (!list.isEmpty()) {
                recipient = list.get(0);
            }

 ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java

@@ -94,9 +94,20 @@
        userInfoVO.setTodayHours(data1.getTodayHours());
        userInfoVO.setWeekHours(data1.getWeekHours());
        userInfoVO.setMonthHours(data1.getMonthHours());
        PageInfo<TGameRecord> gameRecords = data1.getGameRecords();
        List<TGameRecord> records = gameRecords.getRecords();
        for (TGameRecord record : records) {
            String s = convertSecondsToHoursMinutes(record.getUseTime());
            record.setUseTime1(s);
        }
        userInfoVO.setGameRecords(data1.getGameRecords());
        return AjaxResult.success(userInfoVO);
    }
    public static String convertSecondsToHoursMinutes(int seconds) {
        int hours = seconds / 3600;
        int minutes = (seconds % 3600) / 60;
        return String.format("%d小时%d分钟", hours, minutes);
    }
    public static String convertToChineseOrdinal(int number) {
        if (number <= 0 || number > 50) {
            return "未知";

 ruoyi-service/ruoyi-study/pom.xml

@@ -15,18 +15,7 @@
    </description>

    <dependencies>
        <dependency>
            <groupId>com.huawei.apigateway</groupId>
            <artifactId>java-sdk-core</artifactId>
            <version>3.2.5</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/lib/java-sdk-core-3.2.5.jar</systemPath>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>com.huaweicloud.sdk</groupId>-->
<!--            <artifactId>huaweicloud-sdk-bundle</artifactId>-->
<!--            <version>3.1.87</version>-->
<!--        </dependency>-->

        <dependency>
            <groupId>redis.clients</groupId>
            <artifactId>jedis</artifactId>

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DataUpdateHandlerConfig.java

@@ -55,13 +55,6 @@
            this.setFieldValByName("createTime", new Date(), metaObject);
            this.setFieldValByName("updateTime", new Date(), metaObject);
        }
        LoginUserParent loginUser1 = tokenService.getLoginUserStudy();
        if (loginUser1 != null) {
                this.setFieldValByName("createTime", new Date(), metaObject);
        } else {
            this.setFieldValByName("createTime", new Date(), metaObject);
        }

    }

    /**

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java

@@ -164,27 +164,8 @@
        PayVO payVO = new PayVO();
        payVO.setOrderId(tVipOrder.getId());
        payVO.setId(id);


        return R.ok(payVO);
//        switch (payType) {
//            case 1:
//                return payMoneyUtil.weixinpay
//                        ("购买会员", "",
//                                id + "_" + tVipOrder.getId() + "_" +
//                                        UUIDUtil.getRandomCode(8),
//                                tVipOrder.getMoney().toString(),
//                                "/base/wxPayBuyVip", "APP", "");
//            case 2:
//                return payMoneyUtil.alipay
//                        ("购买会员",
//                                "购买会员下单支付",
//                                "",
//                                id + "_" + tVipOrder.getId() + "_" +
//                                        UUIDUtil.getRandomCode(8),
//                                tVipOrder.getMoney().toString(),
//                                "/base/aliPayBuyVip");
//        }


    }


 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TGameRecord.java

@@ -48,6 +48,9 @@
     */
    @ApiModelProperty(value = "用时时间 秒")
    private Integer useTime;
    @ApiModelProperty(value = "用时时间 秒")
    @TableField(exist = false)
    private String useTime1;

    /**
     * 游戏Id
@@ -63,7 +66,4 @@
    @ApiModelProperty(value = "游戏时间")
    @TableField(exist = false)
    private String time;



}