代码提交

44323

2024-05-16 43095dbd71d934b54713b42f27672f1248eed494

代码提交

 ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/factory/GoodsFallbackFactory.java

@@ -2,11 +2,15 @@

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.goods.api.domain.TGoods;
import com.ruoyi.goods.api.domain.TGoodsType;
import com.ruoyi.goods.api.feignClient.GoodsClient;
import com.ruoyi.goods.api.model.GoodsTypeQuery;
import com.ruoyi.goods.api.model.TGoodsVO;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;

import java.util.List;

@Component
public class GoodsFallbackFactory implements FallbackFactory<GoodsClient> {
@@ -20,6 +24,51 @@
            public R<PageInfo<TGoodsType>> listType(GoodsTypeQuery query) {
                return R.fail("获取商品类型列表失败" + cause.getMessage());
            }

            @Override
            public R addGoodsType(TGoodsType dto) {
                return R.fail("添加商品类型失败" + cause.getMessage());
            }

            @Override
            public R updateGoodsType(TGoodsType dto) {
                return R.fail("修改商品类型失败" + cause.getMessage());
            }

            @Override
            public R deleteGoodsType(Integer id) {
                return R.fail("删除商品类型失败" + cause.getMessage());
            }

            @Override
            public R<PageInfo<TGoods>> listAll(GoodsTypeQuery query) {
                return R.fail("获取商品列表失败" + cause.getMessage());
            }

            @Override
            public R addGoods(TGoods dto) {
                return R.fail("添加商品失败" + cause.getMessage());
            }

            @Override
            public R deleteGoods(Integer id) {
                return R.fail("删除商品失败" + cause.getMessage());
            }

            @Override
            public R updateGoods(TGoods dto) {
                return R.fail("修改商品失败" + cause.getMessage());
            }

            @Override
            public R<TGoodsVO> getGoodsInfo(Integer id) {
                return R.fail("获取商品详情失败" + cause.getMessage());
            }

            @Override
            public R<List<TGoodsType>> getGoodsInfo() {
                return R.fail("获取商品类型列表" + cause.getMessage());
            }
        };
    }
}

 ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/feignClient/GoodsClient.java

@@ -3,15 +3,43 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.goods.api.domain.TGoods;
import com.ruoyi.goods.api.domain.TGoodsType;
import com.ruoyi.goods.api.factory.GoodsFallbackFactory;
import com.ruoyi.goods.api.model.GoodsTypeQuery;
import com.ruoyi.goods.api.model.TGoodsVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@FeignClient(contextId = "goodsClient", value = ServiceNameConstants.GOODS_SERVICE, fallbackFactory = GoodsFallbackFactory.class)
public interface GoodsClient {
    @PostMapping("/base/goods/listType")
    R<PageInfo<TGoodsType>> listType(@RequestBody GoodsTypeQuery query);

    @PostMapping("/base/goods/addGoodsType")
     R addGoodsType(@RequestBody TGoodsType dto);
    @PostMapping("/base/goods/updateGoodsType")
     R updateGoodsType(@RequestBody TGoodsType dto);

    @PostMapping("/base/goods/deleteGoodsType/{id}")
    R deleteGoodsType(@PathVariable("id") Integer id);
    @GetMapping("/base/goods/listAll")
     R<PageInfo<TGoods>> listAll(@RequestBody GoodsTypeQuery query);
    @PostMapping("/base/goods/addGoods")
     R addGoods(@RequestBody TGoods dto);

    @PostMapping("/base/goods/deleteGoods/{id}")
     R deleteGoods(@PathVariable("id") Integer id);

    @PostMapping("/base/goods/updateGoods")
     R updateGoods(@RequestBody TGoods dto);

    @PostMapping("/base/goods/getGoodsInfo/{id}")
     R<TGoodsVO> getGoodsInfo(@PathVariable("id") Integer id);

    @PostMapping("/base/goods/getGoodsTypeList")
     R<List<TGoodsType>> getGoodsInfo();
}

 ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TGoodsVO.java

New file
@@ -0,0 +1,233 @@
package com.ruoyi.goods.api.model;


