傅行帆 4 anni fa
parent
commit
a23a85582b

+ 28
- 3
src/main/java/com/huiju/estateagents/third/controller/WxRedpackController.java Vedi File

@@ -123,12 +123,12 @@ public class WxRedpackController {
123 123
     /**
124 124
      * 帮他助力 接口
125 125
      * @param mpAppid
126
-     * @param mpPersonId
126
+     * @param personId
127 127
      * @param request
128 128
      * @return
129 129
      */
130 130
     @PostMapping("/third/activity/{mpAppid}/help")
131
-    public ResponseBean helpActivity(@PathVariable String mpAppid, @RequestParam String mpPersonId, @RequestParam String sponsorPersonId,@RequestParam String appid, HttpServletRequest request) {
131
+    public ResponseBean helpActivity(@PathVariable String mpAppid, @RequestParam String personId, @RequestParam String sponsorPersonId,@RequestParam String appid, HttpServletRequest request) {
132 132
         WxMpService wxService = getWxMpService();
133 133
         if (!wxService.switchover(mpAppid)) {
134 134
             throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置,请核实!", mpAppid));
@@ -142,11 +142,36 @@ public class WxRedpackController {
142 142
             return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
143 143
         }
144 144
         try {
145
-            ResponseBean res = iTaThirdPartyMiniappConfigService.helpActivity(mpAppid, mpPersonId, sponsorPersonId, taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
145
+            ResponseBean res = iTaThirdPartyMiniappConfigService.helpActivity(mpAppid, personId, sponsorPersonId, taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
146 146
             return res;
147 147
         }catch (Exception e){
148 148
             e.printStackTrace();
149 149
             return ResponseBean.error("程序出错请联系运营人员",ResponseBean.ERROR_ILLEGAL_PARAMS);
150 150
         }
151 151
     }
152
+
153
+    /**
154
+     * 获取此活动的排行榜
155
+     * @param appid
156
+     * @param request
157
+     * @return
158
+     */
159
+    @GetMapping("/third/activity/ranking")
160
+    public ResponseBean getRanking(@RequestParam String appid, HttpServletRequest request) {
161
+        try {
162
+            //获取H5项目相关信息
163
+            QueryWrapper<TaThirdPartyMiniappConfig> taThirdPartyMiniappConfigQueryWrapper = new QueryWrapper<>();
164
+
165
+            taThirdPartyMiniappConfigQueryWrapper.eq("appid", appid);
166
+            TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(taThirdPartyMiniappConfigQueryWrapper);
167
+            if (null == taThirdPartyMiniappConfig){
168
+                return ResponseBean.error("不存在的H5活动",ResponseBean.ERROR_UNAVAILABLE);
169
+            }
170
+            //获取活动的排行榜
171
+            return iTaThirdPartyMiniappConfigService.getRanking(taThirdPartyMiniappConfig.getTargetId(),taThirdPartyMiniappConfig.getOrgId());
172
+        } catch (Exception e) {
173
+//            e.printStackTrace();
174
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
175
+        }
176
+    }
152 177
 }

+ 8
- 0
src/main/java/com/huiju/estateagents/third/service/ITaThirdPartyMiniappConfigService.java Vedi File

@@ -54,4 +54,12 @@ public interface ITaThirdPartyMiniappConfigService extends IService<TaThirdParty
54 54
 	 * @return
55 55
 	 */
56 56
 	ResponseBean helpActivity(String mpAppid, String mpPersonId, String sponsorPersonId, String targetId, Integer orgId);
57
+
58
+	/**
59
+	 * 获取活动排行榜
60
+	 * @param targetId
61
+	 * @param orgId
62
+	 * @return
63
+	 */
64
+    ResponseBean getRanking(String targetId, Integer orgId);
57 65
 }

+ 29
- 6
src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java Vedi File

@@ -189,6 +189,16 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
189 189
 		queryWrapper.eq("miniapp_person_id",taMpMiniapp.getMiniappPersonId());
190 190
 		TaRedPacketPerson mineRedPacketPerson = taRedPacketPersonMapper.selectOne(queryWrapper);
191 191
 		map.put("mineRedPacketPerson",mineRedPacketPerson);
192
+
193
+		//查看我的爆红助力列表
194
+		QueryWrapper<TaRedPacketHistory> historyQueryWrapper = new QueryWrapper<>();
195
+		historyQueryWrapper.eq("activity_id",taRedPacket.getActivityId());
196
+		historyQueryWrapper.eq("org_id",taRedPacket.getOrgId());
197
+		historyQueryWrapper.eq("target_mp_person",taMpMiniapp.getMpPersonId());
198
+		historyQueryWrapper.eq("target_miniapp_person",taMpMiniapp.getMiniappPersonId());
199
+		List<TaRedPacketHistory> taRedPacketHistories = taRedPacketHistoryMapper.selectList(historyQueryWrapper);
200
+		map.put("taRedPacketHistories",taRedPacketHistories);
201
+
192 202
 		//token
193 203
 		Map<Object, Object> tokenMap = new HashMap<>();
194 204
 		tokenMap.put("openId", accessToken.getOpenId());
@@ -264,14 +274,14 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
264 274
 	 * 助力活动接口
265 275
 	 *
266 276
 	 * @param mpAppid 公众号appid
267
-	 * @param mpPersonId 公众号personId
277
+	 * @param personId 小程序personId
268 278
 	 * @param sponsorPersonId 公众号发起人id
269 279
 	 * @param drainageId H5活动id
270 280
 	 * @param orgId 小程序id
271 281
 	 * @return
272 282
 	 */
273 283
 	@Override
274
-	public ResponseBean helpActivity(String mpAppid, String mpPersonId, String sponsorPersonId, String drainageId, Integer orgId) {
284
+	public ResponseBean helpActivity(String mpAppid, String personId, String sponsorPersonId, String drainageId, Integer orgId) {
275 285
 		//第一步根据drainggeid查询出红包表对应的记录
276 286
 		TaDrainage taDrainage = taDrainageMapper.selectById(drainageId);
277 287
 		//第二步查询出这个H5对应的活动
@@ -285,23 +295,36 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
285 295
 		}
286 296
 
287 297
 		//查看这个人绑定的小程序用户
288
-		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", mpPersonId));
298
+		TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("miniapp_person_id", personId));
289 299
 
290 300
 		//查询被助力者的绑定的小程序用户
291
-		TaMpMiniapp parentMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("mp_person_id", sponsorPersonId));
301
+		TaMpMiniapp parentMpMiniapp = taMpMiniappMapper.selectOne(new QueryWrapper<TaMpMiniapp>().eq("miniapp_person_id", sponsorPersonId));
292 302
 
293 303
 		//根据活动id查询这个活动的助力规则
294 304
 		TaRedPacketHelp taRedPacketHelp = taRedPacketHelpMapper.selectById(taDrainage.getActivityId());
295 305
 		
296 306
 		//助力
297 307
 		String result = saveRedPacketHistory(taMpMiniapp, parentMpMiniapp, taRedPacketHelp, orgId,mpAppid);
298
-		if (result.equals("success")){
299
-			ResponseBean.error(result,ResponseBean.ERROR_ILLEGAL_PARAMS);
308
+		if (!result.equals("success")){
309
+			return ResponseBean.error(result,ResponseBean.ERROR_ILLEGAL_PARAMS);
300 310
 		}
301 311
 
302 312
 		return ResponseBean.success(taRedPacketHelp.getSuccessTip());
303 313
 	}
304 314
 
315
+	/**
316
+	 * 获取活动排行榜
317
+	 *
318
+	 * @param targetId
319
+	 * @param orgId
320
+	 * @return
321
+	 */
322
+	@Override
323
+	public ResponseBean getRanking(String targetId, Integer orgId) {
324
+
325
+		return null;
326
+	}
327
+
305 328
 	private synchronized String saveRedPacketHistory(TaMpMiniapp taMpMiniapp, TaMpMiniapp parentMpMiniapp, TaRedPacketHelp taRedPacketHelp, Integer orgId, String mpAppid) {
306 329
 		//查看我是否助力过
307 330
 		QueryWrapper<TaRedPacketHistory> queryWrapper = new QueryWrapper();