* bug 修改

src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketController.java

@@ -2,10 +2,14 @@ package com.huiju.estateagents.redpack.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
 import com.huiju.estateagents.redpack.service.ITaRedPacketPersonService;
@@ -18,7 +22,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
@@ -46,7 +49,6 @@ public class TaRedPacketController extends BaseController {
     @Autowired
     private ITaRedPacketPersonService iTaRedPacketPersonService;
 
-
     /**
      * 分页查询列表
      *

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

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
 import com.huiju.estateagents.entity.TaCustomerFrom;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport;
@@ -55,20 +57,23 @@ public class TaRedPacketServiceImpl extends ServiceImpl<TaRedPacketMapper, TaRed
     @Autowired
     private TaMiniappMapper taMiniappMapper;
 
+    @Autowired
+    private TaDrainageMapper taDrainageMapper;
+
     @Override
     @Transactional
-    public ResponseBean initializeRedPacket(TaRedPacket record,Integer orgId) {
+    public ResponseBean initializeRedPacket(TaRedPacket record, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
 
         // 获取小程序信息
-        QueryWrapper<TaMiniapp> miniappQueryWrapper =new QueryWrapper<>();
-        miniappQueryWrapper.eq("org_id",orgId);
+        QueryWrapper<TaMiniapp> miniappQueryWrapper = new QueryWrapper<>();
+        miniappQueryWrapper.eq("org_id", orgId);
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(miniappQueryWrapper);
 
         // 初始化数据
-        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getTempleActivityId(),record.getBuildingId(), record.getOrgId());
+        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getTempleActivityId(), record.getBuildingId(), record.getOrgId());
         taRedPacketMapper.initRedPacketHelp(record.getActivityId(), record.getTempleActivityId());
-        taRedPacketMapper.initRedPacketClient(record.getActivityId(), record.getName(), taMiniapp.getName(),record.getTempleActivityId());
+        taRedPacketMapper.initRedPacketClient(record.getActivityId(), record.getName(), taMiniapp.getName(), record.getTempleActivityId());
         taRedPacketMapper.initRedPacketMoney(record.getActivityId(), record.getTempleActivityId());
         taRedPacketMapper.initRedPacketImages(record.getActivityId(), record.getTempleActivityId());
         responseBean.addSuccess("success");
@@ -84,6 +89,17 @@ public class TaRedPacketServiceImpl extends ServiceImpl<TaRedPacketMapper, TaRed
             return responseBean;
         }
         saveRedPacketImages(taRedPacket, 2);
+
+        // 更新H5活动数据
+        UpdateWrapper<TaDrainage> taDrainageUpdateWrapper = new UpdateWrapper<>();
+        taDrainageUpdateWrapper.eq("activity_id", taRedPacket.getActivityId());
+        taDrainageUpdateWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        taDrainageUpdateWrapper.eq("org_id", taRedPacket.getOrgId());
+
+        TaDrainage taDrainage = new TaDrainage();
+        taDrainage.setBuildingId(taRedPacket.getBuildingId());
+
+        taDrainageMapper.update(taDrainage, taDrainageUpdateWrapper);
         responseBean.addSuccess("success");
         return responseBean;
     }

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

@@ -116,7 +116,7 @@
 
     <select id = "listVisitRecordByCondition" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
             SELECT
-            t.*,
+            max( t.visit_time ) visit_time,
             t2.nickname,
             t2.NAME as name,
             t2.avatarurl,
@@ -144,14 +144,16 @@
             <if test = "endTime != null">
                 AND t.visit_time &lt;= #{endTime}
             </if>
-            ORDER BY
-              t.visit_time DESC
+        GROUP BY
+        t.person_id
+        ORDER BY
+        max( t.visit_time ) DESC
     </select>
 
     <select id = "exportVisitRecordByCondition" resultType="com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport">
 
         SELECT
-        t.visit_time createDate,
+        max( t.visit_time ) createDate,
         t2.nickname,
         t2.NAME as name,
         t2.avatarurl,
@@ -179,8 +181,10 @@
         <if test = "endTime != null">
             AND t.visit_time &lt;= #{endTime}
         </if>
+        GROUP BY
+        t.person_id
         ORDER BY
-        t.visit_time DESC
+        max( t.visit_time ) DESC
     </select>
 
 </mapper>