java/DolphinEnglish.git

			@@ -2,12 +2,15 @@


			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.utils.bean.BeanUtils;
			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.*;
			import com.ruoyi.goods.service.*;
			import com.ruoyi.goods.vo.ExchangeRecordVO;
			import com.ruoyi.goods.vo.GoodDetailVO;
			import com.ruoyi.goods.vo.TGoodsVO;
			import com.ruoyi.goods.vo.TOrderVO;
			@@ -16,7 +19,7 @@
			import io.swagger.annotations.ApiImplicitParam;
			import io.swagger.annotations.ApiImplicitParams;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.beans.BeanUtils;
			import io.swagger.annotations.ApiOperationSupport;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.util.StringUtils;
			import org.springframework.web.bind.annotation.*;
			@@ -27,6 +30,7 @@
			import java.time.LocalDateTime;
			import java.time.format.DateTimeFormatter;
			import java.util.*;
			import java.util.stream.Collectors;

			/**
			* <p>
			@@ -200,7 +204,6 @@
			*/
			@GetMapping("/exchangeRecord")
			@ApiOperation(value = "学习端-兑换记录", tags = {"学习端-商城"})
			@ApiOperationSupport(order = 28)
			public R<List<ExchangeRecordVO>> exchangeRecord() {
			List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(tokenService.getLoginUserStudy().getUserid());
			for (ExchangeRecordVO record : exchangeRecord) {
			@@ -220,7 +223,7 @@

			@GetMapping("/exchangeRecordParent")
			@ApiOperation(value = "家长端-兑换记录", tags = {"家长端-兑换记录"})
			public R<Page<TOrder>> exchangeRecordParent(Integer pageNumber,Integer pageSize) {
			public R<Page<TOrder>> exchangeRecordParent(Integer pageNumber, Integer pageSize) {
			if (tokenService.getLoginUser1() == null){
			return R.tokenError("登录失效");
			}