sweet接口提交

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/sweet/SweetYbActivityController.java

@@ -13,6 +13,7 @@ import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
 import com.liquidnet.service.smile.entity.SmileAgent;
 import com.liquidnet.service.sweet.dto.param.admin.SweetYbActivityListParam;
 import com.liquidnet.service.sweet.dto.param.admin.SweetYbActivityParam;
+import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
 import com.liquidnet.service.sweet.entity.SweetYbActivity;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -52,7 +53,7 @@ public class SweetYbActivityController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "activityId", value = "活动id"),
     })
-    public SweetYbActivity aDetails(String activityId) {
+    public SweetYbActivityVo aDetails(String activityId) {
         return sweetYbActivityService.aDetails(activityId);
     }
 
@@ -79,7 +80,7 @@ public class SweetYbActivityController {
     @ApiOperation("活动列表")
     @ResponseBody
     public TableDataInfo aList(SweetYbActivityListParam param) {
-        PageInfo<SweetYbActivity> result = sweetYbActivityService.aList(param);
+        PageInfo<SweetYbActivityVo> result = sweetYbActivityService.aList(param);
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(0);
         rspData.setRows(result.getList());

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetYbEnrollServiceImpl.java

@@ -18,11 +18,14 @@ import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
+
 /**
  * <p>
  * YB报名表 服务实现类
@@ -63,8 +66,18 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
     public ResponseDto<List<SweetYbActivityVo>> list() {
         List<String> list = redisDataUtils.getSweetYbActivityList();
         List<SweetYbActivityVo> voList = ObjectUtil.sweetYbActivityVoList();
+        LocalDateTime now = LocalDateTime.now();
         for (String id : list) {
             SweetYbActivityVo vo = redisDataUtils.getSweetYbActivityVo(id);
+            LocalDateTime st = LocalDateTime.parse(vo.getStartTime(),DTF_YMD_HMS);
+            LocalDateTime et = LocalDateTime.parse(vo.getEndTime(),DTF_YMD_HMS);
+            if(now.isAfter(et)){
+                vo.setStatus(9);
+            }else if(now.isBefore(st)){
+                vo.setStatus(0);
+            }else{
+                vo.setStatus(6);
+            }
             voList.add(vo);
         }
         voList = voList.stream().sorted(Comparator.comparing(SweetYbActivityVo::getEndTime, Comparator.reverseOrder())).collect(Collectors.toList());