Browse Source

* bug 修改

顾绍勇 4 years ago
parent
commit
4cb498dc94

+ 4
- 2
src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketController.java View File

2
 
2
 
3
 import com.alibaba.fastjson.JSON;
3
 import com.alibaba.fastjson.JSON;
4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
5
 import com.baomidou.mybatisplus.core.metadata.IPage;
6
 import com.baomidou.mybatisplus.core.metadata.IPage;
6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
 import com.huiju.estateagents.base.BaseController;
8
 import com.huiju.estateagents.base.BaseController;
8
 import com.huiju.estateagents.base.ResponseBean;
9
 import com.huiju.estateagents.base.ResponseBean;
10
+import com.huiju.estateagents.common.CommConstant;
11
+import com.huiju.estateagents.drainage.entity.TaDrainage;
12
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
9
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
13
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
10
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
14
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
11
 import com.huiju.estateagents.redpack.service.ITaRedPacketPersonService;
15
 import com.huiju.estateagents.redpack.service.ITaRedPacketPersonService;
18
 
22
 
19
 import javax.servlet.http.HttpServletRequest;
23
 import javax.servlet.http.HttpServletRequest;
20
 import javax.servlet.http.HttpServletResponse;
24
 import javax.servlet.http.HttpServletResponse;
21
-import java.time.LocalDate;
22
 import java.time.LocalDateTime;
25
 import java.time.LocalDateTime;
23
 import java.util.HashMap;
26
 import java.util.HashMap;
24
 import java.util.Map;
27
 import java.util.Map;
46
     @Autowired
49
     @Autowired
47
     private ITaRedPacketPersonService iTaRedPacketPersonService;
50
     private ITaRedPacketPersonService iTaRedPacketPersonService;
48
 
51
 
