Merge branch 'quanku_v2.7' into quanku_v2.7.1

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

@@ -26,6 +26,7 @@ public class SpecialPerformanceDaoImpl implements SpecialPerformanceDao {
         SpecialPerformanceExample.Criteria criteria = example.createCriteria();
         JdbcHelper.ifPresent(dto.getType(), criteria::andTypeEqualTo);
         JdbcHelper.ifPresent(dto.getState(), criteria::andStateEqualTo);
+        JdbcHelper.ifPresent(dto.getStateList(), criteria::andStateIn);
         JdbcHelper.ifPresent(dto.getFilterState(), criteria::andStateNotEqualTo);
         JdbcHelper.ifPresent(dto.getStartQueryTime(), criteria::andStartTimeLessThanOrEqualTo);
         JdbcHelper.ifPresent(dto.getEndQueryTime(), criteria::andStartTimeGreaterThanOrEqualTo);

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

@@ -163,7 +163,21 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
     @Override
     public Result findItemList(SpecialPerformanceRequestDto dto) {
         try {
-            SpecialPerformance specialPerformance = specialPerformanceDao.findById(dto.getSpecialPerformanceId());
+            SpecialPerformance specialPerformance = null;
+            //专场id为-1，返回默认第一个专场
+            if (dto.getSpecialPerformanceId() == -1) {
+                SpecialPerformanceRequestDto searchDto = new SpecialPerformanceRequestDto();
+                searchDto.setStateList(Arrays.asList(SpecialPerformanceEnum.StateEnum.PREVIEW.getCode(), SpecialPerformanceEnum.StateEnum.PROCESSING.getCode()));
+                List<SpecialPerformance> specialPerformanceList = specialPerformanceDao.find(searchDto);
+                if (!CollectionUtils.isEmpty(specialPerformanceList)) {
+                    specialPerformance = specialPerformanceList.get(0);
+                    dto.setSpecialPerformanceId(specialPerformance.getId());
+                } else {
+                    return Result.failed(8000, "没有专场");
+                }
+            } else {
+                specialPerformance = specialPerformanceDao.findById(dto.getSpecialPerformanceId());
+            }
             Map<String, Object> resultMap = new HashMap<>();
             List<SupplierItemVo> supplierItemVos = new ArrayList<>();
             SpecialPerformanceConfigRequestDto specialPerformanceConfigRequestDto = new SpecialPerformanceConfigRequestDto();
@@ -255,6 +269,7 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             resultMap.put("startTime", specialPerformance.getStartTime());
             resultMap.put("endTime", specialPerformance.getEndTime());
             resultMap.put("title", specialPerformance.getTitle());
+            resultMap.put("specialPerformanceId", specialPerformance.getId());
             //当前时间大于专场结束时间则修改专场的状态
             if (now.after(specialPerformance.getEndTime())) {
                 SpecialPerformance updateDto = new SpecialPerformance();