* bug 修改

src/main/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketHelpServiceImpl.java

@@ -53,25 +53,34 @@ public class TaRedPacketHelpServiceImpl extends ServiceImpl<TaRedPacketHelpMappe
             return responseBean;
         }
 
+        // 查询h5 help数据
+        TaRedPacketHelp redPacketHelp = taRedPacketHelpMapper.selectById(taRedPacketHelp.getActivityId());
+        if (redPacketHelp == null) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
         // 校验活动是否开始
         if (taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() < LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
 
             // 活动开始，配置人数和次数限制不可修改
-            if ((taRedPacketHelp.getHelpSuccesPersons() != null || taRedPacketHelp.getLimitNumPerDay() != null
-                    || taRedPacketHelp.getLimitNumPerPerson() != null || taRedPacketHelp.getLimitNumForEachPerson() != null)) {
+            if ((taRedPacketHelp.getHelpSuccesPersons() != redPacketHelp.getHelpSuccesPersons() ||
+                    taRedPacketHelp.getLimitNumPerDay() != redPacketHelp.getLimitNumPerDay()
+                    || taRedPacketHelp.getLimitNumPerPerson() != redPacketHelp.getLimitNumPerPerson() ||
+                    taRedPacketHelp.getLimitNumForEachPerson() != redPacketHelp.getLimitNumForEachPerson())) {
                 responseBean.addError("活动已开始，不可修改");
                 return responseBean;
             }
 
             // 活动开始，开始时间不可修改
-            if (taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() != taRedPacketHelp.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
+            if (taRedPacketHelp.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() > taRedPacket.getStartDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() ) {
                 responseBean.addError("活动已开始，开始时间不可修改");
                 return responseBean;
             }
         }
 
         // 校验结束时间是否已经到达
-        if (taRedPacketHelp.getEndDate() != null && taRedPacket.getEndDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() < taRedPacketHelp.getEndDate().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
+        if (taRedPacketHelp.getEndDate() != null && taRedPacket.getEndDate().toInstant(ZoneOffset.of("+8")).toEpochMilli() < LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli()) {
             responseBean.addError("活动已结束，结束时间不可修改");
             return responseBean;
         }

src/main/resources/mapper/redpack/TaRedPacketMapper.xml

@@ -116,7 +116,7 @@
 
     <select id = "listVisitRecordByCondition" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
             SELECT
-            t.visit_time,
+            max(t.visit_time) visit_time,
             t2.nickname,
             t2.NAME as name,
             t2.avatarurl,
@@ -131,6 +131,7 @@
             t.org_id =  #{orgId}
             and t.event_type = 'h5'
             AND t.target_id = #{drainageId}
+            AND t3.person_id is not null
             <if test="sharePersonPhone != null and sharePersonPhone != ''">
                 AND t3.phone like CONCAT('%',#{sharePersonPhone}, '%')
             </if>
@@ -145,9 +146,9 @@
                 AND t.visit_time &lt;= #{endTime}
             </if>
         GROUP BY
-        t.person_id
+        t.person_id,t.share_person_id
         ORDER BY
-        t.visit_time DESC
+        max(t.visit_time) DESC
     </select>
 
     <select id = "exportVisitRecordByCondition" resultType="com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport">
@@ -168,6 +169,7 @@
         t.org_id =  #{orgId}
         and t.event_type = 'h5'
         AND t.target_id = #{drainageId}
+        AND t3.person_id is not null
         <if test="sharePersonPhone != null and sharePersonPhone != ''">
             AND t3.phone like CONCAT('%',#{sharePersonPhone}, '%')
         </if>
@@ -182,7 +184,7 @@
             AND t.visit_time &lt;= #{endTime}
         </if>
         GROUP BY
-        t.person_id
+        t.person_id,t.share_person_id
         ORDER BY
         t.visit_time  DESC
     </select>