From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 187 +++++++++++++++++++++++++++++++---------------
1 files changed, 125 insertions(+), 62 deletions(-)
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 4f7024a..d74fd34 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
@@ -1,17 +1,16 @@
package com.ruoyi.goods.controller;
-import com.alibaba.fastjson2.util.UUIDUtils;
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.utils.MyQrCodeUtil;
-import com.ruoyi.goods.utils.QRCodeUtil;
+import com.ruoyi.goods.vo.ExchangeRecordVO;
import com.ruoyi.goods.vo.GoodDetailVO;
import com.ruoyi.goods.vo.TGoodsVO;
import com.ruoyi.goods.vo.TOrderVO;
@@ -20,20 +19,18 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.logging.log4j.core.util.UuidUtil;
-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.*;
-import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.awt.image.BufferedImage;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -77,7 +74,7 @@
@PostMapping("/goodList")
@ApiOperation(value = "商品列表查询", tags = {"家长端-商品列表"})
public R<PageInfo<TGoods>> listType(@RequestBody GoodQueryDTO goodQuery) {
- if (tokenService.getLoginUser1() == null){
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
List<String> type = goodQuery.getType();
@@ -87,7 +84,7 @@
wrapper = keywords != null && "".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
// 类型匹配 todo
- if (goodQuery.getType()!=null && goodQuery.getType().size()>0){
+ if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
StringBuilder temp = new StringBuilder("");
for (String s : goodQuery.getType()) {
wrapper.or().apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
@@ -96,10 +93,11 @@
wrapper.eq("isDelete", 0);
return R.ok(goodsService.page(new PageInfo<>(goodQuery.getPageNumber(), goodQuery.getPageSize()), wrapper));
}
+
@PostMapping("/goodListStudy")
@ApiOperation(value = "商品列表查询", tags = {"学习端"})
public R<PageInfo<TGoods>> goodListStudy(@RequestBody GoodQueryDTO goodQuery) {
- if (tokenService.getLoginUserStudy() == null){
+ if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
List<String> type = goodQuery.getType();
@@ -109,7 +107,7 @@
wrapper = keywords != null && "".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
// 类型匹配 todo
- if (goodQuery.getType()!=null && goodQuery.getType().size()>0){
+ if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
StringBuilder temp = new StringBuilder("");
for (String s : goodQuery.getType()) {
wrapper.or().apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
@@ -163,7 +161,6 @@
@PostMapping("/addGoods")
@ApiOperation(value = "添加", tags = {"后台-商品管理"})
public R addGoods(@RequestBody TGoods dto) {
- dto.setSurplus(dto.getTotal());
goodsService.save(dto);
return R.ok("添加成功");
}
@@ -206,14 +203,27 @@
* 兑换记录
*/
@GetMapping("/exchangeRecord")
- @ApiOperation(value = "学习端-兑换记录", tags = {"学习端-兑换记录"})
- public R<List<TOrder>> exchangeRecord() {
- return R.ok(orderService.lambdaQuery().eq(TOrder::getUserId, tokenService.getLoginUserStudy().getUserid())
- .orderByDesc(TOrder::getCreateTime).list());
+ @ApiOperation(value = "学习端-兑换记录", tags = {"学习端-商城"})
+ public R<List<ExchangeRecordVO>> exchangeRecord() {
+ List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(tokenService.getLoginUserStudy().getUserid());
+ for (ExchangeRecordVO record : exchangeRecord) {
+ TGoods goods = goodsService.getById(record.getGoodsId());
+ List<String> typeList;
+ if (null != goods) {
+ List<TGoodsType> goodsTypes = goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.stream(goods.getTypeIds().split(",")).collect(Collectors.toList()))
+ .eq(TGoodsType::getIsDelete, 0).list();
+ typeList = goodsTypes.stream().map(TGoodsType::getName).collect(Collectors.toList());
+ } else {
+ typeList = new ArrayList<>();
+ }
+ record.setGoodsType(typeList);
+ }
+ return R.ok(exchangeRecord);
}
+
@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("登录失效");
}
@@ -245,27 +255,30 @@
*/
@GetMapping("/confirm")
@ApiOperation(value = "确认收货", tags = {"家长端-兑换记录"})
+ @ApiOperationSupport(order = 16)
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
})
public R<Boolean> confirm(@RequestParam Integer id) {
- if (tokenService.getLoginUser1() == null){
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
TOrder byId = orderService.getById(id);
byId.setState(3);
return R.ok(orderService.updateById(byId));
}
+
/**
* 兑换记录
*/
@GetMapping("/confirmStudy")
- @ApiOperation(value = "确认收货", tags = {"学习端-兑换记录"})
+ @ApiOperation(value = "确认收货", tags = {"学习端-商城"})
+ @ApiOperationSupport(order = 29)
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
})
public R<Boolean> confirmStudy(@RequestParam Integer id) {
- if (tokenService.getLoginUserStudy() == null){
+ if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
TOrder byId = orderService.getById(id);
@@ -278,23 +291,26 @@
*/
@GetMapping("/shopAddressParent")
@ApiOperation(value = "获取用户收货地址", tags = {"家长端-获取用户收货地址"})
+ @ApiOperationSupport(order = 17)
public R<List<Recipient>> shopAddressParent() {
- if (tokenService.getLoginUser1() == null){
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
return R.ok(recipientService.lambdaQuery().eq(Recipient::getUserId,
tokenService.getLoginUser1().getUserid()).list());
}
+
/**
* 设置默认地址
*/
@GetMapping("/setDefault")
@ApiOperation(value = "设置默认地址", tags = {"家长端-设置默认地址"})
+ @ApiOperationSupport(order = 18)
@ApiImplicitParams({
@ApiImplicitParam(value = "地址id", name = "id", dataType = "String", required = true)
})
public R setDefault(@RequestParam Integer id) {
- if (tokenService.getLoginUser1() == null){
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
Recipient byId = recipientService.getById(id);
@@ -310,16 +326,18 @@
}
return R.ok();
}
+
/**
* 设置默认地址
*/
@GetMapping("/setDefaultStudy")
- @ApiOperation(value = "设置默认地址", tags = {"学习端-设置默认地址"})
+ @ApiOperation(value = "设置默认地址", tags = {"学习端-收货地址"})
+ @ApiOperationSupport(order = 30)
@ApiImplicitParams({
@ApiImplicitParam(value = "地址id", name = "id", dataType = "String", required = true)
})
public R setDefaultStudy(@RequestParam Integer id) {
- if (tokenService.getLoginUserStudy() == null){
+ if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
Recipient byId = recipientService.getById(id);
@@ -338,45 +356,52 @@
/**
* 根据地址id 获取详情
+ *
* @param id
* @return
*/
@GetMapping("/getAddressById")
- @ApiOperation(value = "获取地址详情", tags = {"家长端-获取地址详情"})
+ @ApiOperation(value = "获取地址详情", tags = {"家长端-收货地址"})
+ @ApiOperationSupport(order = 19)
@ApiImplicitParams({
@ApiImplicitParam(value = "地址id", name = "id", dataType = "String", required = true)
})
public R<Recipient> getAddressById(@RequestParam Integer id) {
- if (tokenService.getLoginUser1() == null){
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
Recipient byId = recipientService.getById(id);
return R.ok(byId);
}
+
/**
* 根据地址id 获取详情
+ *
* @param id
* @return
*/
@GetMapping("/getAddressByIdStudy")
- @ApiOperation(value = "获取地址详情", tags = {"学习端-获取地址详情"})
+ @ApiOperation(value = "获取地址详情", tags = {"学习端-收货地址"})
+ @ApiOperationSupport(order = 31)
@ApiImplicitParams({
@ApiImplicitParam(value = "地址id", name = "id", dataType = "String", required = true)
})
public R<Recipient> getAddressByIdStudy(@RequestParam Integer id) {
- if (tokenService.getLoginUserStudy() == null){
+ if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
Recipient byId = recipientService.getById(id);
return R.ok(byId);
}
+
/**
* 获取用户收货地址
*/
@GetMapping("/shopAddress")
- @ApiOperation(value = "获取用户收货地址", tags = {"学习端-获取用户收货地址"})
+ @ApiOperation(value = "获取用户收货地址列表", tags = {"学习端-收货地址"})
+ @ApiOperationSupport(order = 32)
public R<List<Recipient>> shopAddress() {
- if (tokenService.getLoginUserStudy() == null){
+ if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
return R.ok(recipientService.lambdaQuery().eq(Recipient::getUserId,
@@ -387,7 +412,8 @@
* 新增收货地址/修改收货地址
*/
@PostMapping("/addressSaveOrUpdate")
- @ApiOperation(value = "学习端-新增收货地址/修改收货地址", tags = {"学习端-新增收货地址/修改收货地址"})
+ @ApiOperation(value = "新增收货地址/修改收货地址", tags = {"学习端-收货地址"})
+ @ApiOperationSupport(order = 33)
public R<String> addressSave(@RequestBody Recipient recipient) {
recipient.setUserId(tokenService.getLoginUserStudy().getUserid());
if (recipient.getIsDefault() == 1){
@@ -402,11 +428,13 @@
recipientService.addressSaveOrUpdate(recipient);
return R.ok();
}
+
/**
* 新增收货地址/修改收货地址
*/
@PostMapping("/addressSaveOrUpdateParent")
@ApiOperation(value = "家长端-新增收货地址/修改收货地址", tags = {"家长端-新增收货地址/修改收货地址"})
+ @ApiOperationSupport(order = 20)
public R<String> addressSaveOrUpdateParent(@RequestBody Recipient recipient) {
if (tokenService.getLoginUser1() == null){
return R.tokenError("登录失效!");
@@ -443,20 +471,23 @@
* 删除收货地址
*/
@GetMapping("/addressDelete")
- @ApiOperation(value = "学习端-删除收货地址", tags = {"学习端-删除收货地址"})
+ @ApiOperation(value = "删除收货地址", tags = {"学习端-收货地址"})
+ @ApiOperationSupport(order = 34)
@ApiImplicitParams({
- @ApiImplicitParam(value = "地址信息id", name = "id", dataType = "String", required = true)
+ @ApiImplicitParam(value = "地址信息id", name = "id", dataType = "Integer", required = true)
})
- public R<String> addressDelete(@RequestParam String id) {
+ public R<String> addressDelete(@RequestParam Integer id) {
return R.ok(recipientService.removeById(id) ? "删除成功！" : "删除失败！");
}
+
/**
* 删除收货地址
*/
@GetMapping("/addressDeleteParent")
@ApiOperation(value = "家长端-删除收货地址", tags = {"家长端-删除收货地址"})
+ @ApiOperationSupport(order = 21)
@ApiImplicitParams({
- @ApiImplicitParam(value = "地址信息id", name = "id", dataType = "String", required = true)
+ @ApiImplicitParam(value = "地址信息id", name = "id", dataType = "Integer", required = true)
})
public R<String> addressDeleteParent(@RequestParam Integer id) {
return R.ok(recipientService.removeById(id) ? "删除成功！" : "删除失败！");
@@ -465,8 +496,9 @@
@GetMapping("/getOrderAddressParent")
@ApiOperation(value = "获取修改订单收货地址", tags = {"家长端-获取修改订单收货地址"})
+ @ApiOperationSupport(order = 22)
public R<List<Recipient>> getOrderAddressParent() {
- if (tokenService.getLoginUser1() == null){
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
List<Recipient> userId = recipientService.list(new QueryWrapper<Recipient>()
@@ -474,24 +506,27 @@
return R.ok(userId);
}
+
@GetMapping("/getOrderAddress")
- @ApiOperation(value = "获取修改订单收货地址", tags = {"学习端-获取修改订单收货地址"})
+ @ApiOperation(value = "获取修改订单收货地址", tags = {"学习端-收货地址"})
+ @ApiOperationSupport(order = 35)
public R<List<Recipient>> getOrderAddress() {
- if (tokenService.getLoginUserStudy() == null){
+ if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
List<Recipient> userId = recipientService.list(new QueryWrapper<Recipient>()
.eq("userId", tokenService.getLoginUserStudy().getUserid()));
return R.ok(userId);
}
+
@GetMapping("/updateOrderAddressParent")
@ApiOperation(value = "修改订单收货地址", tags = {"家长端-修改订单收货地址"})
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
@ApiImplicitParam(value = "地址信息id", name = "recipientId", dataType = "String", required = true)
})
- public R updateOrderAddressParent(@RequestParam Integer orderId,@RequestParam Integer recipientId) {
- if (tokenService.getLoginUser1() == null){
+ public R updateOrderAddressParent(@RequestParam Integer orderId, @RequestParam Integer recipientId) {
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
Recipient userId = recipientService.getById(recipientId);
@@ -502,10 +537,12 @@
orderService.updateById(byId);
return R.ok("修改成功");
}
+
@GetMapping("/updateOrderAddress")
- @ApiOperation(value = "修改订单收货地址", tags = {"学习端-修改订单收货地址"})
- public R updateOrderAddress(@RequestParam Integer orderId,@RequestParam Integer recipientId) {
- if (tokenService.getLoginUserStudy() == null){
+ @ApiOperation(value = "修改订单收货地址", tags = {"学习端-收货地址"})
+ @ApiOperationSupport(order = 36)
+ public R updateOrderAddress(@RequestParam Integer orderId, @RequestParam Integer recipientId) {
+ if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
Recipient userId = recipientService.getById(recipientId);
@@ -521,7 +558,8 @@
* 收货地址省市区三级联动
*/
@GetMapping("/addressTree")
- @ApiOperation(value = "学习端-收货地址省市区三级联动", tags = {"学习端-收货地址省市区三级联动"})
+ @ApiOperation(value = "收货地址省市区三级联动", tags = {"学习端-商城"})
+ @ApiOperationSupport(order = 37)
public R<List<Region>> addressTree() {
return R.ok(regionService.addressTree());
}
@@ -531,9 +569,20 @@
* 远程调用
*/
@GetMapping("/goodRecommend")
- @ApiOperation(value = "学习端-可兑换商品推荐", tags = {"学习端-可兑换商品推荐"})
+ @ApiOperation(value = "可兑换商品推荐", tags = {"学习端-商城"})
+ @ApiOperationSupport(order = 38)
public R<List<TGoodsVO>> goodRecommend() {
return R.ok(goodsService.goodRecommend(tokenService.getLoginUserStudy().getUserid()));
+ }
+
+ /**
+ * 获取所有商品分类
+ */
+ @GetMapping("/goodTypeStudy")
+ @ApiOperation(value = "商品分类列表", tags = {"学习端-商城"})
+ @ApiOperationSupport(order = 39)
+ public R<List<TGoodsType>> goodTypeStudy() {
+ return R.ok(goodsTypeService.lambdaQuery().eq(TGoodsType::getIsDelete, 0).eq(TGoodsType::getIsDelete, 0).list());
}
/**
@@ -542,7 +591,8 @@
* @param goodId 商品id
*/
@GetMapping("/goodDetail")
- @ApiOperation(value = "学习端-商品详情", tags = {"学习端-商城"})
+ @ApiOperation(value = "商品详情", tags = {"学习端-商城"})
+ @ApiOperationSupport(order = 40)
@ApiImplicitParams({
@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
})
@@ -555,6 +605,7 @@
int number = goods.getBasicCount() + orderService.getGoodBuyNumber(goods.getId());
return R.ok(new GoodDetailVO(goods, goodsTypes, number));
}
+
/**
* 商品详情
*
@@ -562,11 +613,12 @@
*/
@GetMapping("/goodDetailParent")
@ApiOperation(value = "商品详情", tags = {"家长端-商城"})
+ @ApiOperationSupport(order = 24)
@ApiImplicitParams({
@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
})
public R<GoodDetailVO> goodDetailParent(@RequestParam String goodId) {
- if (tokenService.getLoginUser1() == null){
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
// 商品详情
@@ -583,11 +635,12 @@
*/
@GetMapping("/redeemNow")
@ApiOperation(value = "商城立即兑换", tags = {"学习端-商城"})
+ @ApiOperationSupport(order = 41)
@ApiImplicitParams({
@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
})
public R<GoodDetailVO> redeemNow(@RequestParam String goodId) {
- if (tokenService.getLoginUserStudy() == null){
+ if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
Recipient recipient = recipientService.lambdaQuery()
@@ -609,16 +662,18 @@
goodDetailVO.setOrderNumber(orderNumber);
return R.ok(goodDetailVO);
}
+
/**
* 商城-立即兑换
*/
@GetMapping("/redeemNowParent")
@ApiOperation(value = "商城立即兑换", tags = {"家长端-商城"})
+ @ApiOperationSupport(order = 25)
@ApiImplicitParams({
@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
})
public R<GoodDetailVO> redeemNowParent(@RequestParam String goodId) {
- if (tokenService.getLoginUser1() == null){
+ if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
Recipient recipient = recipientService.lambdaQuery()
@@ -662,8 +717,10 @@
Recipient recipient = recipientService.getById(Integer.valueOf(goodExchange.getRecipientId()));
return goodsService.goodExchange1(goodExchange, recipient);
}
+
@PostMapping("/goodExchangeStudy")
- @ApiOperation(value = "学习端-商品兑换确认", tags = {"学习端-商品兑换确认"})
+ @ApiOperation(value = "商品兑换确认", tags = {"学习端-商城"})
+ @ApiOperationSupport(order = 42)
public R goodExchangeStudy(@RequestBody GoodExchangeDTO goodExchange) {
Recipient recipient = recipientService.getById(goodExchange.getRecipientId());
return goodsService.goodExchange(goodExchange, recipient);
@@ -672,21 +729,25 @@
@Autowired
private StudyClient studyClient;
+
@PostMapping("/getOrderInfo/{id}")
@ApiOperation(value = "查看详情", tags = {"后台-订单管理"})
- public R<TOrderVO> getOrderInfo(@PathVariable("id")Integer id) {
+ @ApiOperationSupport(order = 11)
+ 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);
+ 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 = {"后台-订单管理"})
+ @ApiOperationSupport(order = 12)
public R getGoodsInfo1(@RequestBody OrderDTO dto) {
TOrder byId = orderService.getById(dto.getId());
byId.setState(2);
@@ -696,12 +757,14 @@
orderService.updateById(byId);
return R.ok("修改成功");
}
+
@PostMapping("/listAll1")
@ApiOperation(value = "列表查询", tags = {"后台-订单管理"})
- public R<PageInfo<TOrderVO>> listAll1(@RequestBody OrderQuery query) throws ParseException {
+ @ApiOperationSupport(order = 13)
+ public R<PageInfo<TOrderVO>> listAll1(@RequestBody OrderQuery query) throws ParseException {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- if (query.getEndTime()!=null){
+ if (query.getEndTime() != null) {
Date parse = format.parse(query.getStartTime());
Date parse1 = format.parse(query.getEndTime());
query.setStartTime1(parse);
@@ -711,25 +774,25 @@
List<TOrderVO> list1 = new ArrayList<>();
for (TOrderVO tOrderVO : list) {
TUser data = studyClient.getUserById(tOrderVO.getUserId()).getData();
- if (data!=null){
+ if (data != null) {
tOrderVO.setUserName(data.getName());
tOrderVO.setPhone(data.getPhone());
}
- if (!StringUtils.hasLength(query.getPhone()) && !StringUtils.hasLength(query.getUserName())){
+ 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())){
+ 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())){
+ } 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())){
+ } else if (StringUtils.hasLength(query.getUserName())) {
+ if (tOrderVO.getUserName().contains(query.getUserName())) {
list1.add(tOrderVO);
}
}
--
Gitblit v1.7.1