From f991c73f56f35665bcbe8ce2252c04ea82032b10 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期一, 27 五月 2024 18:06:31 +0800
Subject: [PATCH] feat: 修复登录bug;数据校验规则优化
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 143 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 109 insertions(+), 34 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 b5320aa..76d7e82 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,16 +3,16 @@
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;
@@ -22,7 +22,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;
/**
@@ -164,9 +168,9 @@
* 兑换记录
*/
@GetMapping("/exchangeRecord")
- @ApiOperation(value = "兑换记录", tags = {"兑换记录"})
- public AjaxResult<List<TOrder>> exchangeRecord() {
- return AjaxResult.success(orderService.lambdaQuery().eq(TOrder::getUserId, tokenService.getLoginUserStudy().getUserid())
+ @ApiOperation(value = "学习端-兑换记录", tags = {"学习端-兑换记录"})
+ public R<List<TOrder>> exchangeRecord() {
+ return R.ok(orderService.lambdaQuery().eq(TOrder::getUserId, tokenService.getLoginUserStudy().getUserid())
.orderByDesc(TOrder::getCreateTime).list());
}
@@ -178,10 +182,10 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
})
- public AjaxResult confirm(@RequestParam Integer id) {
+ public R<Boolean> confirm(@RequestParam Integer id) {
TOrder byId = orderService.getById(id);
byId.setState(3);
- return AjaxResult.success(orderService.updateById(byId));
+ return R.ok(orderService.updateById(byId));
}
/**
@@ -189,8 +193,8 @@
*/
@GetMapping("/shopAddress")
@ApiOperation(value = "获取用户收货地址", tags = {"获取用户收货地址"})
- public AjaxResult<List<Recipient>> shopAddress() {
- return AjaxResult.success(recipientService.lambdaQuery().eq(Recipient::getUserId,
+ public R<List<Recipient>> shopAddress() {
+ return R.ok(recipientService.lambdaQuery().eq(Recipient::getUserId,
tokenService.getLoginUserStudy().getUserid()).list());
}
@@ -198,22 +202,22 @@
* 新增收货地址/修改收货地址
*/
@PostMapping("/addressSaveOrUpdate")
- @ApiOperation(value = "新增收货地址/修改收货地址", tags = {"新增收货地址/修改收货地址"})
- public AjaxResult<String> addressSave(@RequestBody Recipient recipient) {
+ @ApiOperation(value = "学习端-新增收货地址/修改收货地址", tags = {"新增收货地址/修改收货地址"})
+ public R<String> addressSave(@RequestBody Recipient recipient) {
recipient.setUserId(tokenService.getLoginUserStudy().getUserid());
- return AjaxResult.success(recipientService.addressSaveOrUpdate(recipient));
+ return R.ok(recipientService.addressSaveOrUpdate(recipient));
}
/**
* 删除收货地址
*/
@GetMapping("/addressDelete")
- @ApiOperation(value = "删除收货地址", tags = {"删除收货地址"})
+ @ApiOperation(value = "学习端-删除收货地址", tags = {"学习端-删除收货地址"})
@ApiImplicitParams({
@ApiImplicitParam(value = "地址信息id", name = "id", dataType = "String", required = true)
})
- public AjaxResult<String> addressDelete(@RequestParam String id) {
- return AjaxResult.success(recipientService.removeById(id) ? "删除成功！" : "删除失败！");
+ public R<String> addressDelete(@RequestParam String id) {
+ return R.ok(recipientService.removeById(id) ? "删除成功！" : "删除失败！");
}
/**
@@ -222,13 +226,14 @@
* @param orderId 订单id
*/
@GetMapping("/updateOrderAddress")
- @ApiOperation(value = "修改订单收货地址", tags = {"修改订单收货地址"})
+ @ApiOperation(value = "学习端-修改订单收货地址", tags = {"学习端-修改订单收货地址"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true),
+ @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
@ApiImplicitParam(value = "完整收货地址", name = "address", dataType = "String", required = true)
})
- public AjaxResult<Boolean> updateOrderAddress(@RequestParam String orderId, @RequestParam String address) {
- return AjaxResult.success(orderService.lambdaUpdate().set(TOrder::getConsigneeAddress, address)
+ public R<Boolean> updateOrderAddress(@RequestParam String orderId,
+ @RequestParam String address) {
+ return R.ok(orderService.lambdaUpdate().set(TOrder::getConsigneeAddress, address)
.eq(TOrder::getId, orderId).eq(TOrder::getState, 1).update());
}
@@ -236,9 +241,9 @@
* 收货地址省市区三级联动
*/
@GetMapping("/addressTree")
- @ApiOperation(value = "收货地址省市区三级联动", tags = {"收货地址省市区三级联动"})
- public AjaxResult<List<Region>> addressTree() {
- return AjaxResult.success(regionService.addressTree());
+ @ApiOperation(value = "学习端-收货地址省市区三级联动", tags = {"学习端-收货地址省市区三级联动"})
+ public R<List<Region>> addressTree() {
+ return R.ok(regionService.addressTree());
}
/**
@@ -246,7 +251,7 @@
* 远程调用
*/
@GetMapping("/goodRecommend")
- @ApiOperation(value = "可兑换商品推荐", tags = {"可兑换商品推荐"})
+ @ApiOperation(value = "学习端-可兑换商品推荐", tags = {"学习端-可兑换商品推荐"})
public R<List<TGoodsVO>> goodRecommend() {
return R.ok(goodsService.goodRecommend(tokenService.getLoginUserStudy().getUserid()));
}
@@ -257,34 +262,35 @@
* @param goodId 商品id
*/
@GetMapping("/goodDetail")
- @ApiOperation(value = "商品详情", tags = {"商品详情"})
+ @ApiOperation(value = "学习端-商品详情", tags = {"学习端-商品详情"})
@ApiImplicitParams({
@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
})
- public AjaxResult<GoodDetailVO> goodDetail(@RequestParam String goodId) {
+ public R<GoodDetailVO> goodDetail(@RequestParam String goodId) {
// 商品详情
TGoods goods = goodsService.lambdaQuery().eq(TGoods::getId, goodId).one();
// 商品分类详情
List<TGoodsType> goodsTypes = goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.asList(goods.getTypeIds().split(","))).list();
// 已兑换人数
int number = goods.getBasicCount() + orderService.getGoodBuyNumber(goods.getId());
- return AjaxResult.success(new GoodDetailVO(goods, goodsTypes, number));
+ return R.ok(new GoodDetailVO(goods, goodsTypes, number));
}
/**
* 商城-立即兑换
*/
@GetMapping("/redeemNow")
- @ApiOperation(value = "商城-立即兑换", tags = {"立即兑换"})
+ @ApiOperation(value = "学习端-商城立即兑换", tags = {"学习端-商城立即兑换"})
@ApiImplicitParams({
@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
})
- public AjaxResult<GoodDetailVO> redeemNow(@RequestParam String goodId) {
+ public R<GoodDetailVO> redeemNow(@RequestParam String goodId) {
Recipient recipient = recipientService.lambdaQuery()
.eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid())
.eq(Recipient::getIsDefault, 1).one();
- return AjaxResult.success(goodsService.redeemNow(goodId, recipient));
+ return R.ok(goodsService.redeemNow(goodId, recipient));
}
+
/**
* 商品兑换
@@ -292,11 +298,80 @@
* @param goodExchange 商品信息
*/
@PostMapping("/goodExchange")
- @ApiOperation(value = "商品兑换-确认", tags = {"商品兑换-确认"})
- public AjaxResult<Object> goodExchange(@RequestBody GoodExchangeDTO goodExchange) {
+ @ApiOperation(value = "学习端-商品兑换确认", tags = {"学习端-商品兑换确认"})
+ public R<Boolean> goodExchange(@RequestBody GoodExchangeDTO goodExchange) {
Recipient recipient = recipientService.getById(goodExchange.getRecipientId());
- return AjaxResult.success(goodsService.goodExchange(goodExchange, recipient));
+ 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);
+ }
}
--
Gitblit v1.7.1