ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java
@@ -63,6 +63,10 @@ @ApiModelProperty(value = "分享图片") private String sharePic; @ApiModelProperty(value = "竞拍协议") @NotBlank(message = "竞拍协议不能为空") private String auctionAgreement; @Valid @ApiModelProperty("拍卖商品") @NotEmpty(message = "拍卖商品不能为空") ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomGoodsDTO.java
@@ -28,7 +28,7 @@ private BigDecimal minimumMarkupAmount; @ApiModelProperty(value = "拍品数量") @NotNull(message = "拍品数量不能为空") // @NotNull(message = "拍品数量不能为空") private Integer salesroomStock; @ApiModelProperty(value = "兜底成交个数") @@ -46,5 +46,15 @@ @ApiModelProperty(value = "商品介绍") private String description; @ApiModelProperty(value = "一次性每人成交数量") private Integer dealQuantity; @ApiModelProperty(value = "可中拍人数") @NotNull(message = "可中拍人数不能为空") private Integer bidNum; @ApiModelProperty(value = "最高出价金额") private BigDecimal maxAmount; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java
@@ -59,8 +59,15 @@ @ApiModelProperty(value = "已拍数量") private Integer bidQuantity = 0; @ApiModelProperty(value = "一次性每人成交数量") private Integer dealQuantity; @ApiModelProperty(value = "可中拍人数") private Integer bidNum; @ApiModelProperty(value = "最高出价金额") private BigDecimal maxAmount; @ApiModelProperty(value = "已拍人数") private Integer bidPersonCount = 0; @@ -74,10 +81,7 @@ @ApiModelProperty(value = "商品介绍") private String description; @ApiModelProperty(value = "最高出价金额") private BigDecimal maxAmount; @ApiModelProperty(value = "一次性每人成交数量") private Integer dealQuantity; } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
@@ -86,7 +86,6 @@ * @param id 拍卖场id * @return 二维码 */ String getQrCode(Long id) throws Exception; PayInfoVO SaveSignUpNow(MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO);
@@ -959,7 +959,7 @@ // 计算每个拍卖场所有拍品数量 Map<Long, Integer> map = auctionSalesroomGoods.stream() .collect(Collectors.groupingBy(AuctionSalesroomGoods::getAuctionSalesroomId, Collectors.summingInt(AuctionSalesroomGoods::getSalesroomStock))); Collectors.summingInt(AuctionSalesroomGoods::getBidNum))); for (MgtAuctionSalesroomVO mgtAuctionSalesroomVO : list) { Integer i = map.get(mgtAuctionSalesroomVO.getId()); if (StringUtils.isNotNull(i)) { @@ -970,26 +970,6 @@ return auctionSalesroomVOPageDTO; } /** * 查看二维码 * * @param id 拍卖场id * @return 二维码 */ @Override public String getQrCode(Long id) throws Exception { AuctionSalesroom auctionSalesroom = this.getById(id); if (StringUtils.isBlank(auctionSalesroom.getQrCode())) { AuctionSalesroomQrCodeVO vo = new AuctionSalesroomQrCodeVO(); vo.setAuctionSalesroomNo(auctionSalesroom.getAuctionSalesroomNo()); vo.setType(auctionSalesroom.getType().getCode()); String url = remoteFileService.obsUpload( CreateQrCode.createQRCodeStream(objectMapper.writeValueAsString(vo))).getData(); auctionSalesroom.setQrCode(url); this.updateById(auctionSalesroom); } return auctionSalesroom.getQrCode(); } @Override @Transactional @@ -1008,8 +988,8 @@ if (StringUtils.isNull(data.getMinimumMarkupAmount())) { throw new ServiceException("拍卖商品最低加价金额不能为空"); } if (StringUtils.isNull(data.getSalesroomStock())) { throw new ServiceException("拍卖商品拍品数量不能为空"); if (StringUtils.isNull(data.getBidNum())) { throw new ServiceException("可中拍人数不能为空"); } if (StringUtils.isNull(data.getListingDuration())) { throw new ServiceException("拍卖商品拍卖时间不能为空"); @@ -1029,15 +1009,12 @@ AuctionSalesroomQrCodeVO vo = new AuctionSalesroomQrCodeVO(); vo.setAuctionSalesroomNo(nextId.toString()); vo.setType(auctionSalesroom.getType().getCode()); String url = remoteFileService.obsUpload( CreateQrCode.createQRCodeStream(objectMapper.writeValueAsString(vo))).getData(); auctionSalesroom.setQrCode(url); // 添加 this.save(auctionSalesroom); List<GoodsStockUpdDTO> goodsStockUpdDTOS = auctionSalesroomGoods.stream().map(item -> { GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO(); goodsStockUpdDTO.setGoodsSkuId(item.getGoodsSkuId()); goodsStockUpdDTO.setAuctionStock(item.getSalesroomStock() * -1); goodsStockUpdDTO.setAuctionStock(item.getBidNum() * -1 * item.getDealQuantity()); return goodsStockUpdDTO; }).collect(Collectors.toList()); goodsSkuClient.updGoodsStock(goodsStockUpdDTOS, SecurityConstants.INNER); @@ -1058,10 +1035,6 @@ AuctionSalesroomQrCodeVO vo = new AuctionSalesroomQrCodeVO(); vo.setAuctionSalesroomNo(auctionSalesroomOrg.getAuctionSalesroomNo()); vo.setType(auctionSalesroom.getType().getCode()); String url = remoteFileService.obsUpload( CreateQrCode.createQRCodeStream(objectMapper.writeValueAsString(vo))) .getData(); auctionSalesroom.setQrCode(url); } this.updateById(auctionSalesroom); List<AuctionSalesroomGoods> list = auctionSalesroomGoodsMapper.selectList( @@ -1075,8 +1048,8 @@ .map(auctionSalesroomGood -> { GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO(); goodsStockUpdDTO.setGoodsSkuId(salesroomGoods.getGoodsSkuId()); goodsStockUpdDTO.setAuctionStock(salesroomGoods.getSalesroomStock() - auctionSalesroomGood.getSalesroomStock()); goodsStockUpdDTO.setAuctionStock(salesroomGoods.getBidNum() * salesroomGoods.getDealQuantity() - auctionSalesroomGood.getBidNum() * auctionSalesroomGood.getDealQuantity()); return goodsStockUpdDTO; })) .collect(Collectors.toList()); ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/util/weChat/WeChatUtil.java
@@ -6,6 +6,7 @@ import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.ruoyi.auction.util.CreateQrCode; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.system.api.RemoteFileService; import lombok.extern.slf4j.Slf4j; @@ -13,12 +14,14 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.HashMap; import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; /** @@ -235,8 +238,9 @@ */ public String getwxacodeunlimit(String page, String scene, EnvVersion env_version, String filePath){ InputStream getwxacodeunlimit = getwxacodeunlimit(page, scene, env_version); MultipartFile multipartFile = CreateQrCode.getMultipartFile(getwxacodeunlimit, UUID.randomUUID() + ".png"); // File file = FileUtil.writeFromStream(getwxacodeunlimit, new File(filePath)); // return file.getPath(); return remoteFileService.obsUpload("png", getwxacodeunlimit).getData(); return remoteFileService.obsUpload(multipartFile).getData(); } } ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
@@ -23,14 +23,13 @@ nacos: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 server-addr: 192.168.110.188:8848 service: ${spring.application.name} group: DEFAULT_GROUP namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be ip: 192.168.110.188 config: # 配置中心地址 server-addr: 127.0.0.1:8848 server-addr: 192.168.110.188:8848 namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be group: DEFAULT_GROUP name: ${spring.application.name} ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -17,13 +17,13 @@ nacos: discovery: # 服务注册地址 server-addr: 127.0.0.1:8848 server-addr: 192.168.110.188:8848 service: ${spring.application.name} group: DEFAULT_GROUP namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be config: # 配置中心地址 server-addr: 127.0.0.1:8848 server-addr: 192.168.110.188:8848 namespace: 689e0f09-d102-460c-ac5c-5ea50a3174be group: DEFAULT_GROUP name: ${spring.application.name}
