44323
2024-05-17 d95c4537ad861e25f4371fc62feb16122dc4ac2d
代码提交
8个文件已修改
35个文件已删除
8个文件已添加
2937 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/feignClient/GoodsClient.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TGoodsVO.java 143 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TApproveConfigFallbackFactory.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyRepairShopFallbackFactory.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyShopFallbackFactory.java 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyShopToUserFallbackFactory.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyToUserFallbackFactory.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TManagementFallbackFactory.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TRepairShopFallbackFactory.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TRepairShopToUserFallbackFactory.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/ViolationShopFallbackFactory.java 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/ManagementClient.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TApproveConfigClient.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyRepairShopClient.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyShopClient.java 151 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyShopToUserClient.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyToUserClient.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TRepairShopClient.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TRepairShopToUserClient.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/ViolationClient.java 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/AddUserShopClientDto.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/CarInfoRecordQuery.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/CompanyShopNameAndIdQuery.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompany.java 215 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyShop.java 225 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyShopToUser.java 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyToUser.java 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TPage.java 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TSystemConfig.java 75 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TViolationManage.java 273 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TViolationManageInfo.java 298 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/CarInfoQuery.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/ShopByShopNameAndCompanyNameQuery.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/VehicleViolationCountQuery.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/ViolationByCarIdAndTimeQuery.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/ApproveConfigClientVO.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TCompanyShopElectronicClientVO.java 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TRepairShopByNameVO.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TRepairShopClientVO.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-management/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompanyUserVo.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/vo/TGoodsVO.java 140 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/mapper/TIntegralRecordMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TIntegralRecordServiceImpl.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TIntegralRecordMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/feignClient/GoodsClient.java
@@ -26,7 +26,7 @@
    @PostMapping("/base/goods/deleteGoodsType/{id}")
    R deleteGoodsType(@PathVariable("id") Integer id);
    @GetMapping("/base/goods/listAll")
    @PostMapping("/base/goods/listAll")
     R<PageInfo<TGoods>> listAll(@RequestBody GoodsTypeQuery query);
    @PostMapping("/base/goods/addGoods")
     R addGoods(@RequestBody TGoods dto);
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TGoodsVO.java
@@ -36,7 +36,7 @@
     * 所需积分
     */
    @ApiModelProperty(value = "所需积分")
    private String integral;
    private Integer integral;
    /**
     * 商品原价
     */
@@ -61,7 +61,10 @@
     * 商品类型id
     */
    @ApiModelProperty(value = "商品类型id")
    private Integer typeId;
    private String typeIds;
    @ApiModelProperty(value = "基础已兑换数量")
    private Integer basicCount;
    /**
     * 商品封面图
     */
@@ -94,140 +97,4 @@
    private Integer type;
    public Integer getId() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getintegral() {
        return
integral;
    }
    public void setintegral(String
integral) {
        this.
integral =
integral;
    }
    public BigDecimal getPrice() {
        return price;
    }
    public void setPrice(BigDecimal price) {
        this.price = price;
    }
    public Integer getTotal() {
        return total;
    }
    public void setTotal(Integer total) {
        this.total = total;
    }
    public Integer getSurplus() {
        return surplus;
    }
    public void setSurplus(Integer surplus) {
        this.surplus = surplus;
    }
    public Integer getUserCount() {
        return userCount;
    }
    public void setUserCount(Integer userCount) {
        this.userCount = userCount;
    }
    public Integer getTypeId() {
        return typeId;
    }
    public void setTypeId(Integer typeId) {
        this.typeId = typeId;
    }
    public String getCoverImg() {
        return coverImg;
    }
    public void setCoverImg(String coverImg) {
        this.coverImg = coverImg;
    }
    public String getDetailImg() {
        return detailImg;
    }
    public void setDetailImg(String detailImg) {
        this.detailImg = detailImg;
    }
    public String getDetail() {
        return detail;
    }
    public void setDetail(String detail) {
        this.detail = detail;
    }
    public Date getInsertTime() {
        return insertTime;
    }
    public void setInsertTime(Date insertTime) {
        this.insertTime = insertTime;
    }
    public Integer getIsDelete() {
        return isDelete;
    }
    public void setIsDelete(Integer isDelete) {
        this.isDelete = isDelete;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    @Override
    public String toString() {
        return "TGoods{" +
        ", id=" + id +
        ", name=" + name +
        ", integral=" +
integral +
        ", price=" + price +
        ", total=" + total +
        ", surplus=" + surplus +
        ", userCount=" + userCount +
        ", typeId=" + typeId +
        ", coverImg=" + coverImg +
        ", detailImg=" + detailImg +
        ", detail=" + detail +
        ", insertTime=" + insertTime +
        ", isDelete=" + isDelete +
        ", type=" + type +
        "}";
    }
}
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TApproveConfigFallbackFactory.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyRepairShopFallbackFactory.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyShopFallbackFactory.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyShopToUserFallbackFactory.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TCompanyToUserFallbackFactory.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TManagementFallbackFactory.java
New file
@@ -0,0 +1,34 @@
package com.ruoyi.management.api.factory;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.management.api.feignClient.ManagementClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import java.util.List;
/**
 * 门店服务降级处理
 *
 * @author ruoyi
 */
