瀏覽代碼

* bug 修改

顾绍勇 5 年之前
父節點
當前提交
a5ee373698

+ 13
- 4
src/main/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketHelpServiceImpl.java 查看文件

53
             return responseBean;
53
             return responseBean;
54
         }
54
         }
55
 
55
 
56
+        // 查询h5 help数据
57
+        TaRedPacketHelp redPacketHelp = taRedPacketHelpMapper.selectById(taRedPacketHelp.getActivityId());
58
+        if (redPacketHelp == null) {
59
+            responseBean.addError("fail");
60
+            return responseBean;
61
+        }
62
+
56
         // 校验活动是否开始
63
         // 校验活动是否开始
57
         if (taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() < LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
64
         if (taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() < LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
58
 
65
 
59
             // 活动开始,配置人数和次数限制不可修改
66
             // 活动开始,配置人数和次数限制不可修改
60
-            if ((taRedPacketHelp.getHelpSuccesPersons() != null || taRedPacketHelp.getLimitNumPerDay() != null
61
-                    || taRedPacketHelp.getLimitNumPerPerson() != null || taRedPacketHelp.getLimitNumForEachPerson() != null)) {
67
+            if ((taRedPacketHelp.getHelpSuccesPersons() != redPacketHelp.getHelpSuccesPersons() ||
68
+                    taRedPacketHelp.getLimitNumPerDay() != redPacketHelp.getLimitNumPerDay()
69
+                    || taRedPacketHelp.getLimitNumPerPerson() != redPacketHelp.getLimitNumPerPerson() ||
70
+                    taRedPacketHelp.getLimitNumForEachPerson() != redPacketHelp.getLimitNumForEachPerson())) {
62
                 responseBean.addError("活动已开始,不可修改");
71
                 responseBean.addError("活动已开始,不可修改");
63
                 return responseBean;
72
                 return responseBean;
64
             }
73
             }
65
 
74
 
66
             // 活动开始,开始时间不可修改
75
             // 活动开始,开始时间不可修改
67
-            if (taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() != taRedPacketHelp.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
76
+            if (taRedPacketHelp.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() > taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() ) {
68
                 responseBean.addError("活动已开始,开始时间不可修改");
77
                 responseBean.addError("活动已开始,开始时间不可修改");
69
                 return responseBean;
78
                 return responseBean;
70
             }
79
             }
71
         }
80
         }
72
 
81
 
73
         // 校验结束时间是否已经到达
82
         // 校验结束时间是否已经到达
74
-        if (taRedPacketHelp.getEndDate() != null && taRedPacket.getEndDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() < taRedPacketHelp.getEndDate().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
83
+        if (taRedPacketHelp.getEndDate() != null && taRedPacket.getEndDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() < LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
75
             responseBean.addError("活动已结束,结束时间不可修改");
84
             responseBean.addError("活动已结束,结束时间不可修改");
76
             return responseBean;
85
             return responseBean;
77
         }
86
         }

+ 6
- 4
src/main/resources/mapper/redpack/TaRedPacketMapper.xml 查看文件

116
 
116
 
117
     <select id = "listVisitRecordByCondition" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
117
     <select id = "listVisitRecordByCondition" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
118
             SELECT
118
             SELECT
119
-            t.visit_time,
119
+            max(t.visit_time) visit_time,
120
             t2.nickname,
120
             t2.nickname,
121
             t2.NAME as name,
121
             t2.NAME as name,
122
             t2.avatarurl,
122
             t2.avatarurl,
131
             t.org_id =  #{orgId}
131
             t.org_id =  #{orgId}
132
             and t.event_type = 'h5'
132
             and t.event_type = 'h5'
133
             AND t.target_id = #{drainageId}
133
             AND t.target_id = #{drainageId}
134
+            AND t3.person_id is not null
134
             <if test="sharePersonPhone != null and sharePersonPhone != ''">
135
             <if test="sharePersonPhone != null and sharePersonPhone != ''">
135
                 AND t3.phone like CONCAT('%',#{sharePersonPhone}, '%')
136
                 AND t3.phone like CONCAT('%',#{sharePersonPhone}, '%')
136
             </if>
137
             </if>
145
                 AND t.visit_time &lt;= #{endTime}
146
                 AND t.visit_time &lt;= #{endTime}
146
             </if>
147
             </if>
147
         GROUP BY
148
         GROUP BY
148
-        t.person_id
149
+        t.person_id,t.share_person_id
149
         ORDER BY
150
         ORDER BY
150
-        t.visit_time DESC
151
+        max(t.visit_time) DESC
151
     </select>
152
     </select>
152
 
153
 
153
     <select id = "exportVisitRecordByCondition" resultType="com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport">
154
     <select id = "exportVisitRecordByCondition" resultType="com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport">
168
         t.org_id =  #{orgId}
169
         t.org_id =  #{orgId}
169
         and t.event_type = 'h5'
170
         and t.event_type = 'h5'
170
         AND t.target_id = #{drainageId}
171
         AND t.target_id = #{drainageId}
172
+        AND t3.person_id is not null
171
         <if test="sharePersonPhone != null and sharePersonPhone != ''">
173
         <if test="sharePersonPhone != null and sharePersonPhone != ''">
172
             AND t3.phone like CONCAT('%',#{sharePersonPhone}, '%')
174
             AND t3.phone like CONCAT('%',#{sharePersonPhone}, '%')
173
         </if>
175
         </if>
182
             AND t.visit_time &lt;= #{endTime}
184
             AND t.visit_time &lt;= #{endTime}
183
         </if>
185
         </if>
184
         GROUP BY
186
         GROUP BY
185
-        t.person_id
187
+        t.person_id,t.share_person_id
186
         ORDER BY
188
         ORDER BY
187
         t.visit_time  DESC
189
         t.visit_time  DESC
188
     </select>
190
     </select>