From e4bfb2b464892721895510d7ef4c5ebaf095f9bb Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期二, 02 七月 2024 20:43:32 +0800
Subject: [PATCH] 用户端拍卖修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java | 2 ++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java | 4 ++++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSkuController.java | 7 +++++++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java | 11 +++++++++++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 12 ++++++------
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java | 5 +++++
6 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java
index 17df4a3..6ade38a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/GoodsSkuFactory.java
@@ -97,6 +97,11 @@
}
@Override
+ public R<?> updGoodsStock1(GoodsStockUpdDTO goodsStockUpdDTOS, String source) {
+ return R.fail("更新商品失败:" + cause.getMessage());
+ }
+
+ @Override
public R<?> updGoodsSeckill(GoodsStockUpdDTO goodsStockUpdDTOS, String source) {
return null;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
index f8fc9f9..6f8c0d0 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/GoodsSkuClient.java
@@ -86,6 +86,10 @@
R<?> updGoodsStock(@RequestBody List<GoodsStockUpdDTO> goodsStockUpdDTOS,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PutMapping("/goods-sku/upd-stock1")
+ R<?> updGoodsStock1(@RequestBody GoodsStockUpdDTO goodsStockUpdDTOS,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
@PutMapping("/goods-seckill/updGoodsSeckill")
R<?> updGoodsSeckill(@RequestBody GoodsStockUpdDTO goodsStockUpdDTOS,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSkuController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSkuController.java
index c987bd9..709c7a7 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSkuController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSkuController.java
@@ -80,6 +80,13 @@
return R.ok();
}
+ @InnerAuth
+ @PutMapping("/upd-stock1")
+ R<?> updGoodsStock1(@RequestBody GoodsStockUpdDTO goodsStockUpdDTOS) {
+ iGoodsSkuService.updGoodsStock1(goodsStockUpdDTOS);
+ return R.ok();
+ }
+
/**
* 根据商品id集合查询商品
*
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java
index a99b86d..ba1012a 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/IGoodsSkuService.java
@@ -66,6 +66,8 @@
*/
void updGoodsStock(List<GoodsStockUpdDTO> goodsStockUpdDTOS);
+ void updGoodsStock1(GoodsStockUpdDTO goodsStockUpdDTOS);
+
PageDTO<HomeGoodsSkuListVO> getHomeGoodsSkuVOList(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO);
HomeGoodsSkuInfoVO getHomeGoodsSkuInfo(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO);
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
index e900f48..90ebd58 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
@@ -310,6 +310,17 @@
log.info("批量更新商品库存结束");
}
+
+ @Override
+ @Transactional(propagation = Propagation.REQUIRES_NEW)
+ public void updGoodsStock1(GoodsStockUpdDTO goodsStockUpdDTOS) {
+ GoodsSku goodsSkus = this.getById(goodsStockUpdDTOS.getGoodsSkuId());
+ goodsSkus.setStock(goodsStockUpdDTOS.getAuctionStock());
+ this.updateById(goodsSkus);
+
+ }
+
+
@Override
public PageDTO<HomeGoodsSkuListVO> getHomeGoodsSkuVOList(HomeGoodsSkuDTO homeGoodsSkuDTO) {
Page<GoodsSku> page = new Page<>();
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 1f77906..4f51fdc 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -272,8 +272,8 @@
}else{
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
- goodsStockUpdDTO.setAuctionStock(memberOrderDTO.getGoodsQuantity()*-1);
- goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
+ goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()-memberOrderDTO.getGoodsQuantity());
+ goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
SecurityConstants.INNER);
order.setSkuName(goodsSku.getSkuName());
@@ -426,14 +426,14 @@
}else{
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
- goodsStockUpdDTO.setAuctionStock(order.getGoodsQuantity()*1);
- goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
+ goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
+ goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
SecurityConstants.INNER);
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
goodsStockUpdDTO1.setGoodsSkuId(goodsSku.getId());
- goodsStockUpdDTO1.setAuctionStock(memberOrderDTO.getGoodsQuantity()*-1);
- goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
+ goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()-memberOrderDTO.getGoodsQuantity());
+ goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
SecurityConstants.INNER);
order.setTotalAmount(goodsSku.getPrice().multiply(new BigDecimal(memberOrderDTO.getGoodsQuantity())));
--
Gitblit v1.7.1