@Component
public class TManagementFallbackFactory implements FallbackFactory<ManagementClient>
{
    private static final Logger log = LoggerFactory.getLogger(TManagementFallbackFactory.class);
    @Override
    public ManagementClient create(Throwable cause)
    {
        return new ManagementClient() {
            @Override
            public R getPage1() {
                return R.fail("获取注意事项失败"+cause.getMessage());
            }
        };
    }
}
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TRepairShopFallbackFactory.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/TRepairShopToUserFallbackFactory.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/factory/ViolationShopFallbackFactory.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/ManagementClient.java
New file
@@ -0,0 +1,21 @@
package com.ruoyi.management.api.feignClient;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.management.api.factory.TManagementFallbackFactory;
import com.ruoyi.management.api.model.TPage;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
@FeignClient(contextId = "managementClient", value = ServiceNameConstants.MANAGEMENT_SERVICE, fallbackFactory = TManagementFallbackFactory.class)
public interface ManagementClient {
    @PostMapping(value = "/tSysSet/getPage1")
    R<List<TPage>> getPage1();
}
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TApproveConfigClient.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyRepairShopClient.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyShopClient.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyShopToUserClient.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TCompanyToUserClient.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TRepairShopClient.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/TRepairShopToUserClient.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/feignClient/ViolationClient.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/AddUserShopClientDto.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/CarInfoRecordQuery.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/CompanyShopNameAndIdQuery.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompany.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyShop.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyShopToUser.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TCompanyToUser.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TPage.java
New file
@@ -0,0 +1,71 @@
package com.ruoyi.management.api.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * <p>
 * 启动页 注意事项
 * </p>
 *
 * @author 无关风月
 * @since 2024-04-26
 */
