From b87e2975c597d67d7a419a63e1d0166b3d4ad1d3 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 12 七月 2024 17:53:17 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 71 ++++++++++++++++++++++++++---------
1 files changed, 52 insertions(+), 19 deletions(-)
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 498ea7d..91a1092 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
@@ -284,8 +284,11 @@
if (memberOrderDTO.getOrderFrom()==1){
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (goodsSku.getListingStatus().getCode()==1){
+ throw new ServiceException("该商品已经下架");
+ }
if (goodsSku.getStock()<memberOrderDTO.getGoodsQuantity()){
- throw new ServiceException("对不起，购买数大于库存");
+ throw new ServiceException("该商品已售罄，暂无库存");
}else{
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
@@ -305,6 +308,10 @@
}
if (memberOrderDTO.getOrderFrom()==2){
GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (data.getListingStatus().getCode()==1){
+ throw new ServiceException("该商品已经下架");
+ }
+
String goodsLock = "goods_lock_" + CacheConstants.SECKILL_GOODS + data.getId();
RLock redissonLock = redissonClient.getLock(goodsLock);
Integer surpNum = 0;
@@ -333,7 +340,7 @@
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData();
if (data.getLimitNumber()<num1) {
- throw new ServiceException("对不起，大于商品购买数");
+ throw new ServiceException("该商品已售罄，暂无库存");
}
order.setOrderFrom(OrderFromEnum.SNAP_ORDERS);
@@ -346,7 +353,7 @@
pice=data.getSeckillPrice();
if (data.getSeckillStock()<1){
- throw new ServiceException("对不起，购买数大于库存");
+ throw new ServiceException("该商品已售罄，暂无库存");
}else{
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(data.getId());
@@ -363,6 +370,12 @@
if (memberOrderDTO.getOrderFrom()==3){
order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS);
GoodsGroupPurchase data = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (data.getListingStatus().getCode()==1){
+ throw new ServiceException("该商品已经下架");
+ }
+ if (data.getStartStatus().getCode()==0){
+ throw new ServiceException("该商品未开始");
+ }
Integer m=data.getCurrentNumber()+1;
if (m>data.getGroupSize()){
throw new ServiceException("对不起，大成团人数");
@@ -461,15 +474,16 @@
if (order.getOrderFrom().getCode()==1){
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData();
- GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
- goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
- goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
- goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
- SecurityConstants.INNER);
-
if (goodsSku.getStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
- throw new ServiceException("对不起，购买数大于库存");
+ throw new ServiceException("该商品已售罄，暂无库存");
}
+
+ GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
+ goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId());
+ goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
+ goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
+ SecurityConstants.INNER);
+
Integer m= goodsSku.getStock()+order.getGoodsQuantity();
goodsStockUpdDTO.setAuctionStock(m-memberOrderDTO.getGoodsQuantity());
goodsSkuClient.updGoodsStock1(goodsStockUpdDTO,
@@ -502,14 +516,16 @@
if (data.getLimitNumber()<num1){
throw new ServiceException("对不起，大于商品购买数");
}else{
+
+
+ if (data.getSeckillStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
+ throw new ServiceException("该商品已售罄，暂无库存");
+ }
+
GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
goodsStockUpdDTO.setGoodsSkuId(data.getId());
goodsStockUpdDTO.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO,SecurityConstants.INNER);
-
- if (data.getSeckillStock()+order.getGoodsQuantity()<memberOrderDTO.getGoodsQuantity()){
- throw new ServiceException("对不起，购买数大于库存");
- }
Integer m=data.getSeckillStock()+order.getGoodsQuantity();
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
@@ -548,7 +564,7 @@
throw new ServiceException("对不起，大于商品购买数");
}else{
if (data.getLimitNumber()<memberOrderDTO.getGoodsQuantity()){
- throw new ServiceException("对不起，购买数大于库存");
+ throw new ServiceException("该商品已售罄，暂无库存");
}else{
memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
memberOrderVO.setPrice(data.getGroupPurchasePrice());
@@ -689,6 +705,10 @@
if(memberOrderListDTO.getOrderStatus()!=null){
wrapper.eq(Order::getOrderStatus,memberOrderListDTO.getOrderStatus().getCode()-1);
}
+
+ if(memberOrderListDTO.getIsRequest()!=null){
+ wrapper.eq(Order::getIsRequest,memberOrderListDTO.getIsRequest());
+ }
wrapper.eq(Order::getIsOrder,1);
wrapper.eq(Order::getDelFlag,0);
wrapper.orderByDesc(Order::getCancelTime);
@@ -780,6 +800,10 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
+ CustomConfig memberPointsPoints = sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData();
+ orderVO.setOrderShuoMin(memberPointsPoints.getConfigValue());
+ CustomConfig ReturnCycle = sysUserClient.getconfig("RETURN_CYCLE").getData();
+ orderVO.setOrderZq(Integer.valueOf(ReturnCycle.getConfigValue()));
return orderVO;
}
@@ -796,6 +820,7 @@
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
+ goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
}
@@ -804,7 +829,8 @@
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
- goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
+ goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
+ goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
}
@@ -819,6 +845,7 @@
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity());
+ goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity());
goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
}
@@ -827,7 +854,8 @@
GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO();
goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId());
goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity());
- goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER);
+ goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity());
+ goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER);
}
if (order.getCouponId()!=0){
@@ -991,8 +1019,6 @@
@Override
public MemberOrderNumVO MemberOrderNum(MemberOrderListDTO memberOrderListDTO) {
-
-
LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(Order::getMemberId,memberOrderListDTO.getMemberId());
wrapper1.eq(Order::getOrderStatus,1);
@@ -1037,6 +1063,13 @@
List<Order> list2 = this.list(paylogEntityWrapper2);
vo.setDshorderNo(list2.size());
+
+
+ LambdaQueryWrapper<Order> paylogEntityWrapper3 = Wrappers.lambdaQuery();
+ paylogEntityWrapper3.eq(Order::getMemberId, memberOrderListDTO.getMemberId());
+ paylogEntityWrapper3.eq(Order::getIsRequest,2);
+ List<Order> list3 = this.list(paylogEntityWrapper3);
+ vo.setShorderNo(list3.size());
return vo;
}
--
Gitblit v1.7.1