个人主页

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/SelfPageInfoVo.java

@@ -30,6 +30,11 @@ public class SelfPageInfoVo implements Entity {
 
     private String userName;
 
+    /**
+     * 用户出价的商品数量，统计正在拍卖中的
+     */
+    private Integer userOfferNum;
+
     /**
      * 头像
      */

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

@@ -138,7 +138,6 @@ public class AuctionRecordServiceImpl implements AuctionRecordService {
                 addRecord.setUserId(dto.getUserId());
                 addRecord.setUserOpenId(dto.getUserOpenId());
                 auctionRecordDao.insert(addRecord);
-
                 //如果当前时间是拍卖截止时间的最后五分钟内，则再延长五分钟
                 Instant instant = endTime.toInstant().minus(Duration.ofMinutes(5));
                 Date time = Date.from(instant);
@@ -253,7 +252,7 @@ public class AuctionRecordServiceImpl implements AuctionRecordService {
     public Result findList(AuctionRecordRequestDto dto) {
         try {
             List<AuctionRecordVo> auctionRecordVos = new ArrayList<>();
-            AuctionRecordVo auctionRecordVo = new AuctionRecordVo();
+
             //查询4天内出价记录
             Date now = new Date();
             Instant instant = now.toInstant().minus(Duration.ofDays(4));
@@ -264,6 +263,7 @@ public class AuctionRecordServiceImpl implements AuctionRecordService {
                 return Result.success();
             }
             itemIds.forEach(itemId -> {
+                AuctionRecordVo auctionRecordVo = new AuctionRecordVo();
                 //查询商品信息
                 SupplierItem supplierItem = supplierItemDao.findById(itemId);
                 auctionRecordVo.setItemId(itemId);

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

@@ -6,9 +6,9 @@ import com.wwdz.ch.core.util.CacheUtil;
 import com.wwdz.ch.core.util.PriceUtil;
 import com.wwdz.ch.core.util.RedisUtils;
 import com.wwdz.ch.db.bean.DistributionOrderNum;
-import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
-import com.wwdz.ch.db.dao.distribution.DistributorProfitDao;
-import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
+import com.wwdz.ch.db.dao.distribution.*;
+import com.wwdz.ch.db.domain.distribution.AuctionConfig;
+import com.wwdz.ch.db.domain.distribution.AuctionRecord;
 import com.wwdz.ch.wx.entity.request.SelfPageRequestDto;
 import com.wwdz.ch.wx.entity.vo.distribution.SelfPageInfoVo;
 import com.wwdz.ch.wx.service.distribution.SelfPageService;
@@ -24,8 +24,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -39,6 +43,12 @@ public class SelfPageServiceImpl implements SelfPageService {
     @Autowired
     DistributionOrderDao distributionOrderDao;
 
+    @Autowired
+    AuctionRecordDao auctionRecordDao;
+
+    @Autowired
+    AuctionConfigDao auctionConfigDao;
+
     @Autowired
     CacheUtil cacheUtil;
 
@@ -88,6 +98,21 @@ public class SelfPageServiceImpl implements SelfPageService {
                 distributionOrderNum.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrderNum.getState()));
             });
             selfPageInfoVo.setOrderNum(distributionOrderNumList);
+
+            //查询4天内出价记录
+            Date now = new Date();
+            Instant instant = now.toInstant().minus(Duration.ofDays(4));
+            Date queryStartTime = Date.from(instant);
+            List<AuctionRecord> auctionRecords = auctionRecordDao.findRecordByUserId(dto.getUserId(), queryStartTime, now);
+            List<Long> itemIds = auctionRecords.stream().map(AuctionRecord::getItemId).distinct().collect(Collectors.toList());
+            int num = 0;
+            for (long itemId : itemIds) {
+                AuctionConfig auctionConfig = auctionConfigDao.findByItemId(itemId);
+                if (auctionConfig.getRealEndTime().after(now) && auctionConfig.getIsValid()) {
+                    num = num + 1;
+                }
+            }
+            selfPageInfoVo.setUserOfferNum(num);
             return Result.success(selfPageInfoVo);
         } catch (Exception e) {
             logger.error("查询用户个人主页失败 error : {}", e);