From 01dc732d940e81b954685705c32a129473eed951 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 02 七月 2024 10:56:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 353 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 285 insertions(+), 68 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 e5a97a4..98f9320 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
@@ -2,23 +2,30 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.exception.GlobalException;
+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;
import com.ruoyi.study.api.domain.TUser;
import com.ruoyi.study.api.feignClient.StudyClient;
+import com.ruoyi.system.api.model.LoginUserParent;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -27,6 +34,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -73,17 +81,16 @@
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
- List<String> type = goodQuery.getType();
String keywords = goodQuery.getKeywords();
// 初始化条件构造器
QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
- wrapper = keywords != null && "".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
+ wrapper = keywords != null && !"".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
// 类型匹配 todo
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 函数
+ wrapper.apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
}
}
wrapper.eq("isDelete", 0);
@@ -91,25 +98,24 @@
}
@PostMapping("/goodListStudy")
- @ApiOperation(value = "商品列表查询", tags = {"学习端"})
+ @ApiOperation(value = "商品列表查询", tags = {"学习端-商城"})
public R<PageInfo<TGoods>> goodListStudy(@RequestBody GoodQueryDTO goodQuery) {
if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
- List<String> type = goodQuery.getType();
String keywords = goodQuery.getKeywords();
// 初始化条件构造器
QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
- wrapper = keywords != null && "".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
-
+ wrapper = keywords != null && !"".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
// 类型匹配 todo
- if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
- StringBuilder temp = new StringBuilder("");
+ if (goodQuery.getType() != null && !goodQuery.getType().isEmpty()) {
for (String s : goodQuery.getType()) {
- wrapper.or().apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ wrapper.apply("FIND_IN_SET('" + s + "', typeIds)");
}
}
wrapper.eq("isDelete", 0);
+ wrapper.orderByAsc("sort");
return R.ok(goodsService.page(new PageInfo<>(goodQuery.getPageNumber(), goodQuery.getPageSize()), wrapper));
}
@@ -130,6 +136,15 @@
@PostMapping("/deleteGoodsType/{id}")
@ApiOperation(value = "删除", tags = {"后台-商品类型管理"})
public R deleteGoodsType(@PathVariable("id") Integer id) {
+ // 初始化条件构造器
+ QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
+ // 类型匹配 todo
+ wrapper.or().apply("FIND_IN_SET('" + id + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ wrapper.eq("isDelete", 0);
+ List<TGoods> list = goodsService.list(wrapper);
+ if (!list.isEmpty()){
+ return R.fail("当前商品分类被使用,无法删除!");
+ }
TGoodsType byId = goodsTypeService.getById(id);
byId.setIsDelete(1);
goodsTypeService.removeById(byId);
@@ -146,8 +161,12 @@
wrapper.orderByDesc("id");
List<TGoods> list = goodsService.list(wrapper);
for (TGoods tGoods : list) {
- long goodsId = orderService.count(new QueryWrapper<TOrder>().eq("goodsId", tGoods.getId()));
- tGoods.setInventory(goodsId);
+ Long temp = 0L;
+ List<TOrder> list1 = orderService.list(new QueryWrapper<TOrder>().eq("goodsId", tGoods.getId()));
+ for (TOrder tOrder : list1) {
+ temp+=tOrder.getCount();
+ }
+ tGoods.setInventory(temp);
}
PageInfo<TGoods> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
res.setRecords(list);
@@ -157,6 +176,11 @@
@PostMapping("/addGoods")
@ApiOperation(value = "添加", tags = {"后台-商品管理"})
public R addGoods(@RequestBody TGoods dto) {
+ if (dto.getTotal() != null) {
+ dto.setSurplus(dto.getTotal());
+ } else {
+ dto.setSurplus(0);
+ }
goodsService.save(dto);
return R.ok("添加成功");
}
@@ -172,6 +196,11 @@
@PostMapping("/updateGoods")
@ApiOperation(value = "修改", tags = {"后台-商品管理"})
public R updateGoods(@RequestBody TGoods dto) {
+ if (dto.getTotal() != null) {
+ dto.setSurplus(dto.getTotal());
+ } else {
+ dto.setSurplus(0);
+ }
goodsService.updateById(dto);
return R.ok("修改成功");
}
@@ -199,20 +228,53 @@
* 兑换记录
*/
@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<List<TOrder>> exchangeRecordParent() {
+ public R<Page<TOrder>> exchangeRecordParent(Integer pageNumber, Integer pageSize) {
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
- return R.ok(orderService.lambdaQuery().eq(TOrder::getUserId, tokenService.getLoginUser1().getUserid())
- .orderByDesc(TOrder::getCreateTime).list());
+ Page<TOrder> page = orderService.page(new Page<>(pageNumber, pageSize), new QueryWrapper<TOrder>().eq("userId", tokenService.getLoginUser1().getUserid())
+ .orderByDesc("createTime"));
+ List<TOrder> records = page.getRecords();
+ for (TOrder tOrder : records) {
+ TGoods byId = goodsService.getById(tOrder.getGoodsId());
+ tOrder.setName(byId.getName());
+ tOrder.setImg(byId.getCoverImg());
+ StringBuilder stringBuilder = new StringBuilder();
+ if (StringUtils.hasLength(byId.getTypeIds())) {
+ String[] split = byId.getTypeIds().split(",");
+ for (String s : split) {
+ TGoodsType byId1 = goodsTypeService.getById(s);
+ if (byId1 != null) {
+ stringBuilder.append(byId1.getName()).append("|");
+ }
+ }
+ // 去除最后一个字符
+ stringBuilder.deleteCharAt(stringBuilder.length() - 1);
+ tOrder.setType(stringBuilder.toString());
+ }
+ }
+
+ return R.ok(page);
}
/**
@@ -220,6 +282,7 @@
*/
@GetMapping("/confirm")
@ApiOperation(value = "确认收货", tags = {"家长端-兑换记录"})
+ @ApiOperationSupport(order = 16)
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
})
@@ -236,7 +299,8 @@
* 兑换记录
*/
@GetMapping("/confirmStudy")
- @ApiOperation(value = "确认收货", tags = {"学习端-兑换记录"})
+ @ApiOperation(value = "确认收货", tags = {"学习端-商城"})
+ @ApiOperationSupport(order = 29)
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
})
@@ -246,6 +310,7 @@
}
TOrder byId = orderService.getById(id);
byId.setState(3);
+ byId.setCompleteTime(new Date());
return R.ok(orderService.updateById(byId));
}
@@ -254,6 +319,7 @@
*/
@GetMapping("/shopAddressParent")
@ApiOperation(value = "获取用户收货地址", tags = {"家长端-获取用户收货地址"})
+ @ApiOperationSupport(order = 17)
public R<List<Recipient>> shopAddressParent() {
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
@@ -267,6 +333,7 @@
*/
@GetMapping("/setDefault")
@ApiOperation(value = "设置默认地址", tags = {"家长端-设置默认地址"})
+ @ApiOperationSupport(order = 18)
@ApiImplicitParams({
@ApiImplicitParam(value = "地址id", name = "id", dataType = "String", required = true)
})
@@ -277,6 +344,14 @@
Recipient byId = recipientService.getById(id);
byId.setIsDefault(1);
recipientService.updateById(byId);
+ // 如果设置为默认地址 那么要将之前的默认地址取消掉
+ List<Recipient> userId = recipientService.list(new QueryWrapper<Recipient>()
+ .eq("userId", tokenService.getLoginUser1().getUserid())
+ .ne("id", byId.getId()));
+ for (Recipient recipient1 : userId) {
+ recipient1.setIsDefault(0);
+ recipientService.updateById(recipient1);
+ }
return R.ok();
}
@@ -284,17 +359,27 @@
* 设置默认地址
*/
@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) {
- return R.tokenError("登录失效");
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ if (null == userStudy) {
+ return R.tokenError("登录失效!");
}
Recipient byId = recipientService.getById(id);
byId.setIsDefault(1);
recipientService.updateById(byId);
+ // 如果设置为默认地址 那么要将之前的默认地址取消掉
+ List<Recipient> userId = recipientService.list(new QueryWrapper<Recipient>()
+ .eq("userId", userStudy.getUserid())
+ .ne("id", byId.getId()));
+ for (Recipient recipient1 : userId) {
+ recipient1.setIsDefault(0);
+ recipientService.updateById(recipient1);
+ }
return R.ok();
}
@@ -305,7 +390,8 @@
* @return
*/
@GetMapping("/getAddressById")
- @ApiOperation(value = "获取地址详情", tags = {"家长端-获取地址详情"})
+ @ApiOperation(value = "获取地址详情", tags = {"家长端-收货地址"})
+ @ApiOperationSupport(order = 19)
@ApiImplicitParams({
@ApiImplicitParam(value = "地址id", name = "id", dataType = "String", required = true)
})
@@ -324,7 +410,8 @@
* @return
*/
@GetMapping("/getAddressByIdStudy")
- @ApiOperation(value = "获取地址详情", tags = {"学习端-获取地址详情"})
+ @ApiOperation(value = "获取地址详情", tags = {"学习端-收货地址"})
+ @ApiOperationSupport(order = 31)
@ApiImplicitParams({
@ApiImplicitParam(value = "地址id", name = "id", dataType = "String", required = true)
})
@@ -340,7 +427,8 @@
* 获取用户收货地址
*/
@GetMapping("/shopAddress")
- @ApiOperation(value = "获取用户收货地址", tags = {"学习端-获取用户收货地址"})
+ @ApiOperation(value = "获取用户收货地址列表", tags = {"学习端-收货地址"})
+ @ApiOperationSupport(order = 32)
public R<List<Recipient>> shopAddress() {
if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
@@ -353,9 +441,24 @@
* 新增收货地址/修改收货地址
*/
@PostMapping("/addressSaveOrUpdate")
- @ApiOperation(value = "学习端-新增收货地址/修改收货地址", tags = {"学习端-新增收货地址/修改收货地址"})
+ @ApiOperation(value = "新增收货地址/修改收货地址", tags = {"学习端-收货地址"})
+ @ApiOperationSupport(order = 33)
public R<String> addressSave(@RequestBody Recipient recipient) {
- return R.ok(recipientService.addressSaveOrUpdate(recipient));
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ if (null == userStudy) {
+ return R.tokenError("登录失效!");
+ }
+ recipient.setUserId(tokenService.getLoginUserStudy().getUserid());
+ if (recipient.getIsDefault() == 1) {
+ // 如果设置为默认地址 那么要将之前的默认地址取消掉
+ List<Recipient> userId = recipientService.list(new QueryWrapper<Recipient>()
+ .eq("userId", userStudy.getUserid()));
+ for (Recipient recipient1 : userId) {
+ recipient1.setIsDefault(0);
+ recipientService.updateById(recipient1);
+ }
+ }
+ return recipientService.addressSaveOrUpdate(recipient) ? R.ok() : R.fail();
}
/**
@@ -363,12 +466,35 @@
*/
@PostMapping("/addressSaveOrUpdateParent")
@ApiOperation(value = "家长端-新增收货地址/修改收货地址", tags = {"家长端-新增收货地址/修改收货地址"})
+ @ApiOperationSupport(order = 20)
public R<String> addressSaveOrUpdateParent(@RequestBody Recipient recipient) {
+ if (tokenService.getLoginUser1() == null) {
+ return R.tokenError("登录失效!");
+ }
recipient.setUserId(tokenService.getLoginUser1().getUserid());
- if (recipient.getId() == null) {
+ if (recipient.getId() != null) {
+ if (recipient.getIsDefault() == 1) {
+ // 如果设置为默认地址 那么要将之前的默认地址取消掉
+ List<Recipient> userId = recipientService.list(new QueryWrapper<Recipient>()
+ .eq("userId", tokenService.getLoginUser1().getUserid()));
+ for (Recipient recipient1 : userId) {
+ recipient1.setIsDefault(0);
+ recipientService.updateById(recipient1);
+ }
+ }
recipientService.updateById(recipient);
} else {
+ if (recipient.getIsDefault() == 1) {
+ // 如果设置为默认地址 那么要将之前的默认地址取消掉
+ List<Recipient> userId = recipientService.list(new QueryWrapper<Recipient>()
+ .eq("userId", tokenService.getLoginUser1().getUserid()));
+ for (Recipient recipient1 : userId) {
+ recipient1.setIsDefault(0);
+ recipientService.updateById(recipient1);
+ }
+ }
recipientService.save(recipient);
+
}
return R.ok();
}
@@ -377,11 +503,12 @@
* 删除收货地址
*/
@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) ? "删除成功！" : "删除失败！");
}
@@ -390,16 +517,18 @@
*/
@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 String id) {
+ public R<String> addressDeleteParent(@RequestParam Integer id) {
return R.ok(recipientService.removeById(id) ? "删除成功！" : "删除失败！");
}
@GetMapping("/getOrderAddressParent")
@ApiOperation(value = "获取修改订单收货地址", tags = {"家长端-获取修改订单收货地址"})
+ @ApiOperationSupport(order = 22)
public R<List<Recipient>> getOrderAddressParent() {
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
@@ -411,7 +540,8 @@
}
@GetMapping("/getOrderAddress")
- @ApiOperation(value = "获取修改订单收货地址", tags = {"学习端-获取修改订单收货地址"})
+ @ApiOperation(value = "获取修改订单收货地址", tags = {"学习端-收货地址"})
+ @ApiOperationSupport(order = 35)
public R<List<Recipient>> getOrderAddress() {
if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
@@ -433,7 +563,7 @@
}
Recipient userId = recipientService.getById(recipientId);
TOrder byId = orderService.getById(orderId);
- byId.setConsigneeName(userId.getAddress());
+ byId.setConsigneeName(userId.getRecipient());
byId.setConsigneePhone(userId.getRecipientPhone());
byId.setConsigneeAddress(userId.getAddress());
orderService.updateById(byId);
@@ -441,17 +571,28 @@
}
@GetMapping("/updateOrderAddress")
- @ApiOperation(value = "修改订单收货地址", tags = {"学习端-修改订单收货地址"})
+ @ApiOperation(value = "修改订单收货地址", tags = {"学习端-收货地址"})
+ @ApiOperationSupport(order = 36)
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
+ @ApiImplicitParam(value = "地址信息id", name = "recipientId", dataType = "String", required = true)
+ })
public R updateOrderAddress(@RequestParam Integer orderId, @RequestParam Integer recipientId) {
if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
- Recipient userId = recipientService.getById(recipientId);
- TOrder byId = orderService.getById(orderId);
- byId.setConsigneeName(userId.getAddress());
- byId.setConsigneePhone(userId.getRecipientPhone());
- byId.setConsigneeAddress(userId.getAddress());
- orderService.updateById(byId);
+ Recipient recipient = recipientService.getById(recipientId);
+ TOrder order = orderService.getById(orderId);
+ if (null == order) {
+ throw new GlobalException("订单不存在！");
+ }
+ if (!Constants.ONE.equals(order.getState())) {
+ throw new GlobalException("订单已发货，无法修改收货地址！");
+ }
+ order.setConsigneeName(recipient.getAddress());
+ order.setConsigneePhone(recipient.getRecipientPhone());
+ order.setConsigneeAddress(recipient.getAddress());
+ orderService.updateById(order);
return R.ok();
}
@@ -459,7 +600,8 @@
* 收货地址省市区三级联动
*/
@GetMapping("/addressTree")
- @ApiOperation(value = "学习端-收货地址省市区三级联动", tags = {"学习端-收货地址省市区三级联动"})
+ @ApiOperation(value = "收货地址省市区三级联动", tags = {"学习端-商城"})
+ @ApiOperationSupport(order = 37)
public R<List<Region>> addressTree() {
return R.ok(regionService.addressTree());
}
@@ -469,18 +611,24 @@
* 远程调用
*/
@GetMapping("/goodRecommend")
- @ApiOperation(value = "学习端-可兑换商品推荐", tags = {"学习端-可兑换商品推荐"})
+ @ApiOperation(value = "可兑换商品推荐", tags = {"学习端-商城"})
+ @ApiOperationSupport(order = 38)
public R<List<TGoodsVO>> goodRecommend() {
- return R.ok(goodsService.goodRecommend(tokenService.getLoginUserStudy().getUserid()));
+ LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
+ if (null == loginUserStudy) {
+ return R.tokenError("登录失效！");
+ }
+ return R.ok(goodsService.goodRecommend(loginUserStudy.getUserid()));
}
/**
* 获取所有商品分类
*/
@GetMapping("/goodTypeStudy")
- @ApiOperation(value = "学习端-商品分类列表", tags = {"学习端-商品分类列表"})
+ @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());
+ return R.ok(goodsTypeService.lambdaQuery().eq(TGoodsType::getIsDelete, 0).list());
}
/**
@@ -489,18 +637,41 @@
* @param goodId 商品id
*/
@GetMapping("/goodDetail")
- @ApiOperation(value = "学习端-商品详情", tags = {"学习端-商城"})
+ @ApiOperation(value = "商品详情", tags = {"学习端-商城"})
+ @ApiOperationSupport(order = 40)
@ApiImplicitParams({
@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
})
public R<GoodDetailVO> goodDetail(@RequestParam String goodId) {
+ if (tokenService.getLoginUserStudy() == null) {
+ return R.tokenError("登录失效！");
+ }
// 商品详情
TGoods goods = goodsService.lambdaQuery().eq(TGoods::getId, goodId).one();
+ if (null == goods) {
+ throw new GlobalException("获取商品详情失败，商品不存在！");
+ }
// 商品分类详情
List<TGoodsType> goodsTypes = goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.asList(goods.getTypeIds().split(","))).list();
// 已兑换人数
- int number = goods.getBasicCount() + orderService.getGoodBuyNumber(goods.getId());
- return R.ok(new GoodDetailVO(goods, goodsTypes, number));
+ int number = 0;
+ if (null != goods.getBasicCount()) {
+ number += goods.getBasicCount();
+ }
+ number += orderService.getGoodBuyNumber(goods.getId());
+ // 剩余兑换数量
+ Integer residueNumber = null;
+ if (null != goods.getTotal()) {
+ // 计算剩余兑换数量
+ List<TOrder> orderList = orderService.lambdaQuery().eq(TOrder::getGoodsId, goodId)
+ .eq(TOrder::getDisabled, 0).list();
+ Integer item = 0;
+ for (TOrder order : orderList) {
+ item += order.getCount();
+ }
+ residueNumber = goods.getTotal() - item;
+ }
+ return R.ok(new GoodDetailVO(goods, goodsTypes, number, residueNumber));
}
/**
@@ -510,20 +681,40 @@
*/
@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) {
- return R.tokenError("登录失效");
- }
+// if (tokenService.getLoginUser1() == null) {
+// return R.tokenError("登录失效");
+// }
// 商品详情
TGoods goods = goodsService.lambdaQuery().eq(TGoods::getId, goodId).one();
+ if (null == goods) {
+ throw new GlobalException("获取商品详情失败，商品不存在！");
+ }
// 商品分类详情
List<TGoodsType> goodsTypes = goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.asList(goods.getTypeIds().split(","))).list();
// 已兑换人数
- int number = goods.getBasicCount() + orderService.getGoodBuyNumber(goods.getId());
- return R.ok(new GoodDetailVO(goods, goodsTypes, number));
+ int number = 0;
+ if (null != goods.getBasicCount()) {
+ number += goods.getBasicCount();
+ }
+ number += orderService.getGoodBuyNumber(goods.getId());
+ // 剩余兑换数量
+ Integer residueNumber = null;
+ if (null != goods.getTotal()) {
+ // 计算剩余兑换数量
+ List<TOrder> orderList = orderService.lambdaQuery().eq(TOrder::getGoodsId, goodId)
+ .eq(TOrder::getDisabled, 0).list();
+ Integer item = 0;
+ for (TOrder order : orderList) {
+ item += order.getCount();
+ }
+ residueNumber = goods.getTotal() - item;
+ }
+ return R.ok(new GoodDetailVO(goods, goodsTypes, number, residueNumber));
}
/**
@@ -531,6 +722,7 @@
*/
@GetMapping("/redeemNow")
@ApiOperation(value = "商城立即兑换", tags = {"学习端-商城"})
+ @ApiOperationSupport(order = 41)
@ApiImplicitParams({
@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
})
@@ -540,7 +732,8 @@
}
Recipient recipient = recipientService.lambdaQuery()
.eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid())
- .eq(Recipient::getIsDefault, 1).one();
+ .eq(Recipient::getIsDefault, 1)
+ .eq(Recipient::getDisabled, 0).one();
GoodDetailVO goodDetailVO = goodsService.redeemNow(goodId, recipient);
LocalDateTime currentDateTime = LocalDateTime.now();
// 格式化日期和时间信息
@@ -550,10 +743,11 @@
Random random = new Random();
StringBuilder randomPart = new StringBuilder();
for (int i = 0; i < 3; i++) {
- randomPart.append((char) (random.nextInt(26) + 'A')); // 大写字母
+ // 大写字母
+ randomPart.append((char) (random.nextInt(26) + 'A'));
}
// 组合订单编号
- String orderNumber = formattedDateTime + randomPart.toString();
+ String orderNumber = formattedDateTime + randomPart;
goodDetailVO.setOrderNumber(orderNumber);
return R.ok(goodDetailVO);
}
@@ -563,6 +757,7 @@
*/
@GetMapping("/redeemNowParent")
@ApiOperation(value = "商城立即兑换", tags = {"家长端-商城"})
+ @ApiOperationSupport(order = 25)
@ApiImplicitParams({
@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
})
@@ -573,6 +768,15 @@
Recipient recipient = recipientService.lambdaQuery()
.eq(Recipient::getUserId, tokenService.getLoginUser1().getUserid())
.eq(Recipient::getIsDefault, 1).one();
+ if (recipient == null) {
+ // 随便取一条地址数据
+ List<Recipient> list = recipientService.lambdaQuery()
+ .eq(Recipient::getUserId, tokenService.getLoginUser1().getUserid())
+ .list();
+ if (!list.isEmpty()) {
+ recipient = list.get(0);
+ }
+ }
GoodDetailVO goodDetailVO = goodsService.redeemNow(goodId, recipient);
LocalDateTime currentDateTime = LocalDateTime.now();
// 格式化日期和时间信息
@@ -582,10 +786,11 @@
Random random = new Random();
StringBuilder randomPart = new StringBuilder();
for (int i = 0; i < 3; i++) {
- randomPart.append((char) (random.nextInt(26) + 'A')); // 大写字母
+ // 大写字母
+ randomPart.append((char) (random.nextInt(26) + 'A'));
}
// 组合订单编号
- String orderNumber = formattedDateTime + randomPart.toString();
+ String orderNumber = formattedDateTime + randomPart;
goodDetailVO.setOrderNumber(orderNumber);
return R.ok(goodDetailVO);
}
@@ -597,15 +802,18 @@
* @param goodExchange 商品信息
*/
@PostMapping("/goodExchange")
- @ApiOperation(value = "学习端-商品兑换确认", tags = {"家长端-商品兑换确认"})
+ @ApiOperation(value = "家长端-商品兑换确认", tags = {"家长端-商品兑换确认"})
public R goodExchange(@RequestBody GoodExchangeDTO goodExchange) {
- Recipient recipient = recipientService.getById(goodExchange.getRecipientId());
+ System.err.println("家长兑换:");
+ Recipient recipient = recipientService.getById(Integer.valueOf(goodExchange.getRecipientId()));
return goodsService.goodExchange1(goodExchange, recipient);
}
@PostMapping("/goodExchangeStudy")
- @ApiOperation(value = "学习端-商品兑换确认", tags = {"学习端-商品兑换确认"})
- public R goodExchangeStudy(@RequestBody GoodExchangeDTO goodExchange) {
+ @ApiOperation(value = "商品兑换确认", tags = {"学习端-商城"})
+ @ApiOperationSupport(order = 42)
+ public R<String> goodExchangeStudy(@RequestBody @Validated GoodExchangeDTO goodExchange) {
+ System.err.println("学习兑换:");
Recipient recipient = recipientService.getById(goodExchange.getRecipientId());
return goodsService.goodExchange(goodExchange, recipient);
}
@@ -616,20 +824,25 @@
@PostMapping("/getOrderInfo/{id}")
@ApiOperation(value = "查看详情", tags = {"后台-订单管理"})
+ @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);
+ tGoodsVO.setName(byId2.getName());
TUser byId1 = studyClient.getUserById(byId.getUserId()).getData();
tGoodsVO.setUserName(byId1.getName());
tGoodsVO.setPhone(byId1.getPhone());
+ if (byId.getProvince()!=null && byId.getCity() != null){
+ tGoodsVO.setConsigneeAddress(byId.getProvince()+byId.getCity()+tGoodsVO.getConsigneeAddress());
+ }
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);
@@ -642,12 +855,16 @@
@PostMapping("/listAll1")
@ApiOperation(value = "列表查询", tags = {"后台-订单管理"})
+ @ApiOperationSupport(order = 13)
public R<PageInfo<TOrderVO>> listAll1(@RequestBody OrderQuery query) throws ParseException {
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
if (query.getEndTime() != null) {
Date parse = format.parse(query.getStartTime());
Date parse1 = format.parse(query.getEndTime());
+ parse1.setHours(23);
+ parse1.setMinutes(59);
+ parse1.setSeconds(59);
query.setStartTime1(parse);
query.setEndTime1(parse1);
}
--
Gitblit v1.7.1