ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java
@@ -69,5 +69,9 @@ @TableLogic private Integer delFlag; @ApiModelProperty(value = "购买数量") private Integer purchaseNum; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java
@@ -13,6 +13,9 @@ @ApiModelProperty(value = "商品id") private Long goodsSkuId; @ApiModelProperty(value = "浏览目标id") private Long targetId; @ApiModelProperty(value = "商品名称") private String goodsSkuName;
@@ -1,6 +1,8 @@ package com.ruoyi.system.api.domain.vo; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.common.core.enums.StartStatusEnum; @@ -65,7 +67,8 @@ @ApiModelProperty(value = "商品id") private Long goodsSkuId; @ApiModelProperty(value = "创建时间") private LocalDateTime createTime;
@@ -20,6 +20,9 @@ @JsonInclude(JsonInclude.Include.ALWAYS) private Long SalesroomId; @ApiModelProperty(value = "浏览目标id") private Long targetId; @ApiModelProperty(value = "拍卖场名称") @JsonInclude(JsonInclude.Include.ALWAYS) private String salesroomName; ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
@@ -85,10 +85,9 @@ int i=one1.getCurrentNumber()-1; if (i==0){ GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId()); int i1 = byId.getLimitNumber() * byId.getGroupSize(); GoodsSku goodsSku = goodsSkuMapper.selectById(byId.getGoodsSkuId()); int i2 = i1 + goodsSku.getStock(); int i2 = goodsGroupPurchaseInfo.getPurchaseNum() + goodsSku.getStock(); goodsSku.setStock(i2); goodsSkuMapper.updateById(goodsSku); goodsGroupPurchaseInfoServiceImpl.removeById(one1); @@ -97,6 +96,19 @@ if (one1.getGroupSize()>one1.getCurrentNumber()){ one1.setGroupStatus(0); } Integer i3= one1.getPurchaseNum()-goodsGroupPurchaseInfo.getPurchaseNum(); one1.setPurchaseNum(i3); goodsGroupPurchaseInfoServiceImpl.updateById(one1); GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId()); GoodsSku goodsSku = goodsSkuMapper.selectById(byId.getGoodsSkuId()); int i2 = goodsGroupPurchaseInfo.getPurchaseNum() + goodsSku.getStock(); goodsSku.setStock(i2); goodsSkuMapper.updateById(goodsSku); goodsGroupPurchaseInfoServiceImpl.removeById(one1); goodsGroupPurchaseInfoServiceImpl.updateById(one1); } @@ -110,20 +122,18 @@ GoodsGroupPurchaseInfo byId = goodsGroupPurchaseInfoServiceImpl.getById(goodsGroupPurchaseInfo.getId()); Integer num= byId.getCurrentNumber()+1; byId.setCurrentNumber(num); byId.setPurchaseNum(goodsGroupPurchaseInfo.getPurchaseNum()); goodsGroupPurchaseInfoServiceImpl.updateById(byId); if (num==byId.getGroupSize()){ byId.setGroupStatus(1); goodsGroupPurchaseInfoServiceImpl.updateById(byId); orderClient.updateOrderStatusByMubres1(byId.getMubre(), SecurityConstants.INNER); List<Order> listR = orderClient.updateOrderStatusByMubres2(byId.getMubre(), SecurityConstants.INNER).getData(); int i=0; for (Order l:listR){ i=i+l.getGoodsQuantity(); } GoodsGroupPurchaseInfo byIds = goodsGroupPurchaseInfoServiceImpl.getById(goodsGroupPurchaseInfo.getId()); GoodsGroupPurchase byId1 = goodsGroupPurchaseService.getById(byId.getGroupPurchaseId()); int i1 = byId1.getLimitNumber() * byId.getGroupSize(); if (i<i1){ int i3=i1-i; if (byIds.getPurchaseNum()<i1){ int i3=i1-byIds.getPurchaseNum(); GoodsSku goodsSku = goodsSkuMapper.selectById(byId1.getGoodsSkuId()); int i2 = i3 + goodsSku.getStock(); goodsSku.setStock(i2); @@ -131,7 +141,7 @@ } } goodsGroupPurchaseInfoServiceImpl.updateById(byId); }else{ if (goodsGroupPurchaseInfo.getCurrentNumber()==goodsGroupPurchaseInfo.getGroupSize()){ goodsGroupPurchaseInfo.setGroupStatus(1); @@ -139,16 +149,12 @@ } goodsGroupPurchaseInfoServiceImpl.save(goodsGroupPurchaseInfo); if (goodsGroupPurchaseInfo.getCurrentNumber()==goodsGroupPurchaseInfo.getGroupSize()) { List<Order> listR = orderClient.updateOrderStatusByMubres2(goodsGroupPurchaseInfo.getMubre(), SecurityConstants.INNER).getData(); int i = 0; for (Order l : listR) { i = i + l.getGoodsQuantity(); } GoodsGroupPurchase byId1 = goodsGroupPurchaseService.getById(goodsGroupPurchaseInfo.getGroupPurchaseId()); int i1 = byId1.getLimitNumber() * goodsGroupPurchaseInfo.getGroupSize(); if (i < i1) { int i3 = i1 - i; if (goodsGroupPurchaseInfo.getPurchaseNum() < i1) { int i3 = i1 - goodsGroupPurchaseInfo.getPurchaseNum(); GoodsSku goodsSku = goodsSkuMapper.selectById(byId1.getGoodsSkuId()); int i2 = i3 + goodsSku.getStock(); goodsSku.setStock(i2); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
@@ -239,6 +239,11 @@ @InnerAuth @PostMapping("/updOrderStatusByMubres2") R<List<Order>> updateOrderStatusByMubres2(@RequestBody String formedGroupMubres) { try { Thread.sleep(1000); } catch (InterruptedException e) { throw new RuntimeException(e); } orderService.updateOrderStatusByMubres2(formedGroupMubres); return R.ok(); } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -982,6 +982,7 @@ goodsGroupPurchaseInfo.setMubre(order.getGroupNo()); GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData(); if (goodsSeckiGoodsGroupPurchaseInfo!=null){ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(order.getGoodsQuantity()); GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); } @@ -1024,6 +1025,7 @@ goodsGroupPurchaseInfo.setMubre(order.getGroupNo()); GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData(); if (goodsSeckiGoodsGroupPurchaseInfo!=null){ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(order.getGoodsQuantity()); GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); } @@ -1089,11 +1091,9 @@ Order byId = this.getById(memberOrderListDTO.getId()); if(byId.getOrderNo().contains("TG")){ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo(); goodsGroupPurchaseInfo.setGroupPurchaseId(byId.getGoodsSkuId()); goodsGroupPurchaseInfo.setMubre(byId.getGroupNo()); GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo1(goodsGroupPurchaseInfo, SecurityConstants.INNER).getData(); GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(byId.getGroupNo(), SecurityConstants.INNER).getData(); if (goodsSeckiGoodsGroupPurchaseInfo!=null){ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(byId.getGoodsQuantity()); GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); } @@ -1815,6 +1815,9 @@ @Override public List<Order> updateOrderStatusByMubres2(String formedGroupMubres) { return this.lambdaQuery().eq(Order::getGroupNo, formedGroupMubres).list(); LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery(); wrapper.eq(Order::getGroupNo, formedGroupMubres); List<Order> page1 = this.list(wrapper); return page1; } } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -385,6 +385,8 @@ if (goodsSeckiGoodsGroupPurchaseInfo!=null){ page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre()); OrderMapper.updateById(page1); Integer i= goodsSeckiGoodsGroupPurchaseInfo.getPurchaseNum()+page1.getGoodsQuantity(); goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(i); goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); }else{ @@ -394,6 +396,7 @@ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo(); goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize()); goodsGroupPurchaseInfo.setCurrentNumber(1); goodsGroupPurchaseInfo.setPurchaseNum(page1.getGoodsQuantity()); goodsGroupPurchaseInfo.setMubre(uuid.toString()); goodsGroupPurchaseInfo.setGroupPurchaseId(goodsSeckiGoodsGroupPurchaseOne.getId()); goodsGroupPurchaseInfo.setGroupStatus(0); @@ -554,8 +557,10 @@ GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData(); GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData(); if (goodsSeckiGoodsGroupPurchaseInfo!=null){ OrderMapper.updateById(page1); page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre()); OrderMapper.updateById(page1); Integer i= goodsSeckiGoodsGroupPurchaseInfo.getPurchaseNum()+page1.getGoodsQuantity(); goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(i); goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER); }else{ @@ -565,6 +570,7 @@ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo(); goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize()); goodsGroupPurchaseInfo.setCurrentNumber(1); goodsGroupPurchaseInfo.setPurchaseNum(page1.getGoodsQuantity()); goodsGroupPurchaseInfo.setMubre(uuid.toString()); goodsGroupPurchaseInfo.setGroupPurchaseId(goodsSeckiGoodsGroupPurchaseOne.getId()); goodsGroupPurchaseInfo.setGroupStatus(0);
