生成订单

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -185,6 +185,13 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
         RLock lock = redissonClient.getLock(itemIdKey);
         try {
             if (lock.tryLock(5, 5, TimeUnit.SECONDS)) {
+                Map<String, String> map = new HashMap<>();
+                //判断是否该商品已创建了订单
+                DistributionOrder searchOrder = distributionOrderDao.findByItemId(dto.getItemId());
+                if (searchOrder != null && com.xxdxxs.utils.StringUtils.hasLength(searchOrder.getDistributionOrderId())) {
+                    map.put("distributionOrderId", searchOrder.getDistributionOrderId());
+                    return Result.success(map);
+                }
                 String distributionOrderId = IdUtils.getOrderNumber(DISTRIBUTION_ORDER_PREFIX);
                 AuctionRecord auctionRecord = auctionRecordDao.findLastedRecord(dto.getItemId());
                 if (auctionRecord.getUserId().longValue() != dto.getBuyerId().longValue()) {
@@ -208,7 +215,6 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrder.setState(DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode());
                 distributionOrder.setType(DistributionEnum.DistributionTypeEnum.AUCTION.getCode());
                 distributionOrderDao.insert(distributionOrder);
-                Map<String, String> map = new HashMap<>();
                 map.put("distributionOrderId", distributionOrderId);
                 map.put("prepayId", null);
                 //计算分销商的利润
@@ -225,7 +231,6 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributorProfit.setCreateTime(new Date());
                 distributorProfit.setIsValid(false);
                 distributorProfitDao.insert(distributorProfit);
-
                 //发送中拍信息给用户
                 /**
                  *

ch-wx-api/src/main/java/com/wwdz/ch/wx/job/AutoCreateAuctionOrderJob.java

@@ -90,6 +90,7 @@ public class AutoCreateAuctionOrderJob {
                     if (distributionOrder == null || StringUtils.isEmpty(distributionOrder.getDistributionOrderId())) {
                         DistributionOrderRequestDto distributionOrderRequestDto = new DistributionOrderRequestDto();
                         distributionOrderRequestDto.setItemId(itemId);
+                        distributionOrderRequestDto.setBuyerId(auctionRecord.getUserId());
                         Result result = distributionOrderService.createAuctionOrder(distributionOrderRequestDto);
                         if (result.getSuccess()) {
                             logger.info("============== 拍卖 商品id:{}， 自动生成订单成功 ==============", itemId);