取消商品关注

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/SpecialPerformanceItemFollowDaoImpl.java

@@ -25,7 +25,7 @@ public class SpecialPerformanceItemFollowDaoImpl implements SpecialPerformanceIt
     public List<SpecialPerformanceItemFollow> findAllList(SpecialPerformanceItemFollowRequestDto dto) {
         SpecialPerformanceItemFollowExample example = new SpecialPerformanceItemFollowExample();
         SpecialPerformanceItemFollowExample.Criteria criteria = example.createCriteria();
-        criteria.andSpecialPerformanceIdEqualTo(dto.getSpecialPerformanceId());
+        JdbcHelper.ifPresent(dto.getSpecialPerformanceId(), criteria::andSpecialPerformanceIdEqualTo);
         JdbcHelper.ifPresent(dto.getUserId(), criteria::andUserIdEqualTo);
         JdbcHelper.ifPresent(dto.getItemId(), criteria::andItemIdEqualTo);
         criteria.andStateEqualTo(1);

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

@@ -148,4 +148,14 @@ public class AuctionDetailVo implements Entity {
      */
     private String shareTip;
 
+    /**
+     * 商品在专场中是否被关注
+     */
+    private Boolean isFollowed;
+
+    /**
+     * 商品被关注的记录id
+     */
+    private Long followRecordId;
+
 }

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

@@ -58,7 +58,9 @@ public class SpecialPerformanceItemFollowServiceImpl implements SpecialPerforman
     public Result cancelItemFollow(SpecialPerformanceItemFollowRequestDto dto) {
         try {
             SpecialPerformanceItemFollow specialPerformanceItemFollow = new SpecialPerformanceItemFollow();
-            specialPerformanceItemFollow.setId(dto.getId());
+            specialPerformanceItemFollow.setSpecialPerformanceId(dto.getSpecialPerformanceId());
+            specialPerformanceItemFollow.setItemId(dto.getItemId());
+            specialPerformanceItemFollow.setUserId(dto.getUserId());
             specialPerformanceItemFollow.setUpdateTime(new Date());
             specialPerformanceItemFollow.setState(DisposableSubscribeRecordEnum.ItemFollowStateEnum.NOT_FOLLOWED.getCode());
             specialPerformanceItemFollowDao.update(specialPerformanceItemFollow);

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

@@ -10,10 +10,7 @@ import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.CacheUtil;
 import com.wwdz.ch.core.util.MediaUtil;
 import com.wwdz.ch.core.util.PriceUtil;
-import com.wwdz.ch.db.dao.CollectionBookSortDao;
-import com.wwdz.ch.db.dao.CollectorWhiteListDao;
-import com.wwdz.ch.db.dao.FollowFansRecordDao;
-import com.wwdz.ch.db.dao.SwitchDao;
+import com.wwdz.ch.db.dao.*;
 import com.wwdz.ch.db.dao.distribution.*;
 import com.wwdz.ch.db.domain.*;
 import com.wwdz.ch.db.domain.distribution.*;
@@ -140,6 +137,8 @@ public class SupplierItemServiceImpl implements SupplierItemService {
     @Autowired
     CollectorWhiteListDao collectorWhiteListDao;
 
+    @Autowired
+    SpecialPerformanceItemFollowDao specialPerformanceItemFollowDao;
 
 
     @Override
@@ -566,6 +565,16 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                 SpecialPerformanceConfig specialPerformanceConfig = specialPerformanceConfigList.get(0);
                 auctionDetailVo.setSpecialPerformanceId(specialPerformanceConfig.getSpecialPerformanceId());
                 auctionDetailVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(specialPerformanceConfig.getCurrentPrice()));
+                //查询用户是否关注该商品
+                SpecialPerformanceItemFollowRequestDto specialPerformanceItemFollowRequestDto = new SpecialPerformanceItemFollowRequestDto();
+                specialPerformanceItemFollowRequestDto.setSpecialPerformanceId(specialPerformanceConfig.getSpecialPerformanceId());
+                specialPerformanceItemFollowRequestDto.setItemId(itemId);
+                specialPerformanceItemFollowRequestDto.setUserId(dto.getUserId());
+                if (specialPerformanceItemFollowDao.isFollowed(specialPerformanceItemFollowRequestDto)) {
+                    auctionDetailVo.setIsFollowed(true);
+                } else {
+                    auctionDetailVo.setIsFollowed(false);
+                }
             }
 
             //查询商品竞拍信息
@@ -585,9 +594,10 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                 auctionRecordRowVos.add(auctionRecordRowVo);
             });
             auctionDetailVo.setPageSearchResult(PageSearchResult.of(pageInfo, auctionRecordRowVos));
-            AuctionRecord lastedRecord = auctionRecordDao.findLastedRecord(itemId);
 
 
+
+            AuctionRecord lastedRecord = auctionRecordDao.findLastedRecord(itemId);
             //当前价
             if (CollectionUtils.isEmpty(auctionRecordList)) {
                 auctionDetailVo.setUserState(DistributionEnum.AuctionUserStateEnum.PROCESS.getCode());