ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
@@ -120,6 +120,7 @@ memberArticleCollectionVO.setContent(byId.getContent()); memberArticleCollectionVO.setImages(byId.getImages()); memberArticleCollectionVO.setTitle(byId.getTitle()); memberArticleCollectionVO.setCreateTime(byId.getCreateTime()); memberArticleCollectionVO.setId(byId.getId()); R<Member> membeOne = memberClient.getMembeOne(byId.getMemberId(), SecurityConstants.INNER); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -521,7 +521,6 @@ auctionGoodsinfoVO.setSpec(goodsSkuOne.getSpec()); auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit()); auctionGoodsinfoVO.setShareTitle(goodsSkuOne.getShareTitle()); auctionGoodsinfoVO.setSpecUnit(goodsSkuOne.getSpecUnit()); auctionGoodsinfoVO.setDetail(goodsSkuOne.getDetail()); auctionGoodsinfoVO.setBond(byId.getBond()); auctionGoodsinfoVO.setYears(goodsSkuOne.getYears()); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -1027,9 +1027,7 @@ Set<Long> goodsSkuIdList = null; goodsSkuIdList = data.stream().map(OrderAuctionBond::getAuctionSalesroomId) .collect(Collectors.toSet()); Page<AuctionSalesroom> page = new Page<>(); page.setSize(memberAuctionSalesroomDTO.getPageSize()); page.setCurrent(memberAuctionSalesroomDTO.getPageCurr()); /* MemberAuctionSalesroomWdDTO memberAuctionSalesroomWdDTO=new MemberAuctionSalesroomWdDTO(); if (goodsSkuIdList.size()>0){ memberAuctionSalesroomWdDTO.setGoodsSkuIdList(goodsSkuIdList); @@ -1048,6 +1046,9 @@ }*/ Page<AuctionSalesroom> page = new Page<>(); page.setSize(memberAuctionSalesroomDTO.getPageSize()); page.setCurrent(memberAuctionSalesroomDTO.getPageCurr()); LambdaQueryWrapper<AuctionSalesroom> wrapper1=Wrappers.lambdaQuery(); if (goodsSkuIdList.size()>0){ wrapper1.in(AuctionSalesroom::getId,goodsSkuIdList); @@ -1070,7 +1071,7 @@ " WHEN status = 2 THEN 3\n" + " END,status"); Page<AuctionSalesroom> auctionSalesroomList=this.page(page,wrapper1); Page<AuctionSalesroom> auctionSalesroomList=this.page(Page.of(memberAuctionSalesroomDTO.getPageCurr(),memberAuctionSalesroomDTO.getPageSize()),wrapper1); PageDTO<WdMemberAuctionSalesroomVO> wdMemberAuctionSalesroomVOPageDTO = PageDTO.of(auctionSalesroomList, WdMemberAuctionSalesroomVO.class); List<WdMemberAuctionSalesroomVO> list = wdMemberAuctionSalesroomVOPageDTO.getList(); for (WdMemberAuctionSalesroomVO auctionSalesroom:list){ ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
@@ -7,10 +7,13 @@ import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.goods.mapper.GoodsSkuMapper; import com.ruoyi.goods.service.IGoodsSkuService; import com.ruoyi.system.api.domain.GoodsGroupPurchaseInfo; import com.ruoyi.goods.service.impl.GoodsGroupPurchaseInfoServiceImpl; import com.ruoyi.system.api.domain.GoodsGroupPurchase; import com.ruoyi.goods.service.IGoodsGroupPurchaseService; import com.ruoyi.system.api.domain.GoodsSku; import com.ruoyi.system.api.feignClient.OrderClient; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -36,6 +39,8 @@ private final OrderClient orderClient; private final GoodsSkuMapper goodsSkuMapper; @InnerAuth @PostMapping("/getGoodsSeckiGoodsGroupPurchaseOne") public R<GoodsGroupPurchase> getGoodsSeckiGoodsGroupPurchaseOne(@RequestBody Long goodsSkuId) { @@ -57,17 +62,32 @@ } @InnerAuth @PostMapping("/getGoodsSeckiGoodsGroupPurchaseInfo1") public R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo1(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo) { @PostMapping("/getGoodsSeckiGoodsGroupPurchaseInfo2") public R<GoodsGroupPurchaseInfo> getGoodsSeckiGoodsGroupPurchaseInfo2(@RequestBody String goodsSkuId) { LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery(); wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0); wrapper6.eq(GoodsGroupPurchaseInfo::getMubre,goodsSkuId); GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoServiceImpl.getOne(wrapper6); return R.ok(one1); } @InnerAuth @PostMapping("/updgoodsGroupPurchaseInfo1") public R<GoodsGroupPurchaseInfo> updgoodsGroupPurchaseInfo1(@RequestBody GoodsGroupPurchaseInfo goodsGroupPurchaseInfo) { LambdaQueryWrapper<GoodsGroupPurchaseInfo> wrapper6= Wrappers.lambdaQuery(); wrapper6.eq(GoodsGroupPurchaseInfo::getDelFlag,0); wrapper6.eq(GoodsGroupPurchaseInfo::getMubre,goodsGroupPurchaseInfo.getMubre()); GoodsGroupPurchaseInfo one1 = goodsGroupPurchaseInfoServiceImpl.getOne(wrapper6); int i=one1.getCurrentNumber()-1; if (i==0){ one1.setCurrentNumber(0); one1.setGroupStatus(0); goodsGroupPurchaseInfoServiceImpl.updateById(one1); GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId()); int i1 = byId.getLimitNumber() * byId.getGroupSize(); GoodsSku goodsSku = goodsSkuMapper.selectById(byId.getGoodsSkuId()); int i2 = i1 + goodsSku.getStock(); goodsSku.setStock(i2); goodsSkuMapper.updateById(goodsSku); goodsGroupPurchaseInfoServiceImpl.removeById(one1); }else{ one1.setCurrentNumber(i); @@ -93,6 +113,10 @@ } goodsGroupPurchaseInfoServiceImpl.updateById(byId); }else{ if (goodsGroupPurchaseInfo.getCurrentNumber()==goodsGroupPurchaseInfo.getGroupSize()){ goodsGroupPurchaseInfo.setGroupStatus(1); orderClient.updateOrderStatusByMubres1(goodsGroupPurchaseInfo.getMubre(), SecurityConstants.INNER); } goodsGroupPurchaseInfoServiceImpl.save(goodsGroupPurchaseInfo); }
@@ -386,7 +386,11 @@ wrapper3.le(GoodsSku::getYears, parseTime7) .ge(GoodsSku::getYears, parseTime15); } wrapper3.orderByAsc(GoodsSku::getSortNum); if (homeGoodsSkuDTO.getSort()==1){ wrapper3.last(" ORDER BY IF(isnull(sort_num),1,0), sort_num ASC"); }else{ wrapper3.last(",IF(isnull(sort_num),1,0), sort_num ASC"); } Page<GoodsSku> page1 = this.page(page, wrapper3); PageDTO<HomeGoodsSkuListVO> articleCommentsVOPageDTO = PageDTO.of(page1, HomeGoodsSkuListVO.class); return articleCommentsVOPageDTO; ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartOrderController.java
@@ -54,6 +54,13 @@ return R.ok(orderService.updMemberOrder(memberOrderDTO)); } @PostMapping("/updMemberOrderbz") @ApiOperation(value = "用户端-修改订单备注") public R updMemberOrderbz(@RequestBody MemberOrderDTO memberOrderDTO) { orderService.updMemberOrderbz(memberOrderDTO); return R.ok(); } @PostMapping("/MemberOrderList") @ApiOperation(value = "用户端-订单列表") ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
@@ -88,6 +88,22 @@ } @PostMapping("/getOrderOne2") @ResponseBody @InnerAuth public R<Order> getOrderOne2(@RequestBody OrderDTO OrderDTO) { LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery(); wrapper.eq(Order::getMemberId,OrderDTO.getMemberId()); wrapper.eq(Order::getOrderFrom,OrderDTO.getOrderFrom()); wrapper.eq(Order::getGoodsSkuId,OrderDTO.getGoodsSkuId()); wrapper.eq(Order::getDelFlag,0); wrapper.orderByDesc(Order::getCancelTime); List<Order> list = orderService.list(wrapper); return R.ok(list.get(0)); } /** * 获取某个商品的已购会员数 @@ -136,6 +152,13 @@ @PostMapping("/getOrderByGroupPurchaseMemberId1") R<Order> getOrderByGroupPurchaseMemberId1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){ return R.ok(orderService.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO)); } @InnerAuth @ResponseBody @PostMapping("/getOrderByGroupPurchaseMemberId2") R<Order> getOrderByGroupPurchaseMemberId2(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){ return R.ok(orderService.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO)); } @@ -193,4 +216,16 @@ orderService.updateOrderStatusByMubres(formedGroupMubres); return R.ok(); } @InnerAuth @PostMapping("/updOrderStatusByMubres1") R<?> updateOrderStatusByMubres1(@RequestBody String formedGroupMubres) { try { Thread.sleep(1000); } catch (InterruptedException e) { throw new RuntimeException(e); } orderService.updateOrderStatusByMubres1(formedGroupMubres); return R.ok(); } } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
@@ -42,6 +42,8 @@ Order getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO); Order getOrderByGroupPurchaseMemberId2(HomeGoodsSkuDTO homeGoodsSkuDTO); List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO); /** ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java
@@ -58,11 +58,15 @@ Order getOrderByGroupPurchaseMemberId(HomeGoodsSkuDTO homeGoodsSkuDTO); Order getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO); Order getOrderByGroupPurchaseMemberId2(HomeGoodsSkuDTO homeGoodsSkuDTO); List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO); MemberTiOrderVO saveMemberOrder(@RequestBody MemberOrderDTO memberOrderDTO); MemberTiOrderVO updMemberOrder(@RequestBody MemberOrderDTO memberOrderDTO); void updMemberOrderbz(@RequestBody MemberOrderDTO memberOrderDTO); PageDTO<MemberOrderListVO> MemberrderList(@RequestBody MemberOrderListDTO memberOrderListDTO); @@ -146,4 +150,6 @@ List<Order> getOrderListByMubres(List<String> mubres); void updateOrderStatusByMubres(List<String> formedGroupMubres); void updateOrderStatusByMubres1(String formedGroupMubres); } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderReturnRequestServiceImpl.java
@@ -121,6 +121,7 @@ public OrderReturnVO OrderReturnRequestInfo(OrderReturnDTO OrderReturnDTO) { LambdaQueryWrapper<OrderReturnRequest> wrapper= Wrappers.lambdaQuery(); wrapper.eq(OrderReturnRequest::getOrderId,OrderReturnDTO.getOrderId()); wrapper.orderByDesc(OrderReturnRequest::getCreateTime); List<OrderReturnRequest> list = this.list(wrapper); OrderReturnVO orderReturnVO =null; if(list.size()>0){ ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -27,6 +27,7 @@ import com.ruoyi.order.controller.management.dto.MgtOrderQuery; import com.ruoyi.order.controller.management.vo.MgtOrderReturnRequestVO; import com.ruoyi.order.controller.management.vo.MgtOrderVO; import com.ruoyi.order.domain.MemberInvoiceOrder; import com.ruoyi.order.domain.OrderReturnRequest; import com.ruoyi.order.domain.Paylog; import com.ruoyi.order.mapper.OrderAuctionBondMapper; @@ -266,6 +267,11 @@ } @Override public Order getOrderByGroupPurchaseMemberId2(HomeGoodsSkuDTO homeGoodsSkuDTO) { return baseMapper.getOrderByGroupPurchaseMemberId2(homeGoodsSkuDTO); } @Override public List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO) { return baseMapper.getOrderByGroupPurchaseMemberList(homeGoodsSkuDTO); } @@ -344,6 +350,7 @@ MemberOrderDTO memberOrderDTO1=new MemberOrderDTO(); memberOrderDTO1.setMemberId(order.getMemberId()); memberOrderDTO1.setId(order.getId()); memberOrderDTO1.setGoodsSkuId(memberOrderDTO.getGoodsSkuId()); Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1); Integer num1=0; @@ -395,10 +402,29 @@ if (data.getStartStatus().getCode()==0){ throw new ServiceException("该商品未开始"); } Integer m=data.getCurrentNumber()+1; GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData(); if (goodsSeckiGoodsGroupPurchaseInfo==null){ GoodsGroupPurchase data1 = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(memberOrderDTO.getGoodsSkuId(), SecurityConstants.INNER).getData(); Integer num= data.getGroupSize()*data.getLimitNumber(); GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data1.getGoodsSkuId(), SecurityConstants.INNER).getData(); if (goodsSku.getSortNum()<num){ throw new ServiceException("该商品库存不足无法团购"); } GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO(); goodsStockUpdDTO.setGoodsSkuId(goodsSku.getId()); goodsStockUpdDTO.setAuctionStock(goodsSku.getStock()-num); goodsSkuClient.updGoodsStock1(goodsStockUpdDTO, SecurityConstants.INNER); } /*Integer m=data.getCurrentNumber()+1; if (m>data.getGroupSize()){ throw new ServiceException("对不起，大成团人数"); } }*/ GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData(); memberOrderVO.setGoodsSkuId(memberOrderDTO.getGoodsSkuId()); memberOrderVO.setPrice(data.getGroupPurchasePrice()); @@ -521,25 +547,21 @@ if (order.getOrderFrom().getCode()==2){ MemberOrderDTO memberOrderDTO1=new MemberOrderDTO(); memberOrderDTO1.setMemberId(order.getMemberId()); memberOrderDTO1.setId(order.getId()); memberOrderDTO1.setGoodsSkuId(order.getGoodsSkuId()); Integer num=baseMapper.getSeckillMembers1(memberOrderDTO1); Integer num1=0; if(num!=order.getGoodsQuantity()){ if (num!=null){ num1 =num+order.getGoodsQuantity(); num1 =num+memberOrderDTO.getGoodsQuantity(); }else{ num1=order.getGoodsQuantity(); } }else{ num1=num; } GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData(); GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(data.getGoodsSkuId(), SecurityConstants.INNER).getData(); if (num1!=order.getGoodsQuantity()){ if (data.getLimitNumber()!=0||data.getLimitNumber()<num1){ if (data.getLimitNumber()<num1){ throw new ServiceException("对不起，大于商品购买数"); }else{ @@ -574,7 +596,7 @@ memberOrderVO.setSkuName(goodsSku.getSkuName()); memberOrderVO.setYouhiPrice(data.getSeckillPrice()); } } if (order.getOrderFrom().getCode()==3){ order.setOrderFrom(OrderFromEnum.GROUP_PURCHASE_ORDERS); @@ -732,6 +754,16 @@ } @Override public void updMemberOrderbz(MemberOrderDTO memberOrderDTO) { Order order = baseMapper.selectById(memberOrderDTO.getId()); if(memberOrderDTO.getOrderRemark()!=null){ order.setOrderRemark(memberOrderDTO.getOrderRemark()); } baseMapper.updateById(order); } @Override public PageDTO<MemberOrderListVO> MemberrderList(MemberOrderListDTO memberOrderListDTO) { Page<Order> page = new Page<>(memberOrderListDTO.getPageCurr(), memberOrderListDTO.getPageSize()); @@ -772,9 +804,34 @@ couponMemberDTO1.setId(order.getCouponId()); couponMemberDTO1.setCouponStatus(0); promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER); order.setCouponId(0L); } if(order.getOrderNo().contains("SP")){ GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData(); GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO(); goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId()); goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity()); if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){ goodsStockUpdDTO1.setSoldQuantity(0); }else { goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity()); } goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER); } if(order.getOrderNo().contains("MS")){ GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData(); GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO(); goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId()); goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity()); if (data.getSoldQuantity()-order.getGoodsQuantity()<0){ goodsStockUpdDTO1.setSoldQuantity(0); }else { goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity()); } goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER); } this.updateById(order); @@ -912,7 +969,16 @@ } if(order.getOrderNo().contains("TG")){ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo(); goodsGroupPurchaseInfo.setGroupPurchaseId(order.getGoodsSkuId()); goodsGroupPurchaseInfo.setMubre(order.getGroupNo()); GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData(); if (goodsSeckiGoodsGroupPurchaseInfo!=null){ GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); } } } if (order.getOrderStatus().getCode() == 2) { @@ -944,6 +1010,16 @@ goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity()); } goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER); } if(order.getOrderNo().contains("TG")){ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo(); goodsGroupPurchaseInfo.setMubre(order.getGroupNo()); GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData(); if (goodsSeckiGoodsGroupPurchaseInfo!=null){ GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); } } if (order.getCouponId()!=0){ @@ -1011,7 +1087,7 @@ goodsGroupPurchaseInfo.setMubre(byId.getGroupNo()); GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo1(goodsGroupPurchaseInfo, SecurityConstants.INNER).getData(); if (goodsSeckiGoodsGroupPurchaseInfo!=null){ GoodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); } } @@ -1137,6 +1213,42 @@ Order order = this.getById(MemberOrderList.getId()); order.setOrderStatus(OrderStatusEnum.CANCELED); this.updateById(order); if (order.getCouponId()!=0){ CouponMemberDTO couponMemberDTO1=new CouponMemberDTO(); couponMemberDTO1.setId(order.getCouponId()); couponMemberDTO1.setCouponStatus(0); promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER); } if(order.getOrderNo().contains("SP")){ GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData(); GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO(); goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId()); goodsStockUpdDTO1.setAuctionStock(goodsSku.getStock()+order.getGoodsQuantity()); if (goodsSku.getSoldQuantity()-order.getGoodsQuantity()<0){ goodsStockUpdDTO1.setSoldQuantity(0); }else { goodsStockUpdDTO1.setSoldQuantity(goodsSku.getSoldQuantity()-order.getGoodsQuantity()); } goodsSkuClient.updGoodsStock1(goodsStockUpdDTO1,SecurityConstants.INNER); } if(order.getOrderNo().contains("MS")){ GoodsSeckill data = goodsSkuClient.getGoodsSeckillOne(order.getGoodsSkuId(), SecurityConstants.INNER).getData(); GoodsStockUpdDTO goodsStockUpdDTO1 = new GoodsStockUpdDTO(); goodsStockUpdDTO1.setGoodsSkuId(order.getGoodsSkuId()); goodsStockUpdDTO1.setAuctionStock(data.getSeckillStock()+order.getGoodsQuantity()); if (data.getSoldQuantity()-order.getGoodsQuantity()<0){ goodsStockUpdDTO1.setSoldQuantity(0); }else { goodsStockUpdDTO1.setSoldQuantity(data.getSoldQuantity()-order.getGoodsQuantity()); } goodsSkuClient.updGoodsSeckill(goodsStockUpdDTO1,SecurityConstants.INNER); } } } @@ -1150,6 +1262,7 @@ paylogEntityWrapper.eq(Order::getMemberId, memberOrderListDTO.getMemberId()); paylogEntityWrapper.eq(Order::getOrderStatus,1); paylogEntityWrapper.eq(Order::getDelFlag,0); paylogEntityWrapper.eq(Order::getIsOrder,1); List<Order> list = this.list(paylogEntityWrapper); vo.setDzforderNo(list.size()); @@ -1157,6 +1270,7 @@ paylogEntityWrapper1.eq(Order::getMemberId, memberOrderListDTO.getMemberId()); paylogEntityWrapper1.eq(Order::getOrderStatus,2); paylogEntityWrapper1.eq(Order::getDelFlag,0); paylogEntityWrapper1.eq(Order::getIsOrder,1); List<Order> list1 = this.list(paylogEntityWrapper1); vo.setDfhorderNo(list1.size()); @@ -1164,6 +1278,7 @@ paylogEntityWrapper2.eq(Order::getMemberId, memberOrderListDTO.getMemberId()); paylogEntityWrapper2.eq(Order::getOrderStatus,3); paylogEntityWrapper2.eq(Order::getDelFlag,0); paylogEntityWrapper2.eq(Order::getIsOrder,1); List<Order> list2 = this.list(paylogEntityWrapper2); vo.setDshorderNo(list2.size()); @@ -1173,6 +1288,7 @@ paylogEntityWrapper3.eq(Order::getMemberId, memberOrderListDTO.getMemberId()); paylogEntityWrapper3.eq(Order::getIsRequest,2); paylogEntityWrapper3.eq(Order::getDelFlag,0); paylogEntityWrapper3.eq(Order::getIsOrder,1); List<Order> list3 = this.list(paylogEntityWrapper3); vo.setShorderNo(list3.size()); return vo; @@ -1611,4 +1727,17 @@ this.lambdaUpdate().set(Order::getIsOrder, 1).in(Order::getGroupNo, formedGroupMubres) .update(); } @Override public void updateOrderStatusByMubres1(String formedGroupMubres) { LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery(); wrapper.eq(Order::getGroupNo, formedGroupMubres); List<Order> page1 = this.list(wrapper); for (Order p:page1){ p.setIsOrder(1); this.updateById(p); } } } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -136,7 +136,7 @@ } if(page1.getOrderNo().contains("SP")){ /* if(page1.getOrderNo().contains("SP")){ GoodsSku goodsSku =new GoodsSku(); goodsSku.setId(page1.getGoodsSkuId()); goodsSku.setSoldQuantity(page1.getGoodsQuantity()); @@ -148,13 +148,13 @@ goodsSku.setId(page1.getGoodsSkuId()); goodsSku.setSoldQuantity(page1.getGoodsQuantity()); goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER); } }*/ if(page1.getOrderNo().contains("TG")){ GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData(); GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData(); if (goodsSeckiGoodsGroupPurchaseInfo!=null){ /* if (goodsSeckiGoodsGroupPurchaseInfo!=null){ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre()); }else{ @@ -167,7 +167,7 @@ goodsGroupPurchaseInfo.setGroupStatus(0); goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER); page1.setGroupNo(uuid.toString()); } }*/ } OrderMapper.updateById(page1); @@ -362,6 +362,9 @@ wrapper1.eq(Order::getOrderNo,paylog1.getOutTradeNo()); wrapper1.eq(Order::getDelFlag,0); Order page1 = OrderMapper.selectOne(wrapper1); page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED); page1.setPayTime(LocalDateTime.now()); if(page1.getOrderNo().contains("SP")){ GoodsSku goodsSku =new GoodsSku(); goodsSku.setId(page1.getGoodsSkuId()); @@ -380,24 +383,25 @@ GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData(); GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData(); if (goodsSeckiGoodsGroupPurchaseInfo!=null){ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre()); OrderMapper.updateById(page1); goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); }else{ UUID uuid = UUID.randomUUID(); page1.setGroupNo(uuid.toString()); OrderMapper.updateById(page1); GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo(); goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize()); goodsGroupPurchaseInfo.setCurrentNumber(1); goodsGroupPurchaseInfo.setMubre(uuid.toString()); goodsGroupPurchaseInfo.setGroupPurchaseId(page1.getGoodsSkuId()); goodsGroupPurchaseInfo.setGroupPurchaseId(goodsSeckiGoodsGroupPurchaseOne.getId()); goodsGroupPurchaseInfo.setGroupStatus(0); goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER); page1.setGroupNo(uuid.toString()); } } page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED); page1.setPayTime(LocalDateTime.now()); OrderMapper.updateById(page1); if (page1.getPoints()!=0){ MemberPointsDTO memberPointsDTO=new MemberPointsDTO(); memberPointsDTO.setMemberId(page1.getMemberId()); @@ -531,7 +535,7 @@ page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED); page1.setPaymentMethod(PaymentMethodEnum.WECHAT); page1.setPayTime(LocalDateTime.now()); OrderMapper.updateById(page1); if(page1.getOrderNo().contains("SP")){ GoodsSku goodsSku =new GoodsSku(); @@ -550,17 +554,22 @@ GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData(); GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData(); if (goodsSeckiGoodsGroupPurchaseInfo!=null){ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); OrderMapper.updateById(page1); page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre()); goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); }else{ UUID uuid = UUID.randomUUID(); page1.setGroupNo(uuid.toString()); OrderMapper.updateById(page1); GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo(); goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize()); goodsGroupPurchaseInfo.setCurrentNumber(1); goodsGroupPurchaseInfo.setMubre(uuid.toString()); goodsGroupPurchaseInfo.setGroupPurchaseId(goodsSeckiGoodsGroupPurchaseOne.getId()); goodsGroupPurchaseInfo.setGroupStatus(0); goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER); page1.setGroupNo(uuid.toString()); } } if (page1.getPoints()!=0){ ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
@@ -39,7 +39,7 @@ @Override public PageDTO<CouponMemberVO> getCouponMemberList(CouponMemberDTO couponMemberDTO) { LambdaQueryWrapper<Coupon> wrapper= Wrappers.lambdaQuery(); wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.REMOVED_FROM_THE_SHELF); wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.ON_SHELVES); wrapper.eq(Coupon::getDelFlag,0); List<Coupon> couponMemberList=couponMapper.selectList(wrapper); Set<Long> CouponList = null; @@ -53,7 +53,7 @@ CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus())); } if (CouponList.size()>0){ wrapper1.notIn(CouponMember::getCouponId,CouponList); wrapper1.in(CouponMember::getCouponId,CouponList); } wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId()); wrapper1.eq(CouponMember::getDelFlag,0); @@ -82,7 +82,7 @@ @Override public List<CouponMemberVO> getCouponMemberl(CouponMemberDTO couponMemberDTO) { LambdaQueryWrapper<Coupon> wrapper= Wrappers.lambdaQuery(); wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.REMOVED_FROM_THE_SHELF); wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.ON_SHELVES); wrapper.eq(Coupon::getDelFlag,0); List<Coupon> couponMemberList=couponMapper.selectList(wrapper); Set<Long> CouponList = null; @@ -93,7 +93,7 @@ wrapper1.eq(CouponMember::getCouponStatus, 0); wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId()); if (CouponList.size()>0){ wrapper1.notIn(CouponMember::getCouponId,CouponList); wrapper1.in(CouponMember::getCouponId,CouponList); } wrapper1.eq(CouponMember::getDelFlag,0); List<CouponMember> page1 = this.list(wrapper1); @@ -111,21 +111,19 @@ public List<CouponMemberVO> updCouponMember1(CouponMemberDTO couponMemberDTO) { LambdaQueryWrapper<Coupon> wrapper= Wrappers.lambdaQuery(); wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.REMOVED_FROM_THE_SHELF); wrapper.eq(Coupon::getCouponStatus, ListingStatusEnum.ON_SHELVES); wrapper.eq(Coupon::getDelFlag,0); List<Coupon> couponMemberList=couponMapper.selectList(wrapper); Set<Long> CouponList = null; CouponList = couponMemberList.stream().map(Coupon::getId) .collect(Collectors.toSet()); LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(CouponMember::getCouponStatus, CouponUseEnum.getEnumByCode(couponMemberDTO.getCouponStatus())); if (CouponList.size()>0){ wrapper1.notIn(CouponMember::getCouponId,CouponList); } wrapper1.eq(CouponMember::getCouponStatus, 0); wrapper1.eq(CouponMember::getMemberId,couponMemberDTO.getMemberId()); if (CouponList.size()>0){ wrapper1.in(CouponMember::getCouponId,CouponList); } wrapper1.eq(CouponMember::getDelFlag,0); List<CouponMember> page1 = this.list(wrapper1); List<CouponMemberVO> couponMemberVOS=new ArrayList<>();
