顾绍勇 5 gadus atpakaļ
vecāks
revīzija
78ef1d0ba1

+ 6
- 0
src/main/java/com/huiju/estateagents/controller/TaQrcodeController.java Parādīt failu

8
 import com.huiju.estateagents.entity.TaQrcode;
8
 import com.huiju.estateagents.entity.TaQrcode;
9
 import com.huiju.estateagents.service.IMiniAppService;
9
 import com.huiju.estateagents.service.IMiniAppService;
10
 import com.huiju.estateagents.service.ITaQrcodeService;
10
 import com.huiju.estateagents.service.ITaQrcodeService;
11
+import org.apache.commons.lang3.StringUtils;
11
 import org.slf4j.Logger;
12
 import org.slf4j.Logger;
12
 import org.slf4j.LoggerFactory;
13
 import org.slf4j.LoggerFactory;
13
 import org.springframework.beans.factory.annotation.Autowired;
14
 import org.springframework.beans.factory.annotation.Autowired;
76
     public ResponseBean saveQrcode(@RequestBody TaQrcode taQrcode, HttpServletRequest request) {
77
     public ResponseBean saveQrcode(@RequestBody TaQrcode taQrcode, HttpServletRequest request) {
77
         ResponseBean responseBean = new ResponseBean();
78
         ResponseBean responseBean = new ResponseBean();
78
         try {
79
         try {
80
+            // 校验参数
81
+            if (StringUtils.isBlank(taQrcode.getTargetId()) || StringUtils.isBlank(taQrcode.getTargetType())) {
82
+                responseBean.addError("参数错误");
83
+                return responseBean;
84
+            }
79
             responseBean = iTaQrcodeService.saveQrcode(taQrcode, getUserId(request), getOrgId(request));
85
             responseBean = iTaQrcodeService.saveQrcode(taQrcode, getUserId(request), getOrgId(request));
80
         } catch (Exception e) {
86
         } catch (Exception e) {
81
             e.printStackTrace();
87
             e.printStackTrace();

+ 3
- 2
src/main/java/com/huiju/estateagents/service/impl/TaQrcodeServiceImpl.java Parādīt failu

92
         qrcodeQueryWrapper.eq(taQrcode.getChannelId() != null, "channel_id", taQrcode.getChannelId());
92
         qrcodeQueryWrapper.eq(taQrcode.getChannelId() != null, "channel_id", taQrcode.getChannelId());
93
         qrcodeQueryWrapper.eq("target_type", taQrcode.getTargetType());
93
         qrcodeQueryWrapper.eq("target_type", taQrcode.getTargetType());
94
         qrcodeQueryWrapper.eq("target_id", taQrcode.getTargetId());
94
         qrcodeQueryWrapper.eq("target_id", taQrcode.getTargetId());
95
+        qrcodeQueryWrapper.gt("status", CommConstant.STATUS_DELETE);
95
         TaQrcode taQrCodeCheck = taQrcodeMapper.selectOne(qrcodeQueryWrapper);
96
         TaQrcode taQrCodeCheck = taQrcodeMapper.selectOne(qrcodeQueryWrapper);
96
         if (taQrCodeCheck != null) {
97
         if (taQrCodeCheck != null) {
97
             responseBean.addError("请勿重复提交");
98
             responseBean.addError("请勿重复提交");
115
 
116
 
116
         // 生成二维码
117
         // 生成二维码
117
         String paramsStr = WxQrCodeUtils.generateSceneAndPage(taQrcode.getTargetType(), "",
118
         String paramsStr = WxQrCodeUtils.generateSceneAndPage(taQrcode.getTargetType(), "",
118
-                taQrcode.getTargetId(), taQrcode.getTargetType(), taQrcode.getChannelId() + "", taQrcode.getQrCodeId() + "", taQrcode.getBuildingId());
119
+                taQrcode.getTargetId(), taQrcode.getTargetType(), String.valueOf(taQrcode.getChannelId()), String.valueOf(taQrcode.getQrCodeId()), taQrcode.getBuildingId());
119
         ResponseBean qrCodeResult = iMiniAppService.getQrCode(paramsStr, taMiniapp.getMiniappId());
120
         ResponseBean qrCodeResult = iMiniAppService.getQrCode(paramsStr, taMiniapp.getMiniappId());
120
         if (qrCodeResult != null && ResponseBean.CODE_SUCCESS == qrCodeResult.getCode()) {
121
         if (qrCodeResult != null && ResponseBean.CODE_SUCCESS == qrCodeResult.getCode()) {
121
             // 更新数据
122
             // 更新数据
209
             case 3:
210
             case 3:
210
                 List<QrCodeNewPersonNum> records3 = taQrcodeMapper.getNewPersonsRecordExport(qrCodeId, orgId);
211
                 List<QrCodeNewPersonNum> records3 = taQrcodeMapper.getNewPersonsRecordExport(qrCodeId, orgId);
211
                 fileName = URLEncoder.encode("新增注册用户", "UTF-8");
212
                 fileName = URLEncoder.encode("新增注册用户", "UTF-8");
212
-                response.setHeader("Content-disposition", "attachment;filename="+fileName+".xlsx");
213
+                response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
213
                 EasyExcel.write(response.getOutputStream(), QrCodeNewPersonNum.class).sheet("新增注册用户").doWrite(records3);
214
                 EasyExcel.write(response.getOutputStream(), QrCodeNewPersonNum.class).sheet("新增注册用户").doWrite(records3);
214
                 break;
215
                 break;
215
             default:
216
             default:

+ 33
- 24
src/main/resources/mapper/TaQrcodeMapper.xml Parādīt failu

37
             ta_person_visit_record t
37
             ta_person_visit_record t
38
         WHERE
38
         WHERE
39
             t.org_id = #{orgId}
39
             t.org_id = #{orgId}
40
-            AND t.qrcode_id = #{qrCodeId}
40
+            AND t.qr_code_id = #{qrCodeId}
41
     </select>
41
     </select>
42
 
42
 
43
     <select id="getVisitNum" resultType="java.lang.Integer">
43
     <select id="getVisitNum" resultType="java.lang.Integer">
47
             ta_person_visit_record t
47
             ta_person_visit_record t
48
         WHERE
48
         WHERE
49
             t.org_id = #{orgId}
49
             t.org_id = #{orgId}
50
-            AND t.qrcode_id = #{qrCodeId}
50
+            AND t.qr_code_id = #{qrCodeId}
51
     </select>
51
     </select>
52
 
52
 
53
     <select id="getNewPersons" resultType="java.lang.Integer">
53
     <select id="getNewPersons" resultType="java.lang.Integer">
64
         SELECT
64
         SELECT
65
             t.*,
65
             t.*,
66
             IFNULL(t2.`name`,t2.nickname) userName,
66
             IFNULL(t2.`name`,t2.nickname) userName,
67
-            t2.tel userTel,
68
-            t2.sex,
69
-            t2.city,
70
-            sum(t.record_id) accessCount
67
+            t2.phone userTel,
68
+            t2.gender sex,
69
+            t3.shortname city,
70
+            count(*) accessCount
71
         FROM
71
         FROM
72
             ta_person_visit_record t
72
             ta_person_visit_record t
73
-            left join ta_person t2
74
-            on t.person_id = t2.person_id
73
+            left join ta_person t2 on t.person_id = t2.person_id
74
+            LEFT JOIN td_city t3 ON t2.city = t3.id
75
         WHERE
75
         WHERE
76
             t.org_id = #{orgId}
76
             t.org_id = #{orgId}
77
-            AND t.qrcode_id = #{qrCodeId}
77
+            AND t.qr_code_id = #{qrCodeId}
78
         GROUP BY
78
         GROUP BY
79
 	        t.person_id
79
 	        t.person_id
80
     </select>
80
     </select>
82
     <select id="getVisitPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitPersonNum">
82
     <select id="getVisitPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitPersonNum">
83
         SELECT
83
         SELECT
84
             IFNULL( t2.`name`, t2.nickname ) nickName,
84
             IFNULL( t2.`name`, t2.nickname ) nickName,
85
-            t2.tel phone,
86
-            t2.sex gender,
87
-            t2.city province,
88
-            sum( t.record_id ) visitNum
85
+            t2.phone phone,
86
+            t2.gender gender,
87
+            t3.shortname province,
88
+            count( * ) visitNum
89
         FROM
89
         FROM
90
             ta_person_visit_record t
90
             ta_person_visit_record t
91
             LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
91
             LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
92
+            LEFT JOIN td_city t3 ON t2.city = t3.id
92
         WHERE
93
         WHERE
93
             t.org_id = #{orgId}
94
             t.org_id = #{orgId}
94
 
95
 
95
-            AND t.qrcode_id = #{qrCodeId}
96
+            AND t.qr_code_id = #{qrCodeId}
96
 
97
 
97
         GROUP BY
98
         GROUP BY
98
             t.person_id
99
             t.person_id
102
         SELECT
103
         SELECT
103
             t.*,
104
             t.*,
104
             IFNULL( t2.`name`, t2.nickname ) userName,
105
             IFNULL( t2.`name`, t2.nickname ) userName,
105
-            t2.tel userTel,
106
-            t2.sex,
107
-            t2.city
106
+            t2.phone userTel,
107
+            t2.gender sex,
108
+            t3.shortname city
108
         FROM
109
         FROM
109
             ta_person_visit_record t
110
             ta_person_visit_record t
110
             LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
111
             LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
112
+            LEFT JOIN td_city t3 ON t2.city = t3.id
111
         WHERE
113
         WHERE
112
             t.org_id = #{orgId}
114
             t.org_id = #{orgId}
113
-            AND t.qrcode_id = #{qrCodeId}
115
+            AND t.qr_code_id = #{qrCodeId}
114
     </select>
116
     </select>
115
 
117
 
116
     <select id="getVisitNumRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum">
118
     <select id="getVisitNumRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum">
117
         SELECT
119
         SELECT
118
             IFNULL( t2.`name`, t2.nickname ) nickName,
120
             IFNULL( t2.`name`, t2.nickname ) nickName,
119
-            t2.tel phone,
120
-            t2.sex gender,
121
-            t2.city province,
121
+            t2.phone phone,
122
+            t2.gender gender,
123
+            t3.shortname province,
122
 			t.visit_time visitTime
124
 			t.visit_time visitTime
123
         FROM
125
         FROM
124
             ta_person_visit_record t
126
             ta_person_visit_record t
125
             LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
127
             LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
128
+            LEFT JOIN td_city t3 ON t2.city = t3.id
126
         WHERE
129
         WHERE
127
             t.org_id = #{orgId}
130
             t.org_id = #{orgId}
128
-            AND t.qrcode_id = #{qrCodeId}
131
+            AND t.qr_code_id = #{qrCodeId}
129
     </select>
132
     </select>
130
 
133
 
131
     <select id="getNewPersonsRecord" resultType="com.huiju.estateagents.entity.TaCustomerFrom">
134
     <select id="getNewPersonsRecord" resultType="com.huiju.estateagents.entity.TaCustomerFrom">
134
             t2.`name` userName,
137
             t2.`name` userName,
135
             t2.phone userTel,
138
             t2.phone userTel,
136
             t2.sex,
139
             t2.sex,
137
-            t2.city ,
140
+            t3.shortname city,
138
             t2.create_date registerTime
141
             t2.create_date registerTime
139
         FROM
142
         FROM
140
             ta_customer_from t
143
             ta_customer_from t
141
             LEFT JOIN ta_recommend_customer t2 ON t.person_id = t2.person_id
144
             LEFT JOIN ta_recommend_customer t2 ON t.person_id = t2.person_id
145
+            LEFT JOIN td_city t3 ON t2.city = t3.id
142
         WHERE
146
         WHERE
143
             t.org_id = #{orgId}
147
             t.org_id = #{orgId}
144
             AND t.qr_code_id = #{qrCodeId}
148
             AND t.qr_code_id = #{qrCodeId}
149
+        GROUP BY
150
+	        t.customer_id
145
     </select>
151
     </select>
146
 
152
 
147
     <select id="getNewPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum">
153
     <select id="getNewPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum">
149
             t2.`name` nickName,
155
             t2.`name` nickName,
150
             t2.phone,
156
             t2.phone,
151
             t2.sex gender,
157
             t2.sex gender,
152
-            t2.city province,
158
+            t3.shortname province,
153
             t.create_date registerTime
159
             t.create_date registerTime
154
         FROM
160
         FROM
155
             ta_customer_from t
161
             ta_customer_from t
156
             LEFT JOIN ta_recommend_customer t2 ON t.person_id = t2.person_id
162
             LEFT JOIN ta_recommend_customer t2 ON t.person_id = t2.person_id
163
+            LEFT JOIN td_city t3 ON t2.city = t3.id
157
         WHERE
164
         WHERE
158
             t.org_id = #{orgId}
165
             t.org_id = #{orgId}
159
             AND t.qr_code_id = #{qrCodeId}
166
             AND t.qr_code_id = #{qrCodeId}
167
+        GROUP BY
168
+	        t.customer_id
160
     </select>
169
     </select>
161
 
170
 
162
 </mapper>
171
 </mapper>