import com.ruoyi.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * <p>
 * 商品表
 * </p>
 *
 * @author 无关风月
 * @since 2024-04-26
 */
@Data
public class TGoodsVO extends BaseModel {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "剩余数量")
    private Long inventory;
    /**
     * 主键id
     */
    private Integer id;
    /**
     * 商品名称
     */
    @ApiModelProperty(value = "商品名称")
    private String name;
    /**
     * 所需积分
     */
    @ApiModelProperty(value = "所需积分")
    private String integral;
    /**
     * 商品原价
     */
    @ApiModelProperty(value = "商品原价")
    private BigDecimal price;
    /**
     * 商品总数
     */
    @ApiModelProperty(value = "商品总数")
    private Integer total;
    /**
     * 剩余数量
     */
    @ApiModelProperty(value = "剩余数量")
    private Integer surplus;
    /**
     * 单个用户可兑换数量
     */
    @ApiModelProperty(value = "单个用户可兑换数量")
    private Integer userCount;
    /**
     * 商品类型id
     */
    @ApiModelProperty(value = "商品类型id")
    private Integer typeId;
    /**
     * 商品封面图
     */
    @ApiModelProperty(value = "商品封面图")
    private String coverImg;
    /**
     * 商品详情图片 多张逗号隔开
     */
    @ApiModelProperty(value = "商品详情图片 多张逗号隔开")
    private String detailImg;
    /**
     * 商品详情
     */
    @ApiModelProperty(value = "商品详情")
    private String detail;
    /**
     * 插入时间
     */
    @ApiModelProperty(value = "插入时间")
    private Date insertTime;
    /**
     * 是否删除 0否1是
     */
    @ApiModelProperty(value = "是否删除 0否1是")
    private Integer isDelete;
    /**
     * 兑换类型 1.0商城只有积分兑换 保留字段 
     */
    @ApiModelProperty(value = "前端忽略 兑换类型 1.0商城只有积分兑换 保留字段 ")
    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-study/src/main/java/com/ruoyi/study/api/dto/AddWeekDTO.java

@@ -13,4 +13,6 @@
    private Integer week;
    @ApiModelProperty("本周主题")
    private String title;
    @ApiModelProperty("1一季度2二季度3三季度4四季度")
    private Integer quarter;
}

 ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyAnswerDTO.java

@@ -15,4 +15,6 @@
    private Integer answerSubject;
    @ApiModelProperty("问题题目是否为设置为答案图片 0否1是 为0 那么回答题目是答案图片")
    private Integer isAnswer;
    @ApiModelProperty("非会员是否可看 0否1是")
    private Integer isVip;
}

 ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyInductionDTO.java

@@ -11,4 +11,6 @@
    private String subject;
    @ApiModelProperty("完成答题可获积分")
    private Integer integral;
    @ApiModelProperty("非会员是否可看 0否1是")
    private Integer isVip;
}

 ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyListenDTO.java

@@ -11,4 +11,6 @@
    private String subject;
    @ApiModelProperty("完成答题可获积分")
    private Integer integral;
    @ApiModelProperty("非会员是否可看 0否1是")
    private Integer isVip;
}

 ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyLookDTO.java

@@ -13,4 +13,6 @@
    private String sort;
    @ApiModelProperty("可获积分")
    private Integer integral;
    @ApiModelProperty("非会员是否可看 0否1是")
    private Integer isVip;
}

 ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyPairDTO.java

@@ -11,6 +11,8 @@
    private String subject;
    @ApiModelProperty("可获积分")
    private Integer integral;
    @ApiModelProperty("非会员是否可看 0否1是")
    private Integer isVip;


}

 ruoyi-service/ruoyi-goods/pom.xml

@@ -11,7 +11,7 @@
    <artifactId>ruoyi-modules-goods</artifactId>

    <description>
        ruoyi-modules-management后台配置模块
        ruoyi-modules-goods商城模块
    </description>

    <dependencies>

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/RuoYiGoodsApplication.java

@@ -1,4 +1,4 @@
package com.ruoyi.management;
package com.ruoyi.goods;

