提交 538fa7d2 authored 作者: 吴德鹏's avatar 吴德鹏

update activity

上级 f7594bb9
...@@ -18,6 +18,7 @@ import java.text.DateFormat; ...@@ -18,6 +18,7 @@ import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Stream;
/** /**
* @Auther: wudepeng * @Auther: wudepeng
...@@ -159,7 +160,7 @@ public class ActivityController { ...@@ -159,7 +160,7 @@ public class ActivityController {
if (activityRepository.existsByUseType(1)) { if (activityRepository.existsByUseType(1)) {
List<Activity> fullList = activityRepository.findAllByUseType(1); List<Activity> fullList = activityRepository.findAllByUseType(1);
if (fullList.size() == 0 || fullList == null) { if (fullList.size() == 0 || fullList == null) {
return new Result(ResultCodeEnum.SERVICE_ERROR.getCode(),"There is no online activity"); return new Result(ResultCodeEnum.SERVICE_ERROR.getCode(), "There is no online activity");
} }
Activity activity = fullList.get(0); Activity activity = fullList.get(0);
String type = activity.getType().toString(); String type = activity.getType().toString();
...@@ -167,7 +168,7 @@ public class ActivityController { ...@@ -167,7 +168,7 @@ public class ActivityController {
Collections.sort(conList, Comparator.comparing(Condition::getKey)); Collections.sort(conList, Comparator.comparing(Condition::getKey));
// BigDecimal finalItemPrice = itemPrice; // BigDecimal finalItemPrice = itemPrice;
map.put("activity", activity);
if ("1".equals(type) || "2".equals(type)) { if ("1".equals(type) || "2".equals(type)) {
for (Condition con : conList) { for (Condition con : conList) {
double key = con.getKey(); double key = con.getKey();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论