From a623f1eb91b1d89872e3582b5747e9d7096ea225 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 24 五月 2024 09:01:59 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITOrderService.java | 6
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/OrderQuery.java | 6
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/AddStudySetDTO.java | 4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/config/MybatisPlusConfig.java | 2
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/SysSetVO.java | 2
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java | 67 +++----
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/OrderDTO.java | 2
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TOrderMapper.java | 6
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TOrderVO.java | 5
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TOrderServiceImpl.java | 9
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/dto/OrderQuery.java | 8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java | 4
ruoyi-service/ruoyi-management/src/main/resources/mapper/management/src/main/resources/mapper/TOrderMapper.xml | 24 --
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/factory/StudyFallbackFactory.java | 5
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 82 ++++++++
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/feignClient/GoodsClient.java | 9
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/AddStudySetDTO.java | 4
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/dto/OrderDTO.java | 2
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 216 +++++++++++++++---------
ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/factory/GoodsFallbackFactory.java | 19 +
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 7
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java | 8
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/vo/TOrderVO.java | 2
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java | 3
ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TOrderMapper.xml | 11
25 files changed, 334 insertions(+), 179 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/factory/GoodsFallbackFactory.java b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/factory/GoodsFallbackFactory.java
index a8b2a02..2328994 100644
--- a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/factory/GoodsFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/factory/GoodsFallbackFactory.java
@@ -5,10 +5,10 @@
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 com.ruoyi.goods.api.model.*;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -20,6 +20,21 @@
return new GoodsClient() {
@Override
+ public R getGoodsInfo1(OrderDTO dto) {
+ return R.fail("确认发货失败" + cause.getMessage());
+ }
+
+ @Override
+ public R<TOrderVO> getOrderInfo(Integer id) {
+ return R.fail("根据订单id获取订单详情失败" + cause.getMessage());
+ }
+
+ @Override
+ public R<PageInfo<TOrderVO>> listAll1(@RequestBody OrderQuery query) {
+ return R.fail("后台获取订单列表失败" + cause.getMessage());
+ }
+
+ @Override
public R<PageInfo<TGoodsType>> listType(GoodsTypeQuery query) {
return R.fail("获取商品类型列表失败" + cause.getMessage());
}
diff --git a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/feignClient/GoodsClient.java b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/feignClient/GoodsClient.java
index ec96ea0..0d0fcb6 100644
--- a/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/feignClient/GoodsClient.java
+++ b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/feignClient/GoodsClient.java
@@ -6,8 +6,7 @@
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 com.ruoyi.goods.api.model.*;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
@@ -19,6 +18,12 @@
@FeignClient(contextId = "goodsClient", value = ServiceNameConstants.GOODS_SERVICE, fallbackFactory = GoodsFallbackFactory.class)
public interface GoodsClient {
+ @PostMapping("/base/goods/confirm1")
+ R getGoodsInfo1(@RequestBody OrderDTO dto);
+ @PostMapping("/base/goods/getOrderInfo/{id}")
+ R<TOrderVO> getOrderInfo(@PathVariable("id")Integer id);
+ @PostMapping("/base/goods/listAll1")
+ R<PageInfo<TOrderVO>> listAll1(@RequestBody OrderQuery query);
@PostMapping("/base/goods/listType")
R<PageInfo<TGoodsType>> listType(@RequestBody GoodsTypeQuery query);
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/dto/OrderDTO.java b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/OrderDTO.java
similarity index 89%
rename from ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/dto/OrderDTO.java
rename to ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/OrderDTO.java
index 2bb5723..6f96af1 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/dto/OrderDTO.java
+++ b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/OrderDTO.java
@@ -1,4 +1,4 @@
-package com.ruoyi.management.dto;
+package com.ruoyi.goods.api.model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/dto/OrderQuery.java b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/OrderQuery.java
similarity index 84%
rename from ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/dto/OrderQuery.java
rename to ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/OrderQuery.java
index 5bc771c..8333c82 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/dto/OrderQuery.java
+++ b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/OrderQuery.java
@@ -1,4 +1,4 @@
-package com.ruoyi.management.dto;
+package com.ruoyi.goods.api.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,9 +21,9 @@
private String startTime;
@ApiModelProperty(value = "下单结束时间")
private String endTime;
- @ApiModelProperty(value = "下单开始时间")
+ @ApiModelProperty(value = "下单开始时间 前端忽略")
private Date startTime1;
- @ApiModelProperty(value = "下单结束时间")
+ @ApiModelProperty(value = "下单结束时间 前端忽略")
private Date endTime1;
@ApiModelProperty(value = "状态1待发货 2已发货 3已完成")
private Integer state;
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/TOrderVO.java b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TOrderVO.java
similarity index 94%
rename from ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/TOrderVO.java
rename to ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TOrderVO.java
index fcb49fe..ecc4311 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/TOrderVO.java
+++ b/ruoyi-api/ruoyi-api-goods/src/main/java/com/ruoyi/goods/api/model/TOrderVO.java
@@ -1,9 +1,8 @@
-package com.ruoyi.management.vo;
+package com.ruoyi.goods.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;
import lombok.Data;
@@ -28,6 +27,8 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ @ApiModelProperty(value = "用户id")
+ private Integer userId;
/**
* 订单编号
*/
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/AddStudySetDTO.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/AddStudySetDTO.java
index 44af42b..2a18b10 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/AddStudySetDTO.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/AddStudySetDTO.java
@@ -31,5 +31,9 @@
private Integer day;
@ApiModelProperty("类型1听2说3认读4阅读5练习6智能互动问答7智能识别 ")
private Integer type;
+ @ApiModelProperty("本周主题 ")
+ private String title;
+ @ApiModelProperty("所属季度")
+ private Integer quarter;
}
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/factory/StudyFallbackFactory.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/factory/StudyFallbackFactory.java
index c59897b..2e1d380 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/factory/StudyFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/factory/StudyFallbackFactory.java
@@ -21,6 +21,11 @@
public StudyClient create(Throwable cause) {
return new StudyClient() {
@Override
+ public R<TUser> getUserById(Integer id) {
+ return R.fail("根据用户id获取会员信息失败" + cause.getMessage());
+ }
+
+ @Override
public R vipBack(Integer id) {
return R.fail("用户购买会员退款失败" + cause.getMessage());
}
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java
index c72d5cc..c3fb930 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/feignClient/StudyClient.java
@@ -19,6 +19,9 @@
@FeignClient(contextId = "studyClient", value = ServiceNameConstants.STUDY_SERVICE, fallbackFactory = StudyFallbackFactory.class)
public interface StudyClient {
+
+ @PostMapping("/base/user/getUserById/{id}")
+ R<TUser> getUserById(@PathVariable("id") Integer id);
@PostMapping("/base/user/vipBack/{id}")
R vipBack(@PathVariable("id") Integer id);
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/config/MybatisPlusConfig.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/config/MybatisPlusConfig.java
index 0a4ca4e..999c92f 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/config/MybatisPlusConfig.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/config/MybatisPlusConfig.java
@@ -38,7 +38,7 @@
/**
* 自动填充功能
*
- * @return
+ * @returnp
*/
@Bean
public GlobalConfig globalConfig() {
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
index 1ae5275..2902af8 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
@@ -55,6 +55,10 @@
* 失败标记
*/
public static final Integer FAIL = 500;
+ /**
+ * 登录失效
+ */
+ public static final Integer TOKEN_ERROR = 600;
/**
* 登录成功状态
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
index 0003b19..603a629 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
@@ -17,6 +17,10 @@
/** 失败 */
public static final int FAIL = Constants.FAIL;
+ /**
+ * 登陆失效
+ */
+ public static final int TOKEN_ERROR = Constants.TOKEN_ERROR;
private int code;
@@ -43,6 +47,10 @@
{
return restResult(null, FAIL, null);
}
+ public static <T> R<T> tokenError(String msg)
+ {
+ return restResult(null, TOKEN_ERROR, msg);
+ }
public static <T> R<T> fail(String msg)
{
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
index fe88a1b..12d46fe 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
@@ -3,15 +3,17 @@
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.common.security.service.TokenService;
import com.ruoyi.goods.domain.*;
-import com.ruoyi.goods.dto.GoodExchangeDTO;
-import com.ruoyi.goods.dto.GoodQueryDTO;
-import com.ruoyi.goods.dto.GoodsTypeQuery;
+import com.ruoyi.goods.dto.*;
import com.ruoyi.goods.service.*;
import com.ruoyi.goods.vo.GoodDetailVO;
import com.ruoyi.goods.vo.TGoodsVO;
+import com.ruoyi.goods.vo.TOrderVO;
+import com.ruoyi.study.api.domain.TUser;
+import com.ruoyi.study.api.feignClient.StudyClient;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -21,7 +23,11 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
/**
@@ -286,6 +292,7 @@
return R.ok(goodsService.redeemNow(goodId, recipient));
}
+
/**
* 商品兑换
*
@@ -297,6 +304,75 @@
Recipient recipient = recipientService.getById(goodExchange.getRecipientId());
return R.ok(goodsService.goodExchange(goodExchange, recipient));
}
+ @Autowired
+ private StudyClient studyClient;
+ @PostMapping("/getOrderInfo/{id}")
+ @ApiOperation(value = "查看详情", tags = {"后台-订单管理"})
+ public R<TOrderVO> getOrderInfo(@PathVariable("id")Integer id) {
+ TOrder byId = orderService.getById(id);
+ TGoods byId2 = goodsService.getById(byId.getGoodsId());
+ TOrderVO tGoodsVO = new TOrderVO();
+ tGoodsVO.setName(byId2.getName());
+ BeanUtils.copyProperties(byId,tGoodsVO);
+ TUser byId1 = studyClient.getUserById(byId.getUserId()).getData();
+ tGoodsVO.setUserName(byId1.getName());
+ tGoodsVO.setPhone(byId1.getPhone());
+ return R.ok(tGoodsVO);
+ }
+ @PostMapping("/confirm1")
+ @ApiOperation(value = "确认发货", tags = {"后台-订单管理"})
+ public R getGoodsInfo1(@RequestBody OrderDTO dto) {
+ TOrder byId = orderService.getById(dto.getId());
+ byId.setState(2);
+ byId.setExpress(dto.getExpress());
+ byId.setExpressNumber(dto.getExpressNumber());
+ byId.setExpressTime(new Date());
+ orderService.updateById(byId);
+ return R.ok("修改成功");
+ }
+ @PostMapping("/listAll1")
+ @ApiOperation(value = "列表查询", tags = {"后台-订单管理"})
+ public R<PageInfo<TOrderVO>> listAll1(@RequestBody OrderQuery query) throws ParseException {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if (query.getEndTime()!=null){
+ Date parse = format.parse(query.getStartTime());
+ Date parse1 = format.parse(query.getEndTime());
+ query.setStartTime1(parse);
+ query.setEndTime1(parse1);
+ }
+ List<TOrderVO> list = orderService.listAll(query);
+ List<TOrderVO> list1 = new ArrayList<>();
+ for (TOrderVO tOrderVO : list) {
+ TUser data = studyClient.getUserById(tOrderVO.getUserId()).getData();
+ if (data!=null){
+ tOrderVO.setUserName(data.getName());
+ tOrderVO.setPhone(data.getPhone());
+ }
+ if (!StringUtils.hasLength(query.getPhone()) && !StringUtils.hasLength(query.getUserName())){
+ list1.add(tOrderVO);
+ continue;
+ }
+ // 如果筛选条件输入了电话或者姓名那么需要过滤掉不符合条件的数据
+ if (StringUtils.hasLength(query.getPhone()) && StringUtils.hasLength(query.getUserName())){
+ if (tOrderVO.getPhone().contains(query.getPhone()) && tOrderVO.getUserName().contains(query.getUserName())){
+ list1.add(tOrderVO);
+ }
+ }else if (StringUtils.hasLength(query.getPhone())){
+ if (tOrderVO.getPhone().contains(query.getPhone())){
+ list1.add(tOrderVO);
+ }
+ }else if (StringUtils.hasLength(query.getUserName())){
+ if (tOrderVO.getUserName().contains(query.getUserName())){
+ list1.add(tOrderVO);
+ }
+ }
+
+
+ }
+ PageInfo<TOrderVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
+ res.setRecords(list1);
+ return R.ok(res);
+ }
}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/dto/OrderDTO.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/dto/OrderDTO.java
similarity index 89%
copy from ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/dto/OrderDTO.java
copy to ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/dto/OrderDTO.java
index 2bb5723..da1219a 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/dto/OrderDTO.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/dto/OrderDTO.java
@@ -1,4 +1,4 @@
-package com.ruoyi.management.dto;
+package com.ruoyi.goods.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/dto/OrderQuery.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/dto/OrderQuery.java
index 739210a..91f234a 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/dto/OrderQuery.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/dto/OrderQuery.java
@@ -18,9 +18,13 @@
@ApiModelProperty(value = "联系电话")
private String phone;
@ApiModelProperty(value = "下单开始时间")
- private Date startTime;
+ private String startTime;
@ApiModelProperty(value = "下单结束时间")
- private Date endTime;
+ private String endTime;
+ @ApiModelProperty(value = "下单开始时间 前端忽略")
+ private Date startTime1;
+ @ApiModelProperty(value = "下单结束时间 前端忽略")
+ private Date endTime1;
@ApiModelProperty(value = "状态1待发货 2已发货 3已完成")
private Integer state;
@ApiModelProperty(value = "页码，首页1", required = true)
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/vo/TOrderVO.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/vo/TOrderVO.java
index ae99049..cd4753c 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/vo/TOrderVO.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/vo/TOrderVO.java
@@ -27,6 +27,8 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ @ApiModelProperty(value = "用户id")
+ private Integer userId;
/**
* 订单编号
*/
diff --git a/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TOrderMapper.xml b/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TOrderMapper.xml
index 0abe702..6d098db 100644
--- a/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TOrderMapper.xml
+++ b/ruoyi-service/ruoyi-goods/src/main/resources/mapper/goods/TOrderMapper.xml
@@ -22,9 +22,9 @@
id, orderNumber, userId, insertTime, goodsId, count, state, express, expressNumber, expressTime, integral
</sql>
<select id="listAll" resultType="com.ruoyi.goods.vo.TOrderVO">
- select t1.*,t2.`name` as userName,t2.phone as phone
+ select t1.*,t2.name as name
from t_order t1
- left join t_user t2 on t1.userId = t2.id
+ left join t_goods t2 on t1.goodsId = t2.id
where 1=1
<if test="null != req.state">
and t1.state = #{req.state}
@@ -32,12 +32,7 @@
<if test="null != req.orderNumber and '' != req.orderNumber">
and t1.orderNumber like CONCAT('%', #{req.orderNumber}, '%')
</if>
- <if test="null != req.userName and '' != req.userName">
- and t2.`name` like CONCAT('%', #{req.userName}, '%')
- </if>
- <if test="null != req.phone and '' != req.phone">
- and t2.phone like CONCAT('%', #{req.phone}, '%')
- </if>
+
<if test="null != req.startTime">
and t1.insertTime between #{req.startTime} and #{req.endTime}
</if>
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java
index c112f4f..375db86 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TOrderController.java
@@ -1,19 +1,17 @@
package com.ruoyi.management.controller;
+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.goods.api.domain.TGoods;
-import com.ruoyi.goods.api.domain.TOrder;
-import com.ruoyi.management.domain.TUser;
-import com.ruoyi.management.dto.OrderDTO;
-import com.ruoyi.management.dto.OrderQuery;
+import com.ruoyi.goods.api.feignClient.GoodsClient;
+import com.ruoyi.goods.api.model.OrderDTO;
+import com.ruoyi.goods.api.model.OrderQuery;
+import com.ruoyi.goods.api.model.TOrderVO;
import com.ruoyi.management.service.ITGoodsService;
import com.ruoyi.management.service.ITOrderService;
import com.ruoyi.management.service.ITUserService;
-import com.ruoyi.management.vo.TOrderVO;
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.web.bind.annotation.PostMapping;
@@ -21,9 +19,6 @@
import org.springframework.web.bind.annotation.ResponseBody;
import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
/**
* <p>
@@ -42,47 +37,45 @@
private ITUserService userService;
@Autowired
private ITGoodsService goodsService;
+ @Autowired
+ private GoodsClient goodsClient;
@ResponseBody
@PostMapping("/listAll")
@ApiOperation(value = "列表查询", tags = {"后台-订单管理"})
public AjaxResult<PageInfo<TOrderVO>> listAll(OrderQuery query) throws ParseException {
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
- if (query.getEndTime()!=null){
- Date parse = format.parse(query.getStartTime());
- Date parse1 = format.parse(query.getEndTime());
- query.setStartTime1(parse);
- query.setEndTime1(parse1);
- }
- List<TOrderVO> list = tOrderService.listAll(query);
- PageInfo<TOrderVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
- res.setRecords(list);
- return AjaxResult.success(res);
+// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//
+// if (query.getEndTime()!=null){
+// Date parse = format.parse(query.getStartTime());
+// Date parse1 = format.parse(query.getEndTime());
+// query.setStartTime1(parse);
+// query.setEndTime1(parse1);
+// }
+// List<TOrderVO> list = tOrderService.listAll(query);
+// PageInfo<TOrderVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
+// res.setRecords(list);
+ PageInfo<TOrderVO> data = goodsClient.listAll1(query).getData();
+ return AjaxResult.success(data);
}
@ResponseBody
@PostMapping("/getOrderInfo")
@ApiOperation(value = "查看详情", tags = {"后台-订单管理"})
public AjaxResult<TOrderVO> getGoodsInfo(Integer id) {
- TOrder byId = tOrderService.getById(id);
- TGoods byId2 = goodsService.getById(byId.getGoodsId());
- TOrderVO tGoodsVO = new TOrderVO();
- tGoodsVO.setName(byId2.getName());
- BeanUtils.copyProperties(byId,tGoodsVO);
- TUser byId1 = userService.getById(byId.getUserId());
- tGoodsVO.setUserName(byId1.getName());
- tGoodsVO.setPhone(byId1.getPhone());
- return AjaxResult.success(tGoodsVO);
+ TOrderVO data = goodsClient.getOrderInfo(id).getData();
+ return AjaxResult.success(data);
}
@ResponseBody
@PostMapping("/confirm")
@ApiOperation(value = "确认发货", tags = {"后台-订单管理"})
public AjaxResult<TOrderVO> getGoodsInfo(OrderDTO dto) {
- TOrder byId = tOrderService.getById(dto.getId());
- byId.setState(2);
- byId.setExpress(dto.getExpress());
- byId.setExpressNumber(dto.getExpressNumber());
- byId.setExpressTime(new Date());
- tOrderService.updateById(byId);
+// TOrder byId = tOrderService.getById(dto.getId());
+// byId.setState(2);
+// byId.setExpress(dto.getExpress());
+// byId.setExpressNumber(dto.getExpressNumber());
+// byId.setExpressTime(new Date());
+// tOrderService.updateById(byId);
+ goodsClient.getGoodsInfo1(dto);
+ R.tokenError("登陆失效");
return AjaxResult.success("修改成功");
}
}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TOrderMapper.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TOrderMapper.java
index b635e24..a3e6348 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TOrderMapper.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/mapper/TOrderMapper.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.goods.api.domain.TOrder;
-import com.ruoyi.management.dto.OrderQuery;
-import com.ruoyi.management.vo.TOrderVO;
+import com.ruoyi.goods.api.model.OrderQuery;
+import com.ruoyi.goods.api.model.TOrderVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -18,6 +18,6 @@
*/
public interface TOrderMapper extends BaseMapper<TOrder> {
- List<TOrderVO> listAll(@Param("req") OrderQuery query);
+
}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITOrderService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITOrderService.java
index b3b2530..da8417c 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITOrderService.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITOrderService.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.goods.api.domain.TOrder;
-import com.ruoyi.management.dto.OrderQuery;
-import com.ruoyi.management.vo.TOrderVO;
+import com.ruoyi.goods.api.model.OrderQuery;
+import com.ruoyi.goods.api.model.TOrderVO;
import java.util.List;
@@ -17,6 +17,6 @@
*/
public interface ITOrderService extends IService<TOrder> {
- List<TOrderVO> listAll(OrderQuery query);
+
}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TOrderServiceImpl.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TOrderServiceImpl.java
index 0614130..67fd822 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/TOrderServiceImpl.java
@@ -2,10 +2,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.goods.api.domain.TOrder;
-import com.ruoyi.management.dto.OrderQuery;
+import com.ruoyi.goods.api.model.OrderQuery;
+import com.ruoyi.goods.api.model.TOrderVO;
import com.ruoyi.management.mapper.TOrderMapper;
import com.ruoyi.management.service.ITOrderService;
-import com.ruoyi.management.vo.TOrderVO;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -21,8 +21,5 @@
@Service
public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> implements ITOrderService {
- @Override
- public List<TOrderVO> listAll(OrderQuery query) {
- return this.baseMapper.listAll(query);
- }
+
}
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/SysSetVO.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/SysSetVO.java
index acaa78d..8a66379 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/SysSetVO.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/SysSetVO.java
@@ -15,7 +15,7 @@
@ApiModelProperty("分享设置 图片")
private String img;
@ApiModelProperty("音效设置 正确")
- private String right;
+ private String correct;
@ApiModelProperty("音效设置 错误")
private String error;
@ApiModelProperty("积分设置 每在线x分钟")
diff --git a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/src/main/resources/mapper/TOrderMapper.xml b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/src/main/resources/mapper/TOrderMapper.xml
index 8b42a02..061153b 100644
--- a/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/src/main/resources/mapper/TOrderMapper.xml
+++ b/ruoyi-service/ruoyi-management/src/main/resources/mapper/management/src/main/resources/mapper/TOrderMapper.xml
@@ -21,28 +21,6 @@
<sql id="Base_Column_List">
id, orderNumber, userId, insertTime, goodsId, count, state, express, expressNumber, expressTime, integral
</sql>
- <select id="listAll" resultType="com.ruoyi.management.vo.TOrderVO">
- select t1.*,t2.`name` as userName,t2.phone as phone,t3.name as name
- from t_order t1
- left join t_goods t3 on t1.goodsId = t3.id
- left join t_user t2 on t1.userId = t2.id
- where 1=1
- <if test="null != req.state">
- and t1.state = #{req.state}
- </if>
- <if test="null != req.orderNumber and '' != req.orderNumber">
- and t1.orderNumber like CONCAT('%', #{req.orderNumber}, '%')
- </if>
- <if test="null != req.userName and '' != req.userName">
- and t2.`name` like CONCAT('%', #{req.userName}, '%')
- </if>
- <if test="null != req.phone and '' != req.phone">
- and t2.phone like CONCAT('%', #{req.phone}, '%')
- </if>
- <if test="null != req.startTime">
- and t1.insertTime between #{req.startTime1} and #{req.endTime1}
- </if>
- order by t1.insertTime desc
- </select>
+
</mapper>
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index a8feebe..9ec5522 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -177,6 +177,9 @@
TStudy one = studyService.getOne(new QueryWrapper<TStudy>()
.eq("week", week)
.eq("type", type));
+ one.setQuarter(dto.getQuarter());
+ one.setTitle(dto.getTitle());
+ studyService.updateById(one);
GameDTO game = dto.getGame();
StoryListenDTO storyListen = dto.getStoryListen();
if (day == 6) {
@@ -336,12 +339,23 @@
*/
@PostMapping("/addWeek")
public R<Object> addWeek(@RequestBody AddWeekDTO dto) {
- TStudy tStudy = new TStudy();
- tStudy.setType(dto.getType());
- tStudy.setWeek(dto.getWeek());
- tStudy.setTitle(dto.getTitle());
- tStudy.setQuarter(dto.getQuarter());
- studyService.save(tStudy);
+ TStudy one = studyService.getOne(new QueryWrapper<TStudy>()
+ .eq("week", dto.getWeek())
+ .eq("type", dto.getType()));
+ if (one!=null){
+ one.setType(dto.getType());
+ one.setWeek(dto.getWeek());
+ one.setTitle(dto.getTitle());
+ one.setQuarter(dto.getQuarter());
+ studyService.saveOrUpdate(one);
+ }else{
+ TStudy tStudy = new TStudy();
+ tStudy.setType(dto.getType());
+ tStudy.setWeek(dto.getWeek());
+ tStudy.setTitle(dto.getTitle());
+ tStudy.setQuarter(dto.getQuarter());
+ studyService.saveOrUpdate(tStudy);
+ }
return R.ok();
}
@@ -437,16 +451,19 @@
for (TStudyListen tStudyListen : list) {
StringBuilder temp = new StringBuilder();
StudyListenVO studyListenVO = new StudyListenVO();
- for (String s : tStudyListen.getSubject().split(",")) {
- TSubject byId = subjectService.getById(s);
- temp.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStudyListen.getSubject())){
+ for (String s : tStudyListen.getSubject().split(",")) {
+ TSubject byId = subjectService.getById(s);
+ temp.append(byId.getName()).append(",");
+ }
+ String string = temp.toString();
+ studyListenVO.setName(string.substring(0, string.length() - 1));
+ studyListenVO.setIntegral(tStudyListen.getIntegral());
+ studyListenVO.setSubject(tStudyListen.getSubject());
+ studyListenVO.setIsVip(tStudyListen.getIsVip());
+ listenVOS.add(studyListenVO);
}
- String string = temp.toString();
- studyListenVO.setName(string.substring(0, string.length() - 1));
- studyListenVO.setIntegral(tStudyListen.getIntegral());
- studyListenVO.setSubject(tStudyListen.getSubject());
- studyListenVO.setIsVip(tStudyListen.getIsVip());
- listenVOS.add(studyListenVO);
+
}
// 看音选图
List<TStudyLook> list1 = studyLookService.list(new QueryWrapper<TStudyLook>()
@@ -458,22 +475,25 @@
StringBuilder names = new StringBuilder();
StringBuilder sorts = new StringBuilder();
StudyLookVO studyLookVO1 = new StudyLookVO();
- for (String s : tStudyLook.getSubject().split(",")) {
- TSubject byId = subjectService.getById(s);
- names.append(byId.getName()).append(",");
- String[] split = tStudyLook.getSort().split(",");
- String s1 = split[index];
- sorts.append(s1).append(",");
- index++;
+ if (StringUtils.hasLength(tStudyLook.getSubject())){
+ for (String s : tStudyLook.getSubject().split(",")) {
+ TSubject byId = subjectService.getById(s);
+ names.append(byId.getName()).append(",");
+ String[] split = tStudyLook.getSort().split(",");
+ String s1 = split[index];
+ sorts.append(s1).append(",");
+ index++;
+ }
+ String string = names.toString();
+ String string1 = sorts.toString();
+ studyLookVO1.setName(string.substring(0, string.length() - 1));
+ studyLookVO1.setSort(string1.substring(0, string1.length() - 1));
+ studyLookVO1.setIntegral(tStudyLook.getIntegral());
+ studyLookVO1.setSubject(tStudyLook.getSubject());
+ studyLookVO1.setIsVip(tStudyLook.getIsVip());
+ lookVOS.add(studyLookVO1);
}
- String string = names.toString();
- String string1 = sorts.toString();
- studyLookVO1.setName(string.substring(0, string.length() - 1));
- studyLookVO1.setSort(string1.substring(0, string1.length() - 1));
- studyLookVO1.setIntegral(tStudyLook.getIntegral());
- studyLookVO1.setSubject(tStudyLook.getSubject());
- studyLookVO1.setIsVip(tStudyLook.getIsVip());
- lookVOS.add(studyLookVO1);
+
}
// 归纳排除
List<TStudyInduction> list2 = studyInductionService.list(new QueryWrapper<TStudyInduction>()
@@ -483,17 +503,20 @@
for (TStudyInduction tStudyInduction : list2) {
StringBuilder names = new StringBuilder();
StudyInductionVO studyInductionVO = new StudyInductionVO();
- for (String s : tStudyInduction.getSubject().split(",")) {
- String replace = s.replace("-", "");
- TSubject byId = subjectService.getById(replace);
- names.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStudyInduction.getSubject())){
+ for (String s : tStudyInduction.getSubject().split(",")) {
+ String replace = s.replace("-", "");
+ TSubject byId = subjectService.getById(replace);
+ names.append(byId.getName()).append(",");
+ }
+ String string = names.toString();
+ studyInductionVO.setName(string.substring(0, string.length() - 1));
+ studyInductionVO.setIntegral(tStudyInduction.getIntegral());
+ studyInductionVO.setSubject(tStudyInduction.getSubject());
+ studyInductionVO.setIsVip(tStudyInduction.getIsVip());
+ inductionVOS.add(studyInductionVO);
}
- String string = names.toString();
- studyInductionVO.setName(string.substring(0, string.length() - 1));
- studyInductionVO.setIntegral(tStudyInduction.getIntegral());
- studyInductionVO.setSubject(tStudyInduction.getSubject());
- studyInductionVO.setIsVip(tStudyInduction.getIsVip());
- inductionVOS.add(studyInductionVO);
+
}
// 有问有答
List<TStudyAnswer> list3 = studyAnswerService.list(new QueryWrapper<TStudyAnswer>()
@@ -502,24 +525,37 @@
for (TStudyAnswer tStudyAnswer : list3) {
StringBuilder names = new StringBuilder();
StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
- if (tStudyAnswer.getIsAnswer() == 1) {
- TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
- names.append(byId.getName()).append(",");
- TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
- names.append(byId1.getName()).append(",");
- } else {
- TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
- names.append(byId.getName()).append(",");
- TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
- names.append(byId1.getName()).append(",");
+ if (tStudyAnswer.getIsAnswer() != null){
+ if (tStudyAnswer.getIsAnswer() == 1) {
+ if (tStudyAnswer.getSubject()!=null){
+ TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
+ names.append(byId.getName()).append(",");
+ }
+ if (tStudyAnswer.getAnswerSubject()!=null) {
+ TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
+ names.append(byId1.getName()).append(",");
+ }
+ } else {
+ if (tStudyAnswer.getSubject()!=null) {
+ TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
+ names.append(byId.getName()).append(",");
+ }
+ if (tStudyAnswer.getAnswerSubject()!=null) {
+ TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
+ names.append(byId1.getName()).append(",");
+ }
+ }
}
- String string = names.toString();
- studyAnswerVO.setName(string.substring(0, string.length() - 1));
- studyAnswerVO.setIntegral(tStudyAnswer.getIntegral());
- studyAnswerVO.setIsVip(tStudyAnswer.getIsVip());
- studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
- studyAnswerVO.setSubject(tStudyAnswer.getSubject()+","+tStudyAnswer.getAnswerSubject());
- answerVOS.add(studyAnswerVO);
+ if (StringUtils.hasLength(names)){
+ String string = names.toString();
+ studyAnswerVO.setName(string.substring(0, string.length() - 1));
+ studyAnswerVO.setIntegral(tStudyAnswer.getIntegral());
+ studyAnswerVO.setIsVip(tStudyAnswer.getIsVip());
+ studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
+ studyAnswerVO.setSubject(tStudyAnswer.getSubject()+","+tStudyAnswer.getAnswerSubject());
+ answerVOS.add(studyAnswerVO);
+ }
+
}
// 音图相配
List<TStudyPair> list4 = studyPairService.list(new QueryWrapper<TStudyPair>()
@@ -529,16 +565,19 @@
for (TStudyPair tStudyPair : list4) {
StringBuilder names = new StringBuilder();
StudyPairVO studyPairVO = new StudyPairVO();
- for (String s : tStudyPair.getSubject().split(",")) {
- TSubject byId = subjectService.getById(s);
- names.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStudyPair.getSubject())){
+ for (String s : tStudyPair.getSubject().split(",")) {
+ TSubject byId = subjectService.getById(s);
+ names.append(byId.getName()).append(",");
+ }
+ String string = names.toString();
+ studyPairVO.setName(string.substring(0, string.length() - 1));
+ studyPairVO.setIntegral(tStudyPair.getIntegral());
+ studyPairVO.setSubject(tStudyPair.getSubject());
+ studyPairVO.setIsVip(tStudyPair.getIsVip());
+ pairVOS.add(studyPairVO);
}
- String string = names.toString();
- studyPairVO.setName(string.substring(0, string.length() - 1));
- studyPairVO.setIntegral(tStudyPair.getIntegral());
- studyPairVO.setSubject(tStudyPair.getSubject());
- studyPairVO.setIsVip(tStudyPair.getIsVip());
- pairVOS.add(studyPairVO);
+
}
List<TGame> list5 = gameService.list(new QueryWrapper<TGame>()
.eq("week", week));
@@ -562,29 +601,44 @@
StringBuilder names1 = new StringBuilder();
StringBuilder sort = new StringBuilder();
StringBuilder sort1 = new StringBuilder();
- for (String s : tStory.getStory().split(",")) {
- TStory byId = storyService.getById(s);
- names.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStory.getStory())){
+ for (String s : tStory.getStory().split(",")) {
+ TStory byId = storyService.getById(s);
+ names.append(byId.getName()).append(",");
+ }
}
- for (String s : tStory.getLookStory().split(",")) {
- TStory byId = storyService.getById(s);
- names1.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStory.getLookStory())){
+ for (String s : tStory.getLookStory().split(",")) {
+ TStory byId = storyService.getById(s);
+ names1.append(byId.getName()).append(",");
+ }
}
- for (String s : tStory.getSort().split(",")) {
- sort.append(s).append(",");
+ if (StringUtils.hasLength(tStory.getSort())){
+ for (String s : tStory.getSort().split(",")) {
+ sort.append(s).append(",");
+ }
}
- for (String s : tStory.getLookSort().split(",")) {
- sort1.append(s).append(",");
+ if (StringUtils.hasLength(tStory.getLookSort())){
+ for (String s : tStory.getLookSort().split(",")) {
+ sort1.append(s).append(",");
+ }
}
- storyVO.setName(names.substring(0, names.length() - 1));
- storyVO.setSort(sort.substring(0, sort.length() - 1));
+ if (StringUtils.hasLength(names)){
+ storyVO.setName(names.substring(0, names.length() - 1));
+
+ }if (StringUtils.hasLength(sort)){
+ storyVO.setSort(sort.substring(0, sort.length() - 1));
+
+ }if (StringUtils.hasLength(names1)){
+ storyVO.setLookName(names1.substring(0, names1.length() - 1));
+
+ }if (StringUtils.hasLength(sort1)){
+ storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
+ }
storyVO.setIntegral(tStory.getIntegral());
- storyVO.setLookName(names1.substring(0, names1.length() - 1));
- storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
storyVO.setLookIntegral(tStory.getLookIntegral());
storyVOS.add(storyVO);
}
-
res.setAnswer(answerVOS);
res.setPair(pairVOS);
res.setListen(listenVOS);
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index 94b1a51..4d134b1 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -64,6 +64,13 @@
@Resource
private ITUserShareService userShareService;
+ @PostMapping("/getUserById/{id}")
+ @ApiOperation(value = "根据用户id 获取用户信息", tags = {"管理后台-用户管理"})
+ public R<TUser> getUserById(@PathVariable("id") Integer id) {
+ TUser byId = userService.getById(id);
+ return R.ok(byId);
+ }
+
@PostMapping("/vipInfo")
@ApiOperation(value = "会员中心-获取会员说明、当前登录用户是否为会员、会员购买规格", tags = {"家长端-个人中心"})
public R<List<VipInfoVO>> vipInfo() {
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/AddStudySetDTO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/AddStudySetDTO.java
index 65017f4..a94d388 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/AddStudySetDTO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/AddStudySetDTO.java
@@ -31,5 +31,9 @@
private Integer day;
@ApiModelProperty("类型1听2说3认读4阅读5练习6智能互动问答7智能识别 ")
private Integer type;
+ @ApiModelProperty("本周主题 ")
+ private String title;
+ @ApiModelProperty("所属季度")
+ private Integer quarter;
}
--
Gitblit v1.7.1