import com.ruoyi.common.security.annotation.EnableCustomConfig;
import com.ruoyi.common.security.annotation.EnableRyFeignClients;
@@ -14,7 +14,7 @@
 * @author ruoyi
 */
@EnableCustomConfig
@MapperScan({"com.ruoyi.management.mapper"})
@MapperScan({"com.ruoyi.goods.mapper"})
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication
@@ -24,7 +24,7 @@
    public static void main(String[] args)
    {
        SpringApplication.run(RuoYiGoodsApplication.class, args);
        System.out.println("(♥◠‿◠)ﾉﾞ  后台配置模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
        System.out.println("(♥◠‿◠)ﾉﾞ  商城模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
                " .-------.       ____     __        \n" +
                " |  _ _   \\      \\   \\   /  /    \n" +
                " | ( ' )  |       \\  _. /  '       \n" +

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/config/MybatisPlusConfig.java

@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.config.GlobalConfig;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.ruoyi.system.api.config.DataUpdateHandlerConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

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

@@ -44,7 +44,7 @@
        if (StringUtils.hasLength(query.getName())){
            wrapper.like("name", query.getName());
        }
        wrapper.ne("isDelete",1);
//        wrapper.ne("isDelete",1);
        wrapper.orderByDesc("id");
        List<TGoodsType> list = goodsTypeService.list(wrapper);
        PageInfo<TGoodsType> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
@@ -63,9 +63,9 @@
        goodsTypeService.updateById(dto);
        return R.ok("修改成功");
    }
    @PostMapping("/deleteGoodsType")
    @PostMapping("/deleteGoodsType/{id}")
    @ApiOperation(value = "删除", tags = {"后台-商品类型管理"})
    public R deleteGoodsType(Integer id) {
    public R deleteGoodsType(@PathVariable("id")Integer id) {
        TGoodsType byId = goodsTypeService.getById(id);
        byId.setIsDelete(1);
        goodsTypeService.removeById(byId);
@@ -91,9 +91,9 @@
        goodsService.save(dto);
        return R.ok("添加成功");
    }
    @PostMapping("/deleteGoods")
    @PostMapping("/deleteGoods/{id}")
    @ApiOperation(value = "删除", tags = {"后台-商品管理"})
    public R deleteGoods(@RequestParam Integer id) {
    public R deleteGoods(@PathVariable("id") Integer id) {
        TGoods byId = goodsService.getById(id);
        goodsService.removeById(byId);
        return R.ok("删除成功");
@@ -104,9 +104,9 @@
        goodsService.updateById(dto);
        return R.ok("修改成功");
    }
    @PostMapping("/getGoodsInfo")
    @PostMapping("/getGoodsInfo/{id}")
    @ApiOperation(value = "查看详情", tags = {"后台-商品管理"})
    public R<TGoodsVO> getGoodsInfo(@RequestParam Integer id) {
    public R<TGoodsVO> getGoodsInfo(@PathVariable("id") Integer id) {
        TGoodsVO tGoodsVO = new TGoodsVO();
        TGoods byId = goodsService.getById(id);
        BeanUtils.copyProperties(byId,tGoodsVO);

 ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsMapper.xml

@@ -1,6 +1,6 @@
<?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.management.mapper.TGoodsMapper">
<mapper namespace="com.ruoyi.goods.mapper.TGoodsMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.goods.domain.TGoods">

 ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TGoodsTypeMapper.xml

@@ -1,6 +1,6 @@
<?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.management.mapper.TGoodsTypeMapper">
<mapper namespace="com.ruoyi.goods.mapper.TGoodsTypeMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.goods.domain.TGoodsType">

 ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TOrderMapper.xml

@@ -1,6 +1,6 @@
<?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.management.mapper.TOrderMapper">
<mapper namespace="com.ruoyi.goods.mapper.TOrderMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.goods.domain.TOrder">

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

@@ -6,18 +6,15 @@
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.goods.api.domain.TGoods;
import com.ruoyi.goods.api.domain.TGoodsType;
import com.ruoyi.goods.api.domain.TOrder;
import com.ruoyi.goods.api.feignClient.GoodsClient;
import com.ruoyi.goods.api.model.GoodsTypeQuery;
import com.ruoyi.goods.api.model.TGoodsVO;
import com.ruoyi.management.service.ITGoodsService;
import com.ruoyi.management.service.ITGoodsTypeService;
import com.ruoyi.management.service.ITOrderService;
import com.ruoyi.management.vo.TGoodsVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

import java.util.List;
@@ -46,100 +43,106 @@
    @ApiOperation(value = "列表查询", tags = {"后台-商品类型管理"})

    public AjaxResult<PageInfo<TGoodsType>> listType(String name, Integer pageNumber, Integer pageSize){
        QueryWrapper<TGoodsType> wrapper = new QueryWrapper<>();
        if (StringUtils.hasLength(name)){
            wrapper.like("name", name);
        }
        wrapper.ne("isDelete",1);
        wrapper.orderByDesc("id");
        List<TGoodsType> list = goodsTypeService.list(wrapper);
        PageInfo<TGoodsType> res = new PageInfo<>(pageNumber, pageSize);
        res.setRecords(list);
        GoodsTypeQuery goodsTypeQuery = new GoodsTypeQuery();
        goodsTypeQuery.setName(name);
        goodsTypeQuery.setPageNumber(pageNumber);
        goodsTypeQuery.setPageSize(pageSize);

//        PageInfo<TGoodsType> data = goodsClient.listType(goodsTypeQuery).getData();
        return AjaxResult.success(res);
        PageInfo<TGoodsType> data = goodsClient.listType(goodsTypeQuery).getData();
        return AjaxResult.success(data);
    }
    @ResponseBody
    @PostMapping("/addGoodsType")
    @ApiOperation(value = "添加", tags = {"后台-商品类型管理"})
    public AjaxResult<TGoods> addGoodsType(TGoodsType dto) {
        goodsTypeService.save(dto);
        goodsClient.addGoodsType(dto);
//        goodsTypeService.save(dto);
        return AjaxResult.success("添加成功");
    }
    @ResponseBody
    @PostMapping("/updateGoodsType")
    @ApiOperation(value = "修改", tags = {"后台-商品类型管理"})
    public AjaxResult<TGoods> updateGoodsType(TGoodsType dto) {
        goodsTypeService.updateById(dto);
        goodsClient.updateGoodsType(dto);
//        goodsTypeService.updateById(dto);
        return AjaxResult.success("修改成功");
    }
    @ResponseBody
    @PostMapping("/deleteGoodsType")
    @ApiOperation(value = "删除", tags = {"后台-商品类型管理"})
    public AjaxResult deleteGoodsType(Integer id) {
        TGoodsType byId = goodsTypeService.getById(id);
        byId.setIsDelete(1);
        goodsTypeService.updateById(byId);
        goodsClient.deleteGoodsType(id);
//        TGoodsType byId = goodsTypeService.getById(id);
//        byId.setIsDelete(1);
//        goodsTypeService.updateById(byId);
        return AjaxResult.success("删除成功");
    }
    @ResponseBody
    @GetMapping("/listAll")
    @ApiOperation(value = "列表查询", tags = {"后台-商品管理"})
    public AjaxResult<PageInfo<TGoods>> listAll(String name, Integer pageNumber, Integer pageSize){
        QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
        if (StringUtils.hasLength(name)){
            wrapper.like("name", name);
        }
        wrapper.orderByDesc("id");
        List<TGoods> list = goodsService.list(wrapper);
        PageInfo<TGoods> res = new PageInfo<>(pageNumber, pageSize);
        res.setRecords(list);
        return AjaxResult.success(res);
        GoodsTypeQuery goodsTypeQuery = new GoodsTypeQuery();
        goodsTypeQuery.setName(name);
        goodsTypeQuery.setPageNumber(pageNumber);
        goodsTypeQuery.setPageSize(pageSize);

        PageInfo<TGoods> data = goodsClient.listAll(goodsTypeQuery).getData();

//        QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
//        if (StringUtils.hasLength(name)){
//            wrapper.like("name", name);
//        }
//        wrapper.orderByDesc("id");
//        List<TGoods> list = goodsService.list(wrapper);
//        PageInfo<TGoods> res = new PageInfo<>(pageNumber, pageSize);
//        res.setRecords(list);
        return AjaxResult.success(data);
    }
    @ResponseBody
    @PostMapping("/addGoods")
    @ApiOperation(value = "添加", tags = {"后台-商品管理"})
    public AjaxResult<TGoods> addGoods(@RequestBody TGoods dto) {
        goodsService.save(dto);
        goodsClient.addGoods(dto);
        return AjaxResult.success("添加成功");
    }
    @ResponseBody
    @PostMapping("/deleteGoods")
    @ApiOperation(value = "删除", tags = {"后台-商品管理"})
    public AjaxResult deleteGoods(Integer id) {
        TGoods byId = goodsService.getById(id);
        goodsService.removeById(byId);
        goodsClient.deleteGoods(id);
//        TGoods byId = goodsService.getById(id);
//        goodsService.removeById(byId);
        return AjaxResult.success("删除成功");
    }
    @ResponseBody
    @PostMapping("/updateGoods")
    @ApiOperation(value = "修改", tags = {"后台-商品管理"})
    public AjaxResult<TGoods> updateGoods(@RequestBody TGoods dto) {
        goodsService.updateById(dto);
        goodsClient.updateGoods(dto);
        return AjaxResult.success("修改成功");
    }
    @ResponseBody
    @PostMapping("/getGoodsInfo")
    @ApiOperation(value = "查看详情", tags = {"后台-商品管理"})
    public AjaxResult<TGoodsVO> getGoodsInfo(Integer id) {
        TGoodsVO tGoodsVO = new TGoodsVO();
        TGoods byId = goodsService.getById(id);
        BeanUtils.copyProperties(byId,tGoodsVO);
        long goodsId = orderService.count(new QueryWrapper<TOrder>().eq("goodsId", id));
        tGoodsVO.setInventory(goodsId);
        return AjaxResult.success(tGoodsVO);
//        TGoodsVO tGoodsVO = new TGoodsVO();
//        TGoods byId = goodsService.getById(id);
//        BeanUtils.copyProperties(byId,tGoodsVO);
//        long goodsId = orderService.count(new QueryWrapper<TOrder>().eq("goodsId", id));
//        tGoodsVO.setInventory(goodsId);
        TGoodsVO data = goodsClient.getGoodsInfo(id).getData();

        return AjaxResult.success(data);
    }
    @ResponseBody
    @PostMapping("/getGoodsTypeList")
    @ApiOperation(value = "获取商品类型列表", tags = {"后台-商品管理"})
    public AjaxResult<List<TGoodsType>> getGoodsInfo() {
        List<TGoodsType> res = goodsTypeService.list(new QueryWrapper<TGoodsType>()
                .ne("isDelete", 1));
        return AjaxResult.success(res);
//        List<TGoodsType> res = goodsTypeService.list(new QueryWrapper<TGoodsType>()
//                .ne("isDelete", 1));
        List<TGoodsType> data = goodsClient.getGoodsInfo().getData();

        return AjaxResult.success(data);
    }

}

 ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/TGoodsVO.java

File was deleted

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

@@ -226,6 +226,7 @@
                tStudyListen.setSubject(studyListenDTO.getSubject());
                tStudyListen.setIntegral(studyListenDTO.getIntegral());
                tStudyListen.setWeek(week);
                tStudyListen.setIsVip(studyListenDTO.getIsVip());
                studyListenService.save(tStudyListen);
            }
            studyLookService.remove(new QueryWrapper<TStudyLook>()
@@ -240,6 +241,7 @@
                tStudyLook.setSubject(studyLookDTO.getSubject());
                tStudyLook.setIntegral(studyLookDTO.getIntegral());
                tStudyLook.setWeek(week);
                tStudyLook.setIsVip(studyLookDTO.getIsVip());
                studyLookService.save(tStudyLook);
            }
            studyInductionService.remove(new QueryWrapper<TStudyInduction>()
@@ -254,6 +256,7 @@
                tStudyInduction.setSubject(studyInductionDTO.getSubject());
                tStudyInduction.setIntegral(studyInductionDTO.getIntegral());
                tStudyInduction.setWeek(week);
                tStudyInduction.setIsVip(studyInductionDTO.getIsVip());
            }
            studyAnswerService.remove(new QueryWrapper<TStudyAnswer>()
                    .eq("studyId", one.getId())
@@ -269,6 +272,7 @@
                tStudyAnswer.setAnswerSubject(studyAnswerDTO.getAnswerSubject());
                tStudyAnswer.setIntegral(studyAnswerDTO.getIntegral());
                tStudyAnswer.setWeek(week);
                tStudyAnswer.setIsVip(studyAnswerDTO.getIsVip());
                studyAnswerService.save(tStudyAnswer);
            }
            studyPairService.remove(new QueryWrapper<TStudyPair>()
@@ -283,6 +287,7 @@
                tStudyPair.setSubject(studyPairDTO.getSubject());
                tStudyPair.setIntegral(studyPairDTO.getIntegral());
                tStudyPair.setWeek(week);
                tStudyPair.setIsVip(studyPairDTO.getIsVip());
                studyPairService.save(tStudyPair);
            }
        }
@@ -300,6 +305,7 @@
        tStudy.setType(dto.getType());
        tStudy.setWeek(dto.getWeek());
        tStudy.setTitle(dto.getTitle());
        tStudy.setQuarter(dto.getQuarter());
        studyService.save(tStudy);
        return R.ok();
    }

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

@@ -39,4 +39,8 @@
     * 本周主题
     */
    private String title;
    /**
     * 1一季度2二季度3三季度4四季度
     */
    private Integer quarter;
}

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

@@ -54,4 +54,8 @@
     * 学习id
     */
    private Integer studyId;
    /**
     * 非会员是否查看 0否1是
     */
    private Integer isVip;
}

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

