问题修复3

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

@@ -341,6 +341,10 @@ public class AuctionRecordServiceImpl implements AuctionRecordService {
                     auctionRecordVo.setState(DistributionEnum.AuctionStateEnum.END.getCode());
                     auctionRecordVo.setStateName(DistributionEnum.AuctionStateEnum.END.getDes());
                 } else {
+                    if (lastedRecord.getUserId().longValue() == dto.getUserId().longValue()) {
+                        auctionRecordVo.setUserState(DistributionEnum.AuctionUserStateEnum.LEAD.getCode());
+                        auctionRecordVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.LEAD.getDes());
+                    }
                     auctionRecordVo.setState(DistributionEnum.AuctionStateEnum.IN_AUCTION.getCode());
                     auctionRecordVo.setStateName(DistributionEnum.AuctionStateEnum.IN_AUCTION.getDes());
                 }

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

@@ -189,6 +189,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
         RLock lock = redissonClient.getLock(itemIdKey);
         try {
             if (lock.tryLock(5, 5, TimeUnit.SECONDS)) {
+                AuctionRecord auctionRecord = auctionRecordDao.findLastedRecord(dto.getItemId());
+                if (auctionRecord.getUserId().longValue() != dto.getBuyerId().longValue()) {
+                    return Result.failed("下单信息错误");
+                }
+                String distributionOrderId = IdUtils.getOrderNumber(DISTRIBUTION_ORDER_PREFIX);
                 Map<String, String> map = new HashMap<>();
                 //判断是否该商品已创建了订单
                 DistributionOrder searchOrder = distributionOrderDao.findByItemId(dto.getItemId());
@@ -196,11 +201,6 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                     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()) {
-                    return Result.failed("下单信息错误");
-                }
                 Date now = new Date();
                 AuctionConfig auctionConfig = auctionConfigDao.findByItemId(dto.getItemId());
                 //查询用户第一次出价对应的分销商

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

@@ -429,6 +429,12 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                     }
                 }
             } else {
+                if (lastedRecord != null) {
+                    if (lastedRecord.getUserId().longValue() == dto.getUserId().longValue()) {
+                        auctionDetailVo.setUserState(DistributionEnum.AuctionUserStateEnum.LEAD.getCode());
+                        auctionDetailVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.LEAD.getDes());
+                    }
+                }
                 auctionDetailVo.setState(DistributionEnum.AuctionStateEnum.IN_AUCTION.getCode());
                 auctionDetailVo.setStateName(DistributionEnum.AuctionStateEnum.IN_AUCTION.getDes());
             }