@TableName("t_page")
public class TPage extends BaseModel {
    private static final long serialVersionUID = 1L;
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 图片或视频链接 只有注意事项是视频链接
     */
    @ApiModelProperty(value = "图片地址/或者注意事项视频连接")
    private String img;
    /**
     * 1学习 2家长手机 3家长平板 4注意事项
     */
    @ApiModelProperty(value = "类型 1学习 2家长手机 3家长平板 4注意事项")
    private Integer type;
    public Integer getId() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    public String getImg() {
        return img;
    }
    public void setImg(String img) {
        this.img = img;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    @Override
    public String toString() {
        return "TPage{" +
        ", id=" + id +
        ", img=" + img +
        ", type=" + type +
        "}";
    }
}
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TSystemConfig.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TViolationManage.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/model/TViolationManageInfo.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/CarInfoQuery.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/ShopByShopNameAndCompanyNameQuery.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/VehicleViolationCountQuery.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/query/ViolationByCarIdAndTimeQuery.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/ApproveConfigClientVO.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TCompanyShopElectronicClientVO.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TRepairShopByNameVO.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/java/com/ruoyi/management/api/vo/TRepairShopClientVO.java
File was deleted
ruoyi-api/ruoyi-api-management/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,8 +1 @@
com.ruoyi.management.api.factory.TCompanyShopFallbackFactory
com.ruoyi.management.api.factory.ViolationShopFallbackFactory
com.ruoyi.management.api.factory.TCompanyShopToUserFallbackFactory
com.ruoyi.management.api.factory.TApproveConfigFallbackFactory
com.ruoyi.management.api.factory.TCompanyRepairShopFallbackFactory
com.ruoyi.management.api.factory.TRepairShopToUserFallbackFactory
com.ruoyi.management.api.factory.TRepairShopFallbackFactory
com.ruoyi.management.api.factory.TCompanyToUserFallbackFactory
com.ruoyi.management.api.factory.TManagementFallbackFactory
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompanyUserVo.java
File was deleted
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
@@ -71,9 +71,8 @@
        goodsTypeService.removeById(byId);
        return R.ok("删除成功");
    }
    @GetMapping("/listAll")
    @PostMapping("/listAll")
    @ApiOperation(value = "列表查询", tags = {"后台-商品管理"})
    public R<PageInfo<TGoods>> listAll(@RequestBody GoodsTypeQuery query){
        QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
        if (StringUtils.hasLength(query.getName())){
@@ -116,13 +115,13 @@
        BeanUtils.copyProperties(byId,tGoodsVO);
        long goodsId = orderService.count(new QueryWrapper<TOrder>().eq("goodsId", id));
        tGoodsVO.setInventory(goodsId);
        tGoodsVO.setIntegral(byId.getIntegral());
        return R.ok(tGoodsVO);
    }
    @PostMapping("/getGoodsTypeList")
    @ApiOperation(value = "获取商品类型列表", tags = {"后台-商品管理"})
    public R<List<TGoodsType>> getGoodsInfo() {
        List<TGoodsType> res = goodsTypeService.list(new QueryWrapper<TGoodsType>()
                .ne("isDelete", 1));
        List<TGoodsType> res = goodsTypeService.list(new QueryWrapper<TGoodsType>());
        return R.ok(res);
    }
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/vo/TGoodsVO.java
@@ -38,7 +38,7 @@
     * 所需积分
     */
    @ApiModelProperty(value = "所需积分")
    private String integral;
    private Integer integral;
    /**
     * 商品原价
     */
@@ -63,7 +63,7 @@
     * 商品类型id
     */
    @ApiModelProperty(value = "商品类型id")
    private Integer typeId;
    private String typeIds;
    /**
     * 商品封面图
     */
@@ -96,140 +96,4 @@
    private Integer type;
    public Integer getId() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getintegral() {
        return
integral;
    }
    public void setintegral(String
integral) {
        this.
integral =
integral;
    }
    public BigDecimal getPrice() {
        return price;
    }
    public void setPrice(BigDecimal price) {
        this.price = price;
    }
    public Integer getTotal() {
        return total;
    }
    public void setTotal(Integer total) {
        this.total = total;
    }
    public Integer getSurplus() {
        return surplus;
    }
    public void setSurplus(Integer surplus) {
        this.surplus = surplus;
    }
    public Integer getUserCount() {
        return userCount;
    }
    public void setUserCount(Integer userCount) {
        this.userCount = userCount;
    }
    public Integer getTypeId() {
        return typeId;
    }
    public void setTypeId(Integer typeId) {
        this.typeId = typeId;
    }
    public String getCoverImg() {
        return coverImg;
    }
    public void setCoverImg(String coverImg) {
        this.coverImg = coverImg;
    }
    public String getDetailImg() {
        return detailImg;
    }
    public void setDetailImg(String detailImg) {
        this.detailImg = detailImg;
    }
    public String getDetail() {
        return detail;
    }
    public void setDetail(String detail) {
        this.detail = detail;
    }
    public Date getInsertTime() {
        return insertTime;
    }
    public void setInsertTime(Date insertTime) {
        this.insertTime = insertTime;
    }
    public Integer getIsDelete() {
        return isDelete;
    }
    public void setIsDelete(Integer isDelete) {
        this.isDelete = isDelete;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    @Override
    public String toString() {
        return "TGoods{" +
        ", id=" + id +
        ", name=" + name +
        ", integral=" +
integral +
        ", price=" + price +
        ", total=" + total +
        ", surplus=" + surplus +
        ", userCount=" + userCount +
        ", typeId=" + typeId +
        ", coverImg=" + coverImg +
        ", detailImg=" + detailImg +
        ", detail=" + detail +
        ", insertTime=" + insertTime +
        ", isDelete=" + isDelete +
        ", type=" + type +
        "}";
    }
}
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TSysSetController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.management.domain.TPage;
@@ -35,7 +36,7 @@
 * @author 无关风月
 * @since 2024-04-26
 */
@Controller
@RestController
@RequestMapping("/tSysSet")
public class TSysSetController {
    @Autowired
@@ -49,7 +50,6 @@
    @ApiOperation(value = "获取系统设置", tags = {"后台-系统设置"})
    @PostMapping(value = "/getSysSet")
    @ResponseBody
    public AjaxResult getSysSet() {
        TSysSet byId = sysSetService.getById(1);
        SysSetVO sysSetVO = new SysSetVO();
@@ -58,7 +58,6 @@
    }
    @ApiOperation(value = "保存系统设置", tags = {"后台-系统设置"})
    @PostMapping(value = "/saveSysSet")
    @ResponseBody
    public AjaxResult saveSysSet(SysSetVO vo) {
        TSysSet byId = sysSetService.getById(1);
        BeanUtils.copyProperties(vo,byId);
@@ -68,14 +67,18 @@
    }
    @ApiOperation(value = "获取启动页", tags = {"后台-启动页管理"})
    @PostMapping(value = "/getPage")
    @ResponseBody
    public AjaxResult getPage() {
        List<TPage> list = pageService.list();
        return AjaxResult.success(list);
    }
    @ApiOperation(value = "获取注意事项、启动页", tags = {"家长端-获取注意事项、启动页"})
    @PostMapping(value = "/getPage1")
    public R<List<TPage>> getPage1() {
        List<TPage> list = pageService.list();
        return R.ok(list);
    }
    @ApiOperation(value = "保存启动页", tags = {"后台-启动页管理"})
    @PostMapping(value = "/setPage")
    @ResponseBody
    public AjaxResult setPage(PageVO vo) {
        for (TPage tPage : vo.getList()) {
            if (tPage.getId() == null){
@@ -86,7 +89,6 @@
        }
        return AjaxResult.success("保存成功");
    }
    @ResponseBody
    @PostMapping("/agreement")
    @ApiOperation(value = "协议", tags = {"后台-协议管理"})
    public AjaxResult agreement(@RequestBody AggrementDTO dto) {
@@ -99,7 +101,6 @@
            return AjaxResult.success(protocol.getContent());
        }
    }
    @ResponseBody
    @PostMapping("/useGuide")
    @ApiOperation(value = "使用指南-列表查询", tags = {"后台-使用指南"})
    public AjaxResult<PageInfo<TUseGuide>> agreement(String title, Integer pageNumber, Integer pageSize) {
@@ -117,7 +118,6 @@
        res.setTotal(useGuides.size());
        return AjaxResult.success(res);
    }
    @ResponseBody
    @PostMapping("/updateUseGuide")
    @ApiOperation(value = "使用指南-添加/编辑/查看详情", tags = {"使用指南"})
    public AjaxResult<TUseGuide> updateUseGuide(@RequestBody UseGuidDTO dto) {
@@ -145,7 +145,6 @@
        }
        return AjaxResult.success(new TUseGuide());
    }
    @ResponseBody
    @DeleteMapping("/delete{id}")
    @ApiOperation(value = "使用指南-删除", tags = {"使用指南"})
    public AjaxResult updateUseGuide(@PathVariable Integer id) {
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.management.api.feignClient.ManagementClient;
import com.ruoyi.study.domain.*;
import com.ruoyi.study.dto.SubjectDTO;
import com.ruoyi.study.dto.SubjectQuery;
@@ -49,6 +50,7 @@
    @Autowired
    private ITStudyService studyService;
    @PostMapping("/subjectList")
    @ApiOperation(value = "列表查询", tags = {"题目管理"})
    public R<PageInfo<SubjectVO>> subjectList(@RequestBody SubjectQuery query) {
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -5,6 +5,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.management.api.feignClient.ManagementClient;
import com.ruoyi.management.api.model.TPage;
import com.ruoyi.study.domain.TUser;
import com.ruoyi.study.dto.AppUserQuery;
import com.ruoyi.study.dto.UserInfoQuery;
@@ -42,8 +44,28 @@
    @Autowired
    private IVipOrderService vipOrderService;
    @Autowired
    private ManagementClient managementClient;
    @PostMapping("/getPage")
    @ApiOperation(value = "获取注意事项", tags = {"家长端-注意事项"})
    public AjaxResult<TPage> getPage() {
        List<TPage> data = managementClient.getPage1().getData();
        for (TPage datum : data) {
            if (datum.getType() == 4){
                return AjaxResult.success(datum);
            }
        }
        return AjaxResult.success();
    }
    @PostMapping("/updateUserInfo")
    @ApiOperation(value = "修改个人资料", tags = {"家长端-个人中心"})
    public AjaxResult updateUserInfo() {
        return AjaxResult.success("修改成功");
    }
    @PostMapping("/userList")
    @ApiOperation(value = "用户列表", tags = {"用户管理"})
    @ApiOperation(value = "用户列表", tags = {"管理后台-用户管理"})
    public R<PageInfo<AppUserVO>> couponReceive(AppUserQuery query) {
        PageInfo<AppUserVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
        List<AppUserVO> list =  userService.listAll(query);
@@ -64,7 +86,7 @@
    }
    @PostMapping("/getUserInfo")
    @ApiOperation(value = "查看用户详情", tags = {"用户管理"})
    @ApiOperation(value = "查看用户详情", tags = {"管理后台-用户管理"})
    public R<UserInfoVO> getUserInfo(UserInfoQuery dto) {
        SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd");
        UserInfoVO res = new UserInfoVO();
@@ -109,7 +131,7 @@
        return R.ok(res);
    }
    @PostMapping("/freeze")
    @ApiOperation(value = "冻结/解冻", tags = {"用户管理"})
    @ApiOperation(value = "冻结/解冻", tags = {"管理后台-用户管理"})
    public R freeze(Integer id) {
        TUser byId = userService.getById(id);
        if (byId.getState() == 1) {
@@ -123,7 +145,7 @@
    @PostMapping("/vipOrderList")
    @ApiOperation(value = "列表查询", tags = {"会员管理"})
    @ApiOperation(value = "列表查询", tags = {"管理后台-会员管理"})
    public R<PageInfo<VipOrderVO>> vipOrderList(AppUserQuery query) {
        PageInfo<VipOrderVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
        List<VipOrderVO> list =  vipOrderService.listAll(query);
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TIntegralRecord.java
New file
@@ -0,0 +1,43 @@
package com.ruoyi.study.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BaseModel;
import lombok.Data;
/**
 * <p>
 * 用户积分明细
 * </p>
 *
 * @author 无关风月
 * @since 2024-04-26
 */
@Data
@TableName("t_integral_record")
public class TIntegralRecord extends BaseModel {
    private static final long serialVersionUID = 1L;
    /**
     * 主键id
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 积分数量 带有负号为减少
     */
    private String integral;
    /**
     * 方式:完成题目 完成游戏 每日学习时长 商城消费
     */
    private String method;
    /**
     * 用户id
     */
    private Integer userId;
}
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/mapper/TIntegralRecordMapper.java
New file
@@ -0,0 +1,17 @@
package com.ruoyi.study.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.study.domain.TGameRecord;
import com.ruoyi.study.domain.TIntegralRecord;
/**
 * <p>
 * 自主游戏 Mapper 接口
 * </p>
 *
 * @author 无关风月
 * @since 2024-04-26
 */
public interface TIntegralRecordMapper extends BaseMapper<TIntegralRecord> {
}
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java
New file
@@ -0,0 +1,17 @@
package com.ruoyi.study.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.study.domain.TGameRecord;
import com.ruoyi.study.domain.TIntegralRecord;
/**
 * <p>
 * 自主游戏 服务类
 * </p>
 *
 * @author 无关风月
 * @since 2024-04-26
 */
public interface ITIntegralRecordService extends IService<TIntegralRecord> {
}
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TIntegralRecordServiceImpl.java
New file
@@ -0,0 +1,23 @@
package com.ruoyi.study.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.study.domain.TGameRecord;
import com.ruoyi.study.domain.TIntegralRecord;
import com.ruoyi.study.mapper.TGameRecordMapper;
import com.ruoyi.study.mapper.TIntegralRecordMapper;
import com.ruoyi.study.service.ITGameRecordService;
import com.ruoyi.study.service.ITIntegralRecordService;
import org.springframework.stereotype.Service;
/**
 * <p>
 * 自主游戏 服务实现类
 * </p>
 *
 * @author 无关风月
 * @since 2024-04-26
 */
@Service
public class TIntegralRecordServiceImpl extends ServiceImpl<TIntegralRecordMapper, TIntegralRecord> implements ITIntegralRecordService {
}
ruoyi-service/ruoyi-study/src/main/resources/mapper/sutdy/TIntegralRecordMapper.xml
New file
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.study.mapper.TIntegralRecordMapper">
</mapper>