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-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 284 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 266 insertions(+), 18 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 22f61dc..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,21 +3,31 @@
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.goods.domain.TGoods;
-import com.ruoyi.goods.domain.TGoodsType;
-import com.ruoyi.goods.domain.TOrder;
-import com.ruoyi.goods.dto.GoodsTypeQuery;
-import com.ruoyi.goods.service.ITGoodsService;
-import com.ruoyi.goods.service.ITGoodsTypeService;
-import com.ruoyi.goods.service.ITOrderService;
+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.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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
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;
/**
@@ -31,17 +41,24 @@
@RestController
@RequestMapping("/base/goods")
public class TGoodsController {
- @Autowired
+ @Resource
private ITGoodsService goodsService;
@Autowired
private ITGoodsTypeService goodsTypeService;
@Autowired
private ITOrderService orderService;
+ @Resource
+ private IRecipientService recipientService;
+ @Resource
+ private IRegionService regionService;
+ @Resource
+ private TokenService tokenService;
+
@PostMapping("/listType")
@ApiOperation(value = "列表查询", tags = {"后台-商品类型管理"})
- public R<PageInfo<TGoodsType>> listType(@RequestBody GoodsTypeQuery query){
+ public R<PageInfo<TGoodsType>> listType(@RequestBody GoodsTypeQuery query) {
QueryWrapper<TGoodsType> wrapper = new QueryWrapper<>();
- if (StringUtils.hasLength(query.getName())){
+ if (StringUtils.hasLength(query.getName())) {
wrapper.like("name", query.getName());
}
// wrapper.ne("isDelete",1);
@@ -51,32 +68,49 @@
res.setRecords(list);
return R.ok(res);
}
+
+ @PostMapping("/goodList")
+ @ApiOperation(value = "商品列表查询", tags = {"学习端-商品列表"})
+ public R<PageInfo<TGoods>> listType(@RequestBody GoodQueryDTO goodQuery) {
+ 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;
+ // 类型匹配 todo
+ wrapper = type.isEmpty() ? wrapper : wrapper.in("");
+ wrapper.eq("isDelete", 0);
+ return R.ok(goodsService.page(new PageInfo<>(goodQuery.getPageNumber(), goodQuery.getPageSize()), wrapper));
+ }
+
@PostMapping("/addGoodsType")
@ApiOperation(value = "添加", tags = {"后台-商品类型管理"})
public R addGoodsType(@RequestBody TGoodsType dto) {
goodsTypeService.save(dto);
return R.ok("添加成功");
}
+
@PostMapping("/updateGoodsType")
@ApiOperation(value = "修改", tags = {"后台-商品类型管理"})
public R updateGoodsType(@RequestBody TGoodsType dto) {
goodsTypeService.updateById(dto);
return R.ok("修改成功");
}
+
@PostMapping("/deleteGoodsType/{id}")
@ApiOperation(value = "删除", tags = {"后台-商品类型管理"})
- public R deleteGoodsType(@PathVariable("id")Integer id) {
+ public R deleteGoodsType(@PathVariable("id") Integer id) {
TGoodsType byId = goodsTypeService.getById(id);
byId.setIsDelete(1);
goodsTypeService.removeById(byId);
return R.ok("删除成功");
}
- @GetMapping("/listAll")
- @ApiOperation(value = "列表查询", tags = {"后台-商品管理"})
- public R<PageInfo<TGoods>> listAll(@RequestBody GoodsTypeQuery query){
+ @PostMapping("/listAll")
+ @ApiOperation(value = "列表查询", tags = {"后台-商品管理"})
+ public R<PageInfo<TGoods>> listAll(@RequestBody GoodsTypeQuery query) {
QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
- if (StringUtils.hasLength(query.getName())){
+ if (StringUtils.hasLength(query.getName())) {
wrapper.like("name", query.getName());
}
wrapper.orderByDesc("id");
@@ -89,12 +123,14 @@
res.setRecords(list);
return R.ok(res);
}
+
@PostMapping("/addGoods")
@ApiOperation(value = "添加", tags = {"后台-商品管理"})
public R addGoods(@RequestBody TGoods dto) {
goodsService.save(dto);
return R.ok("添加成功");
}
+
@PostMapping("/deleteGoods/{id}")
@ApiOperation(value = "删除", tags = {"后台-商品管理"})
public R deleteGoods(@PathVariable("id") Integer id) {
@@ -102,29 +138,241 @@
goodsService.removeById(byId);
return R.ok("删除成功");
}
+
@PostMapping("/updateGoods")
@ApiOperation(value = "修改", tags = {"后台-商品管理"})
public R updateGoods(@RequestBody TGoods dto) {
goodsService.updateById(dto);
return R.ok("修改成功");
}
+
@PostMapping("/getGoodsInfo/{id}")
@ApiOperation(value = "查看详情", tags = {"后台-商品管理"})
public R<TGoodsVO> getGoodsInfo(@PathVariable("id") Integer id) {
TGoodsVO tGoodsVO = new TGoodsVO();
TGoods byId = goodsService.getById(id);
- BeanUtils.copyProperties(byId,tGoodsVO);
+ BeanUtils.copyProperties(byId, tGoodsVO);
long goodsId = orderService.count(new QueryWrapper<TOrder>().eq("goodsId", id));
tGoodsVO.setInventory(goodsId);
+ tGoodsVO.setIntegral(byId.getIntegral());
return R.ok(tGoodsVO);
}
+
@PostMapping("/getGoodsTypeList")
@ApiOperation(value = "获取商品类型列表", tags = {"后台-商品管理"})
public R<List<TGoodsType>> getGoodsInfo() {
- List<TGoodsType> res = goodsTypeService.list(new QueryWrapper<TGoodsType>()
- .ne("isDelete", 1));
+ List<TGoodsType> res = goodsTypeService.list(new QueryWrapper<>());
return R.ok(res);
}
+ /**
+ * 兑换记录
+ */
+ @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());
+ }
+
+ /**
+ * 兑换记录
+ */
+ @GetMapping("/confirm")
+ @ApiOperation(value = "确认收货", tags = {"兑换记录"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
+ })
+ public R<Boolean> confirm(@RequestParam Integer id) {
+ TOrder byId = orderService.getById(id);
+ byId.setState(3);
+ return R.ok(orderService.updateById(byId));
+ }
+
+ /**
+ * 获取用户收货地址
+ */
+ @GetMapping("/shopAddress")
+ @ApiOperation(value = "获取用户收货地址", tags = {"获取用户收货地址"})
+ public R<List<Recipient>> shopAddress() {
+ return R.ok(recipientService.lambdaQuery().eq(Recipient::getUserId,
+ tokenService.getLoginUserStudy().getUserid()).list());
+ }
+
+ /**
+ * 新增收货地址/修改收货地址
+ */
+ @PostMapping("/addressSaveOrUpdate")
+ @ApiOperation(value = "新增收货地址/修改收货地址", tags = {"新增收货地址/修改收货地址"})
+ public R<String> addressSave(@RequestBody Recipient recipient) {
+ recipient.setUserId(tokenService.getLoginUserStudy().getUserid());
+ return R.ok(recipientService.addressSaveOrUpdate(recipient));
+ }
+
+ /**
+ * 删除收货地址
+ */
+ @GetMapping("/addressDelete")
+ @ApiOperation(value = "删除收货地址", tags = {"删除收货地址"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "地址信息id", name = "id", dataType = "String", required = true)
+ })
+ public R<String> addressDelete(@RequestParam String id) {
+ return R.ok(recipientService.removeById(id) ? "删除成功！" : "删除失败！");
+ }
+
+ /**
+ * 修改订单收货地址
+ *
+ * @param orderId 订单id
+ */
+ @GetMapping("/updateOrderAddress")
+ @ApiOperation(value = "修改订单收货地址", tags = {"修改订单收货地址"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
+ @ApiImplicitParam(value = "完整收货地址", name = "address", dataType = "String", required = true)
+ })
+ 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());
+ }
+
+ /**
+ * 收货地址省市区三级联动
+ */
+ @GetMapping("/addressTree")
+ @ApiOperation(value = "收货地址省市区三级联动", tags = {"收货地址省市区三级联动"})
+ public R<List<Region>> addressTree() {
+ return R.ok(regionService.addressTree());
+ }
+
+ /**
+ * 可兑换商品推荐
+ * 远程调用
+ */
+ @GetMapping("/goodRecommend")
+ @ApiOperation(value = "可兑换商品推荐", tags = {"可兑换商品推荐"})
+ public R<List<TGoodsVO>> goodRecommend() {
+ return R.ok(goodsService.goodRecommend(tokenService.getLoginUserStudy().getUserid()));
+ }
+
+ /**
+ * 商品详情
+ *
+ * @param goodId 商品id
+ */
+ @GetMapping("/goodDetail")
+ @ApiOperation(value = "商品详情", tags = {"商品详情"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
+ })
+ 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 R.ok(new GoodDetailVO(goods, goodsTypes, number));
+ }
+
+ /**
+ * 商城-立即兑换
+ */
+ @GetMapping("/redeemNow")
+ @ApiOperation(value = "商城-立即兑换", tags = {"立即兑换"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
+ })
+ public R<GoodDetailVO> redeemNow(@RequestParam String goodId) {
+ Recipient recipient = recipientService.lambdaQuery()
+ .eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid())
+ .eq(Recipient::getIsDefault, 1).one();
+ return R.ok(goodsService.redeemNow(goodId, recipient));
+ }
+
+
+ /**
+ * 商品兑换
+ *
+ * @param goodExchange 商品信息
+ */
+ @PostMapping("/goodExchange")
+ @ApiOperation(value = "商品兑换-确认", tags = {"商品兑换-确认"})
+ public R<Boolean> goodExchange(@RequestBody GoodExchangeDTO goodExchange) {
+ 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);
+ }
}
--
Gitblit v1.7.1