49
-
50
     /**
52
     /**
51
      * 分页查询列表
53
      * 分页查询列表
52
      *
54
      *

+ 21
- 5
src/main/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketServiceImpl.java View File

9
 import com.huiju.estateagents.base.ResponseBean;
9
 import com.huiju.estateagents.base.ResponseBean;
10
 import com.huiju.estateagents.common.CommConstant;
10
 import com.huiju.estateagents.common.CommConstant;
11
 import com.huiju.estateagents.common.StringUtils;
11
 import com.huiju.estateagents.common.StringUtils;
12
+import com.huiju.estateagents.drainage.entity.TaDrainage;
13
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
12
 import com.huiju.estateagents.entity.TaCustomerFrom;
14
 import com.huiju.estateagents.entity.TaCustomerFrom;
13
 import com.huiju.estateagents.entity.TaMiniapp;
15
 import com.huiju.estateagents.entity.TaMiniapp;
14
 import com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport;
16
 import com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport;
55
     @Autowired
57
     @Autowired
56
     private TaMiniappMapper taMiniappMapper;
58
     private TaMiniappMapper taMiniappMapper;
57
 
59
 
60
+    @Autowired
61
+    private TaDrainageMapper taDrainageMapper;
62
+
58
     @Override
63
     @Override
59
     @Transactional
64
     @Transactional
60
-    public ResponseBean initializeRedPacket(TaRedPacket record,Integer orgId) {
65
+    public ResponseBean initializeRedPacket(TaRedPacket record, Integer orgId) {
61
         ResponseBean responseBean = new ResponseBean();
66
         ResponseBean responseBean = new ResponseBean();
62
 
67
 
63
         // 获取小程序信息
68
         // 获取小程序信息
64
-        QueryWrapper<TaMiniapp> miniappQueryWrapper =new QueryWrapper<>();
65
-        miniappQueryWrapper.eq("org_id",orgId);
69
+        QueryWrapper<TaMiniapp> miniappQueryWrapper = new QueryWrapper<>();
70
+        miniappQueryWrapper.eq("org_id", orgId);
66
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(miniappQueryWrapper);
71
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(miniappQueryWrapper);
67
 
72
 
68
         // 初始化数据
73
         // 初始化数据
69
-        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getTempleActivityId(),record.getBuildingId(), record.getOrgId());
74
+        taRedPacketMapper.initRedPacket(record.getActivityId(), record.getName(), record.getQrcode(), record.getStartDate(), record.getEndDate(), record.getTempleActivityId(), record.getBuildingId(), record.getOrgId());
70
         taRedPacketMapper.initRedPacketHelp(record.getActivityId(), record.getTempleActivityId());
75
         taRedPacketMapper.initRedPacketHelp(record.getActivityId(), record.getTempleActivityId());
71
-        taRedPacketMapper.initRedPacketClient(record.getActivityId(), record.getName(), taMiniapp.getName(),record.getTempleActivityId());
76
+        taRedPacketMapper.initRedPacketClient(record.getActivityId(), record.getName(), taMiniapp.getName(), record.getTempleActivityId());
72
         taRedPacketMapper.initRedPacketMoney(record.getActivityId(), record.getTempleActivityId());
77
         taRedPacketMapper.initRedPacketMoney(record.getActivityId(), record.getTempleActivityId());
73
         taRedPacketMapper.initRedPacketImages(record.getActivityId(), record.getTempleActivityId());
78
         taRedPacketMapper.initRedPacketImages(record.getActivityId(), record.getTempleActivityId());
74
         responseBean.addSuccess("success");
79
         responseBean.addSuccess("success");
84
             return responseBean;
89
             return responseBean;
85
         }
90
         }
86
         saveRedPacketImages(taRedPacket, 2);
91
         saveRedPacketImages(taRedPacket, 2);
92
+
93
+        // 更新H5活动数据
94
+        UpdateWrapper<TaDrainage> taDrainageUpdateWrapper = new UpdateWrapper<>();
95
+        taDrainageUpdateWrapper.eq("activity_id", taRedPacket.getActivityId());
96
+        taDrainageUpdateWrapper.eq("status", CommConstant.STATUS_NORMAL);
97
+        taDrainageUpdateWrapper.eq("org_id", taRedPacket.getOrgId());
98
+
99
+        TaDrainage taDrainage = new TaDrainage();
100
+        taDrainage.setBuildingId(taRedPacket.getBuildingId());
101
+
102
+        taDrainageMapper.update(taDrainage, taDrainageUpdateWrapper);
87
         responseBean.addSuccess("success");
103
         responseBean.addSuccess("success");
88
         return responseBean;
104
         return responseBean;
89
     }
105
     }

+ 9
- 5
src/main/resources/mapper/redpack/TaRedPacketMapper.xml View File

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.*,
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,
144
             <if test = "endTime != null">
144
             <if test = "endTime != null">
145
                 AND t.visit_time &lt;= #{endTime}
145
                 AND t.visit_time &lt;= #{endTime}
146
             </if>
146
             </if>
147
-            ORDER BY
148
-              t.visit_time DESC
147
+        GROUP BY
148
+        t.person_id
149
+        ORDER BY
150
+        max( t.visit_time ) DESC
149
     </select>
151
     </select>
150
 
152
 
151
     <select id = "exportVisitRecordByCondition" resultType="com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport">
153
     <select id = "exportVisitRecordByCondition" resultType="com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport">
152
 
154
 
153
         SELECT
155
         SELECT
154
-        t.visit_time createDate,
156
+        max( t.visit_time ) createDate,
155
         t2.nickname,
157
         t2.nickname,
156
         t2.NAME as name,
158
         t2.NAME as name,
157
         t2.avatarurl,
159
         t2.avatarurl,
179
         <if test = "endTime != null">
181
         <if test = "endTime != null">
180
             AND t.visit_time &lt;= #{endTime}
182
             AND t.visit_time &lt;= #{endTime}
181
         </if>
183
         </if>
184
+        GROUP BY
185
+        t.person_id
182
         ORDER BY
186
         ORDER BY
183
-        t.visit_time DESC
187
+        max( t.visit_time ) DESC
184
     </select>
188
     </select>
185
 
189
 
186
 </mapper>
190
 </mapper>