@@ -46,4 +46,8 @@
     * 学习id
     */
    private Integer studyId;
    /**
     * 非会员是否查看 0否1是
     */
    private Integer isVip;
}

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

@@ -46,4 +46,8 @@
     * 学习id
     */
    private Integer studyId;
    /**
     * 非会员是否查看 0否1是
     */
    private Integer isVip;
}

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

@@ -50,4 +50,8 @@
     * 学习id
     */
    private Integer studyId;
    /**
     * 非会员是否查看 0否1是
     */
    private Integer isVip;
}

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

@@ -46,4 +46,8 @@
     * 学习id
     */
    private Integer studyId;
    /**
     * 非会员是否查看 0否1是
     */
    private Integer isVip;
}

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/AddWeekDTO.java

@@ -13,4 +13,6 @@
    private Integer week;
    @ApiModelProperty("本周主题")
    private String title;
    @ApiModelProperty("1一季度2二季度3三季度4四季度")
    private Integer quarter;
}

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyAnswerDTO.java

@@ -15,4 +15,6 @@
    private Integer answerSubject;
    @ApiModelProperty("问题题目是否为设置为答案图片 0否1是 为0 那么回答题目是答案图片")
    private Integer isAnswer;
    @ApiModelProperty("非会员是否可看 0否1是")
    private Integer isVip;
}

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyInductionDTO.java

@@ -11,4 +11,6 @@
    private String subject;
    @ApiModelProperty("完成答题可获积分")
    private Integer integral;
    @ApiModelProperty("非会员是否可看 0否1是")
    private Integer isVip;
}

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyListenDTO.java

@@ -11,4 +11,6 @@
    private String subject;
    @ApiModelProperty("完成答题可获积分")
    private Integer integral;
    @ApiModelProperty("非会员是否可看 0否1是")
    private Integer isVip;
}

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyLookDTO.java

@@ -13,4 +13,6 @@
    private String sort;
    @ApiModelProperty("可获积分")
    private Integer integral;
    @ApiModelProperty("非会员是否可看 0否1是")
    private Integer isVip;
}

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyPairDTO.java

@@ -11,6 +11,8 @@
    private String subject;
    @ApiModelProperty("可获积分")
    private Integer integral;
    @ApiModelProperty("非会员是否可看 0否1是")
    private Integer isVip;


}