顾绍勇 5 år sedan
förälder
incheckning
965aed3289

+ 20
- 5
src/main/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketHelpServiceImpl.java Visa fil

54
         }
54
         }
55
 
55
 
56
         // 校验活动是否开始
56
         // 校验活动是否开始
57
-        if (taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() < LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()
58
-                && (taRedPacketHelp.getHelpSuccesPersons() != null || taRedPacketHelp.getLimitNumPerDay() != null
59
-                || taRedPacketHelp.getLimitNumPerPerson() != null || taRedPacketHelp.getLimitNumForEachPerson() != null)) {
60
-            responseBean.addError("活动已开始,不可修改");
57
+        if (taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() < LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
58
+
59
+            // 活动开始,配置人数和次数限制不可修改
60
+            if ((taRedPacketHelp.getHelpSuccesPersons() != null || taRedPacketHelp.getLimitNumPerDay() != null
61
+                    || taRedPacketHelp.getLimitNumPerPerson() != null || taRedPacketHelp.getLimitNumForEachPerson() != null)) {
62
+                responseBean.addError("活动已开始,不可修改");
63
+                return responseBean;
64
+            }
65
+
66
+            // 活动开始,开始时间不可修改
67
+            if (taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() != taRedPacketHelp.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
68
+                responseBean.addError("活动已开始,开始时间不可修改");
69
+                return responseBean;
70
+            }
71
+        }
72
+
73
+        // 校验结束时间是否已经到达
74
+        if (taRedPacketHelp.getEndDate() != null && taRedPacket.getEndDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() < taRedPacketHelp.getEndDate().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
75
+            responseBean.addError("活动已结束,结束时间不可修改");
61
             return responseBean;
76
             return responseBean;
62
         }
77
         }
63
 
78
 
81
     }
96
     }
82
 
97
 
83
     @Override
98
     @Override
84
-    public ResponseBean getRedPacketHelpById(String activityId,Integer orgId) {
99
+    public ResponseBean getRedPacketHelpById(String activityId, Integer orgId) {
85
         ResponseBean responseBean = new ResponseBean();
100
         ResponseBean responseBean = new ResponseBean();
86
         TaRedPacketHelp taRedPacketHelp = getById(activityId);
101
         TaRedPacketHelp taRedPacketHelp = getById(activityId);
87
 
102