From 7672417f93cfe4ccf65ec9810de9efbe78e2945f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 10 七月 2024 20:41:14 +0800
Subject: [PATCH] 分表
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 222 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 157 insertions(+), 65 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 45ab478..157ff59 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,8 +1,8 @@
package com.ruoyi.goods.controller;
+import java.util.Date;
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;
@@ -18,6 +18,7 @@
import com.ruoyi.goods.vo.TOrderVO;
import com.ruoyi.study.api.domain.TUser;
import com.ruoyi.study.api.feignClient.StudyClient;
+import com.ruoyi.study.api.vo.UserPersonalCenterVO;
import com.ruoyi.system.api.model.LoginUserParent;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -59,7 +60,38 @@
private IRegionService regionService;
@Resource
private TokenService tokenService;
-
+ @PostMapping("/testAddData")
+ @ApiOperation(value = "测试分片", tags = {"测试分片"})
+ public R<Object> testAddData() {
+ TOrder tOrder = new TOrder();
+ tOrder.setOrderNumber("");
+ tOrder.setUserId(63);
+ tOrder.setInsertTime(new Date());
+ tOrder.setGoodsId(0);
+ tOrder.setCount(0);
+ tOrder.setState(0);
+ tOrder.setExpress("");
+ tOrder.setExpressNumber("");
+ tOrder.setExpressTime(new Date());
+ tOrder.setIntegral(0);
+ tOrder.setCompleteTime(new Date());
+ tOrder.setConsigneeName("");
+ tOrder.setImg("");
+ tOrder.setName("");
+ tOrder.setType("");
+ tOrder.setConsigneePhone("");
+ tOrder.setConsigneeAddress("");
+ tOrder.setProvince("");
+ tOrder.setCity("");
+ tOrder.setRemark("");
+ tOrder.setDisabled(false);
+ tOrder.setCreateBy("");
+ tOrder.setCreateTime(new Date());
+ tOrder.setUpdateBy("");
+ tOrder.setUpdateTime(new Date());
+ orderService.save(tOrder);
+ return R.ok();
+ }
@PostMapping("/listType")
@ApiOperation(value = "列表查询", tags = {"后台-商品类型管理"})
public R<PageInfo<TGoodsType>> listType(@RequestBody GoodsTypeQuery query) {
@@ -88,12 +120,19 @@
// 类型匹配 todo
if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
- StringBuilder temp = new StringBuilder("");
- for (String s : goodQuery.getType()) {
- wrapper.apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ for (int i = 0; i < goodQuery.getType().size(); i++) {
+// if (i == 0){
+// wrapper.apply("FIND_IN_SET('" + goodQuery.getType().get(i) + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+// }else{
+ wrapper.or().apply("FIND_IN_SET('" + goodQuery.getType().get(i) + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+// }
}
}
wrapper.eq("isDelete", 0);
+ // sort排序
+ wrapper.orderByAsc("CASE WHEN sort IS NULL THEN 1 ELSE 0 END")
+ .orderByAsc("sort")
+ .orderByDesc("createTime");
return R.ok(goodsService.page(new PageInfo<>(goodQuery.getPageNumber(), goodQuery.getPageSize()), wrapper));
}
@@ -108,14 +147,20 @@
QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
wrapper = keywords != null && !"".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
// 类型匹配 todo
- if (goodQuery.getType() != null && !goodQuery.getType().isEmpty()) {
- for (String s : goodQuery.getType()) {
- // 将每个类型 ID 应用于 FIND_IN_SET 函数
- wrapper.apply("FIND_IN_SET('" + s + "', typeIds)");
+ if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
+ for (int i = 0; i < goodQuery.getType().size(); i++) {
+ if (i == 0){
+ wrapper.apply("FIND_IN_SET('" + goodQuery.getType().get(i) + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ }else{
+ wrapper.or().apply("FIND_IN_SET('" + goodQuery.getType().get(i) + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ }
}
}
wrapper.eq("isDelete", 0);
- wrapper.orderByAsc("sort");
+ // sort排序
+ wrapper.orderByAsc("CASE WHEN sort IS NULL THEN 1 ELSE 0 END")
+ .orderByDesc("sort")
+ .orderByDesc("createTime");
return R.ok(goodsService.page(new PageInfo<>(goodQuery.getPageNumber(), goodQuery.getPageSize()), wrapper));
}
@@ -142,7 +187,7 @@
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()){
+ if (!list.isEmpty()) {
return R.fail("当前商品分类被使用,无法删除!");
}
TGoodsType byId = goodsTypeService.getById(id);
@@ -164,7 +209,7 @@
Long temp = 0L;
List<TOrder> list1 = orderService.list(new QueryWrapper<TOrder>().eq("goodsId", tGoods.getId()));
for (TOrder tOrder : list1) {
- temp+=tOrder.getCount();
+ temp += tOrder.getCount();
}
tGoods.setInventory(temp);
// 剩余兑换数量
@@ -210,12 +255,22 @@
@PostMapping("/updateGoods")
@ApiOperation(value = "修改", tags = {"后台-商品管理"})
public R updateGoods(@RequestBody TGoods dto) {
- if (dto.getTotal() != null) {
- dto.setSurplus(dto.getTotal());
- } else {
- dto.setSurplus(0);
+ TGoods byId = goodsService.getById(dto.getId());
+ if (byId.getTotal()!=null && dto.getTotal()!=null &&!Objects.equals(byId.getTotal(), dto.getTotal())){
+ // 如果修改了商品总数 那么需要再判断当前商品已被购买了多少
+ List<TOrder> list = orderService.list(new QueryWrapper<TOrder>()
+ .eq("goodsId", dto.getId()));
+ Integer temp = 0;
+ for (TOrder tOrder : list) {
+ temp += tOrder.getCount();
+ }
+ if (dto.getTotal()<temp){
+ return R.fail("商品总数不能小于当前商品已兑换数量，"+"当前商品已兑换数量为:"+temp);
+ }
}
goodsService.updateById(dto);
+ goodsService.updateOne(dto);
+
return R.ok("修改成功");
}
@@ -243,8 +298,13 @@
*/
@GetMapping("/exchangeRecord")
@ApiOperation(value = "学习端-兑换记录", tags = {"学习端-商城"})
- public R<List<ExchangeRecordVO>> exchangeRecord() {
- List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(tokenService.getLoginUserStudy().getUserid());
+ public R<PageInfo<ExchangeRecordVO>> exchangeRecord(Integer pageNumber,Integer pageSize) {
+ PageInfo<ExchangeRecordVO> res = new PageInfo<>(pageNumber, pageSize);
+ LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
+ if (null == loginUserStudy) {
+ return R.tokenError("登录失效！");
+ }
+ List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(res,tokenService.getLoginUserStudy().getUserid());
for (ExchangeRecordVO record : exchangeRecord) {
TGoods goods = goodsService.getById(record.getGoodsId());
List<String> typeList;
@@ -257,38 +317,34 @@
}
record.setGoodsType(typeList);
}
- return R.ok(exchangeRecord);
+ res.setRecords(exchangeRecord);
+ res.setTotal(exchangeRecord.size());
+ return R.ok(res);
}
@GetMapping("/exchangeRecordParent")
@ApiOperation(value = "家长端-兑换记录", tags = {"家长端-兑换记录"})
- public R<Page<TOrder>> exchangeRecordParent(Integer pageNumber, Integer pageSize) {
+ public R<PageInfo<ExchangeRecordVO>> exchangeRecordParent(Integer pageNumber,Integer pageSize) {
+ PageInfo<ExchangeRecordVO> res = new PageInfo<>(pageNumber, pageSize);
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
- 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());
+ List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(res,tokenService.getLoginUser1().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(page);
+ res.setRecords(exchangeRecord);
+ res.setTotal(exchangeRecord.size());
+ return R.ok(res);
}
/**
@@ -300,12 +356,14 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
})
- public R<Boolean> confirm(@RequestParam Integer id) {
+ public R<Boolean> confirm(@RequestParam String id) {
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
TOrder byId = orderService.getById(id);
+ byId.setUserId(null);
byId.setState(3);
+ byId.setCompleteTime(new Date());
return R.ok(orderService.updateById(byId));
}
@@ -318,11 +376,12 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
})
- public R<Boolean> confirmStudy(@RequestParam Integer id) {
+ public R<Boolean> confirmStudy(@RequestParam String id) {
if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
TOrder byId = orderService.getById(id);
+ byId.setUserId(null);
byId.setState(3);
byId.setCompleteTime(new Date());
return R.ok(orderService.updateById(byId));
@@ -571,17 +630,24 @@
@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) {
+ public R updateOrderAddressParent(@RequestParam String orderId, @RequestParam Integer recipientId) {
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
- Recipient userId = recipientService.getById(recipientId);
- TOrder byId = orderService.getById(orderId);
- byId.setConsigneeName(userId.getRecipient());
- byId.setConsigneePhone(userId.getRecipientPhone());
- byId.setConsigneeAddress(userId.getAddress());
- orderService.updateById(byId);
- return R.ok("修改成功");
+ 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.setUserId(null);
+ order.setConsigneeName(recipient.getRecipient());
+ order.setConsigneePhone(recipient.getRecipientPhone());
+ order.setConsigneeAddress(recipient.getProvince()+recipient.getCity()+recipient.getAddress());
+ orderService.updateById(order);
+ return R.ok();
}
@GetMapping("/updateOrderAddress")
@@ -591,7 +657,7 @@
@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) {
+ public R updateOrderAddress(@RequestParam String orderId, @RequestParam Integer recipientId) {
if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
@@ -603,9 +669,10 @@
if (!Constants.ONE.equals(order.getState())) {
throw new GlobalException("订单已发货，无法修改收货地址！");
}
- order.setConsigneeName(recipient.getAddress());
+ order.setUserId(null);
+ order.setConsigneeName(recipient.getRecipient());
order.setConsigneePhone(recipient.getRecipientPhone());
- order.setConsigneeAddress(recipient.getAddress());
+ order.setConsigneeAddress(recipient.getProvince()+recipient.getCity()+recipient.getAddress());
orderService.updateById(order);
return R.ok();
}
@@ -632,7 +699,20 @@
if (null == loginUserStudy) {
return R.tokenError("登录失效！");
}
- return R.ok(goodsService.goodRecommend(loginUserStudy.getUserid()));
+ UserPersonalCenterVO data = studyClient.userInfo().getData();
+ List<TGoodsVO> tGoodsVOS = goodsService.goodRecommend(loginUserStudy.getUserid());
+ List<TGoodsVO> res = new ArrayList<>();
+ int temp = 0;
+ for (TGoodsVO re : tGoodsVOS) {
+ if (temp>=3){
+ break;
+ }
+ if (data.getUser().getIntegral()>=re.getIntegral()){
+ res.add(re);
+ temp++;
+ }
+ }
+ return R.ok(res);
}
/**
@@ -672,7 +752,10 @@
if (null != goods.getBasicCount()) {
number += goods.getBasicCount();
}
- number += orderService.getGoodBuyNumber(goods.getId());
+ List<TOrder> list = orderService.list(new QueryWrapper<TOrder>().eq("goodsId", goods.getId()));
+ for (TOrder tOrder : list) {
+ number+=tOrder.getCount();
+ }
// 剩余兑换数量
Integer residueNumber = null;
if (null != goods.getTotal()) {
@@ -695,7 +778,6 @@
*/
@GetMapping("/goodDetailParent")
@ApiOperation(value = "商品详情", tags = {"家长端-商城"})
- @ApiOperationSupport(order = 24)
@ApiImplicitParams({
@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
})
@@ -715,7 +797,10 @@
if (null != goods.getBasicCount()) {
number += goods.getBasicCount();
}
- number += orderService.getGoodBuyNumber(goods.getId());
+ List<TOrder> list = orderService.list(new QueryWrapper<TOrder>().eq("goodsId", goods.getId()));
+ for (TOrder tOrder : list) {
+ number+=tOrder.getCount();
+ }
// 剩余兑换数量
Integer residueNumber = null;
if (null != goods.getTotal()) {
@@ -748,6 +833,13 @@
.eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid())
.eq(Recipient::getIsDefault, 1)
.eq(Recipient::getDisabled, 0).one();
+ if (null == recipient) {
+ recipient = recipientService.lambdaQuery()
+ .eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid())
+ .eq(Recipient::getDisabled, 0)
+ .orderByDesc(Recipient::getCreateTime)
+ .last("limit 1").one();
+ }
GoodDetailVO goodDetailVO = goodsService.redeemNow(goodId, recipient);
LocalDateTime currentDateTime = LocalDateTime.now();
// 格式化日期和时间信息
@@ -784,12 +876,11 @@
.eq(Recipient::getIsDefault, 1).one();
if (recipient == null) {
// 随便取一条地址数据
- List<Recipient> list = recipientService.lambdaQuery()
+ recipient = recipientService.lambdaQuery()
.eq(Recipient::getUserId, tokenService.getLoginUser1().getUserid())
- .list();
- if (!list.isEmpty()) {
- recipient = list.get(0);
- }
+ .orderByDesc(Recipient::getCreateTime)
+ .eq(Recipient::getDisabled, 0).last("limit 1")
+ .one();
}
GoodDetailVO goodDetailVO = goodsService.redeemNow(goodId, recipient);
LocalDateTime currentDateTime = LocalDateTime.now();
@@ -848,8 +939,8 @@
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());
+ if (byId.getProvince() != null && byId.getCity() != null) {
+ tGoodsVO.setConsigneeAddress(byId.getProvince() + byId.getCity() + tGoodsVO.getConsigneeAddress());
}
return R.ok(tGoodsVO);
}
@@ -859,6 +950,7 @@
@ApiOperationSupport(order = 12)
public R getGoodsInfo1(@RequestBody OrderDTO dto) {
TOrder byId = orderService.getById(dto.getId());
+ byId.setUserId(null);
byId.setState(2);
byId.setExpress(dto.getExpress());
byId.setExpressNumber(dto.getExpressNumber());
--
Gitblit v1.7.1