java/LiquorAuction.git

			@@ -163,7 +163,10 @@
			forepartAuctionSalesroomGoodsVO.setGoodsSkuName(goodsSku.getSkuName());
			forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode());
			forepartAuctionSalesroomGoodsVO.setStartingPrice(auctionSalesroomGoods.getStartingPrice());
			forepartAuctionSalesroomGoodsVO.setSalesroomStock(auctionSalesroomGoods.getSalesroomStock());
			// forepartAuctionSalesroomGoodsVO.setSalesroomStock(auctionSalesroomGoods.getSalesroomStock());
			forepartAuctionSalesroomGoodsVO.setBidNum(auctionSalesroomGoods.getBidNum());
			forepartAuctionSalesroomGoodsVO.setDealQuantity(auctionSalesroomGoods.getDealQuantity());
			forepartAuctionSalesroomGoodsVO.setMaxAmount(auctionSalesroomGoods.getMaxAmount());
			forepartAuctionSalesroomGoodsVO.setListingDuration(auctionSalesroomGoods.getListingDuration());
			forepartAuctionSalesroomGoodsVO.setStartTime(auctionSalesroomGoods.getStartTime());
			forepartAuctionSalesroomGoodsVO.setCoverPic(goodsSku.getScreenCoverPic());
			@@ -392,7 +395,8 @@

			GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
			goodsStockUpdDTO.setGoodsSkuId(salesroomGoods.getGoodsSkuId());
			goodsStockUpdDTO.setAuctionStock(salesroomGoods.getSalesroomStock());
			goodsStockUpdDTO.setAuctionStock(
			salesroomGoods.getBidNum() * salesroomGoods.getDealQuantity());
			goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
			SecurityConstants.INNER);

			@@ -519,7 +523,7 @@
			if (auctionBidRecordList.size() > 0) {
			//判断
			if (auctionBidRecordList.size() >= auctionSalesroomGoods.getBidNum()) {
			for (int i = 0; i < auctionSalesroomGoods.getSalesroomStock(); i++) {
			for (int i = 0; i < auctionSalesroomGoods.getBidNum(); i++) {
			AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
			auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
			Long orderId = AddOrder(auctionBidRecord.getTargetId(),
			@@ -538,7 +542,9 @@
			} else {
			GoodsStockUpdDTO goodsStockUpdDTO = new GoodsStockUpdDTO();
			goodsStockUpdDTO.setGoodsSkuId(auctionSalesroomGoods.getGoodsSkuId());
			goodsStockUpdDTO.setAuctionStock(auctionSalesroomGoods.getSalesroomStock()- auctionBidRecordList.size());
			goodsStockUpdDTO.setAuctionStock(auctionSalesroomGoods.getBidNum()
			* auctionSalesroomGoods.getDealQuantity() - auctionBidRecordList.size()
			* auctionSalesroomGoods.getDealQuantity());
			goodsSkuClient.updGoodsStock(Lists.newArrayList(goodsStockUpdDTO),
			SecurityConstants.INNER);

			@@ -569,13 +575,15 @@
			.equals(BidStatusEnum.SUCCESSFUL))
			.map(AuctionBidRecord::getMemberId)
			.collect(Collectors.toList());
			Map<Long, Long> bidMap = auctionBidRecordList.stream().collect(
			Collectors.toMap(AuctionBidRecord::getMemberId, AuctionBidRecord::getId));
			if (CollUtils.isNotEmpty(successMemberIdList)) {
			List<Member> successMemberList = memberClient.getMemberListByIds(
			successMemberIdList, SecurityConstants.INNER).getData();
			if (CollUtils.isNotEmpty(successMemberList)) {
			// 推送websocket消息
			sendWebsocketMsg(auctionSalesroomGoods.getId(), successMemberList, goodsSku, 1,
			orderIdMap);
			orderIdMap, bidMap);
			// 发送短信通知
			List<String> mobileList = successMemberList.stream().map(Member::getPhone)
			.collect(Collectors.toList());
			@@ -590,7 +598,7 @@
			if (CollUtils.isNotEmpty(failedMemberList)) {
			// 推送websocket消息
			sendWebsocketMsg(auctionSalesroomGoods.getId(), failedMemberList, goodsSku, 0,
			orderIdMap);
			orderIdMap, bidMap);
			// 发送短信通知
			List<String> mobileList = failedMemberList.stream().map(Member::getPhone)
			.collect(Collectors.toList());
			@@ -630,7 +638,7 @@
			* @param successFlag // 中标状态 1：中标 0：未中标
			*/
			private void sendWebsocketMsg(Long id, List<Member> memberList, GoodsSku goodsSku,
			Integer successFlag, Map<Long, String> userIdMap) {
			Integer successFlag, Map<Long, String> userIdMap, Map<Long, Long> bidMap) {
			for (Member member : memberList) {
			Map<String, Object> map = new ConcurrentHashMap<>();
			map.put("notification_type", NotificationTypeConstant.AUCTION_POPUP);
			@@ -639,6 +647,7 @@
			map.put("goods_name", Objects.nonNull(goodsSku) ? goodsSku.getSkuName() : "");
			map.put("success_flag", successFlag);
			map.put("order_id", successFlag == 1 ? userIdMap.getOrDefault(member.getId(), "") : "");
			map.put("auction_bid_record_id", bidMap.getOrDefault(member.getId(), 0L));
			String msg = JSONObject.toJSONString(map);
			sysUserClient.pushBatch(
			WebsocketMessageDTO.builder().message(msg).userId(member.getUserId()).build(),
			@@ -663,7 +672,10 @@
			AuctionSalesroomGoodsInfoVO.setGoodsSkuId(byId1.getId());
			AuctionSalesroomGoodsInfoVO.setGoodsSkuName(goodsSku.getSkuName());
			AuctionSalesroomGoodsInfoVO.setStartingPrice(byId1.getStartingPrice());
			AuctionSalesroomGoodsInfoVO.setSalesroomStock(byId1.getSalesroomStock());
			// AuctionSalesroomGoodsInfoVO.setSalesroomStock(byId1.getSalesroomStock());
			AuctionSalesroomGoodsInfoVO.setBidNum(byId1.getBidNum());
			AuctionSalesroomGoodsInfoVO.setMaxAmount(byId1.getMaxAmount());
			AuctionSalesroomGoodsInfoVO.setDealQuantity(byId1.getDealQuantity());
			AuctionSalesroomGoodsInfoVO.setSalesroomType(byId.getType().getCode());
			AuctionSalesroomGoodsInfoVO.setGoodsSkustatus(byId1.getStatus().getCode());
			AuctionSalesroomGoodsInfoVO.setListingDuration(byId1.getListingDuration());
			@@ -894,6 +906,5 @@
			order.setGoodsId(auctionSalesroomGoods.getGoodsSkuId());
			return orderClient.saveOrderOne(order, SecurityConstants.INNER).getData();
			}


			}