支持展示多个专场

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java

@@ -528,7 +528,6 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
                 auctionConfig.setRealEndTime(StringUtils.isEmpty(dto.getAuctionEndTime()) ? endTime : DateUtils.parseString(dto.getAuctionEndTime()));
                 auctionConfig.setStartPrice(StringUtils.isEmpty(dto.getStartPrice()) ? 0 : PriceUtil.convertPriceFromStr(dto.getStartPrice()));
                 auctionConfig.setAddExtent(StringUtils.isEmpty(dto.getAddExtent()) ? 5000 : PriceUtil.convertPriceFromStr(dto.getAddExtent()));
-                auctionConfig.setAddExtent(StringUtils.isEmpty(dto.getAddExtent()) ? 50 : PriceUtil.convertPriceFromStr(dto.getAddExtent()));
                 auctionConfig.setEstimatedPrice(StringUtils.isEmpty(dto.getEstimatedPrice()) ? 999999999 : PriceUtil.convertPriceFromStr(dto.getEstimatedPrice()));
                 auctionConfig.setCreateTime(now);
                 auctionConfig.setUpdateTime(now);

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

@@ -9,7 +9,7 @@ public interface SpecialPerformanceDao {
 
     List<SpecialPerformance> find(SpecialPerformanceRequestDto dto);
 
-    SpecialPerformance findByType(SpecialPerformanceRequestDto dto);
+    List<SpecialPerformance> findByType(SpecialPerformanceRequestDto dto);
 
     SpecialPerformance findById(int id);
 

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

@@ -35,12 +35,12 @@ public class SpecialPerformanceDaoImpl implements SpecialPerformanceDao {
     }
 
     @Override
-    public SpecialPerformance findByType(SpecialPerformanceRequestDto dto) {
+    public List<SpecialPerformance> findByType(SpecialPerformanceRequestDto dto) {
         SpecialPerformanceExample example = new SpecialPerformanceExample();
         SpecialPerformanceExample.Criteria criteria = example.createCriteria();
         criteria.andTypeEqualTo(dto.getType());
         JdbcHelper.ifPresent(dto.getStateList(), criteria::andStateIn);
-        return specialPerformanceMapper.selectOneByExample(example);
+        return specialPerformanceMapper.selectByExample(example);
     }
 
 

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

@@ -90,14 +90,15 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                     specialPerformanceDao.update(updateDto);
                 }
             }
+            List<SpecialPerformanceVo> resultList = new ArrayList<>();
 
-            SpecialPerformanceVo specialPerformanceVo = new SpecialPerformanceVo();
             dto.setStateList(Arrays.asList(SpecialPerformanceEnum.StateEnum.PREVIEW.getCode(), SpecialPerformanceEnum.StateEnum.PROCESSING.getCode()));
-            SpecialPerformance specialPerformance = specialPerformanceDao.findByType(dto);
-            if (specialPerformance == null) {
-                return Result.success(specialPerformanceVo);
+            List<SpecialPerformance> specialPerformances = specialPerformanceDao.findByType(dto);
+            if (CollectionUtils.isEmpty(specialPerformances)) {
+                return Result.success(resultList);
             }
-
+            for (SpecialPerformance specialPerformance : specialPerformances) {
+                SpecialPerformanceVo specialPerformanceVo = new SpecialPerformanceVo();
                 if (now.after(specialPerformance.getEndTime())) {
                     SpecialPerformance updateDto = new SpecialPerformance();
                     updateDto.setId(specialPerformance.getId());
@@ -140,7 +141,7 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                     supplierItemRequestDto.setIds(itemList);
                     supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
                 }
-            Map<Long, Integer> specialPerformanceConfigMap = list.stream().collect(Collectors.toMap(SpecialPerformanceConfig::getItemId, SpecialPerformanceConfig::getViewNum, (k1, k2) ->k2));
+                Map<Long, Integer> specialPerformanceConfigMap = list.stream().collect(Collectors.toMap(SpecialPerformanceConfig::getItemId, SpecialPerformanceConfig::getViewNum, (k1, k2) -> k2));
                 for (SupplierItem supplierItem : supplierItemList) {
                     Map<String, Object> map = new HashMap<>();
                     map.put("homePageImage", MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
@@ -150,7 +151,9 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                     dataList.add(map);
                 }
                 specialPerformanceVo.setItemList(dataList);
-            return Result.success(specialPerformanceVo);
+                resultList.add(specialPerformanceVo);
+            }
+            return Result.success(resultList);
         } catch (Exception e) {
             logger.error("查询专场信息失败 error : {}", e);
         }
@@ -278,10 +281,11 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             SpecialPerformanceRequestDto specialPerformanceRequestDto = new SpecialPerformanceRequestDto();
             specialPerformanceRequestDto.setType(SpecialPerformanceEnum.TypeEnum.AUCTION.getCode());
             specialPerformanceRequestDto.setState(SpecialPerformanceEnum.StateEnum.PROCESSING.getCode());
-            SpecialPerformance specialPerformance = specialPerformanceDao.findByType(specialPerformanceRequestDto);
-            if (specialPerformance == null) {
+            List<SpecialPerformance> specialPerformanceList = specialPerformanceDao.findByType(specialPerformanceRequestDto);
+            if (CollectionUtils.isEmpty(specialPerformanceList)) {
                 return Result.failed("专场信息为空");
             }
+            for (SpecialPerformance specialPerformance : specialPerformanceList) {
                 logger.info("当前进行的专场id:{}, 名称为 {} ", specialPerformance.getId(), specialPerformance.getTitle());
                 String progressKey = SPECIAL_PERFORMANCE_PROGRESS_SEND_MSG_KEY + specialPerformance.getId();
                 if (!redisUtils.hasKey(progressKey)) {
@@ -318,6 +322,7 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                 } else {
                     return Result.failed("24小时内只能执行一次专场进行中通知任务");
                 }
+            }
             return Result.success("专场进行中通知任务执行成功");
         } catch (Exception e) {
             logger.error("专场进行中通知任务 error {}", e);