添加推广活动人数统计

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/RegisterQueueDTO.java

@@ -5,7 +5,22 @@ import lombok.Data;
 
 @Data
 public class RegisterQueueDTO {
-    RegisterParamDTO registerParamDTO;
+    public static final Integer SIGN_NEW = 1;
+    public static final Integer SIGN_ACTIVATE = 2;
+    public static final Integer SIGN_LOGIN = 3;
+
+    /**
+     * 执行方法的入参
+     */
+    RegisterParamDTO InParamDTO;
+
+    /**
+     * app用户id
+     */
     Integer appUserId;
-    JSONObject data;
+
+    /**
+     * 标识：1--新注册；2--激活；3--登录
+     */
+    Integer sign;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -9,6 +9,12 @@ import lombok.Data;
 @Data
 public class AppUserDTO {
 
+	public static final Integer CHANNEL_APP = 1;
+	public static final Integer CHANNEL_SMALL = 2;
+
+	public static final Integer source_APP = 1;
+	public static final Integer source_SMALL = 2;
+
 	private Integer id;
 	private Integer userid;
 	private Integer isMember;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

 package com.github.wxiaoqi.security.admin.rpc.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.biz.*;
@@ -319,18 +318,7 @@ public class AppPermissionService {
                 data.put("imUserId", imUserId);
             }
             if (data != null) {
-                try {
-                    //入参
-                    RegisterQueueDTO registerQueueDTO = new RegisterQueueDTO();
-                    registerQueueDTO.setData(data);
-                    registerQueueDTO.setAppUserId(userid);
-                    registerQueueDTO.setRegisterParamDTO(new RegisterParamDTO(username, password, headimgurl,
-                            nickname, mobilecode, openId, unionid, type, code, activityCode));
-//                    //注册成功，发送队列
-                    mqSerderFeign.sendMessage(RabbitConstant.ADMIN_TOPIC, KEY_REGISTER_SUCCESS, JSONUtil.toJsonStr(registerQueueDTO));
-                }catch (Exception e){
-                    log.error(e.getMessage(), e);
-                }
+                sendQueue(username, password, headimgurl, nickname, mobilecode, openId, unionid, type, code, activityCode, userid);
                 return JsonResultUtil.createSuccessResultWithObj(data);
             } else {
                 return JsonResultUtil.createDefaultFail();
@@ -341,6 +329,22 @@ public class AppPermissionService {
         }
     }
 
+    private void sendQueue(String username, String password, String headimgurl, String nickname, String mobilecode, String openId, String unionid, Integer type, String code, String activityCode, Integer userid) {
+        try {
+            RegisterQueueDTO registerQueueDTO = new RegisterQueueDTO();
+            //出参
+//                    registerQueueDTO.setData(data);
+            registerQueueDTO.setAppUserId(userid);
+            //入参
+            registerQueueDTO.setInParamDTO(new RegisterParamDTO(username, password, headimgurl,
+                    nickname, mobilecode, openId, unionid, type, code, activityCode));
+//                    注册成功，发送队列
+            mqSerderFeign.sendMessage(RabbitConstant.ADMIN_TOPIC, KEY_REGISTER_SUCCESS, JSONUtil.toJsonStr(registerQueueDTO));
+        }catch (Exception e){
+            log.error(e.getMessage(), e);
+        }
+    }
+
     /**
      * 自动登录
      */

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeBiz.java

 package com.xxfc.platform.activity.biz;
 
 import com.github.wxiaoqi.security.admin.dto.RegisterQueueDTO;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
+import com.xxfc.platform.activity.entity.ActivityPopularizeRelation;
+import com.xxfc.platform.activity.entity.ActivityPopularizeUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -8,6 +13,9 @@ import com.xxfc.platform.activity.entity.ActivityPopularize;
 import com.xxfc.platform.activity.mapper.ActivityPopularizeMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+
 /**
  * 推广活动（邀请有礼）
  *
@@ -18,15 +26,79 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 @Service
 public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,ActivityPopularize> {
 
-//    @Autowired
+    @Autowired
+    ActivityPopularizeRelationBiz relationBiz;
+
+    @Autowired
+    ActivityPopularizeBiz popularizeBiz;
+
+    @Autowired
+    ActivityPopularizeUserBiz popularizeUserBiz;
+
+    @Autowired
+    ActivityPopularizeLogBiz popularizeLogBiz;
+
+    @Autowired
+    UserFeign userFeign;
 
     public static final String POPULARIZE_0101 = "0101";
 
     public void handleRegister(RegisterQueueDTO registerQueueDTO) {
-        //获取活动code
-        if(POPULARIZE_0101.equals(registerQueueDTO.getRegisterParamDTO().getActivityCode())) {
+
+        String activityCode = registerQueueDTO.getInParamDTO().getActivityCode();
+        AppUserDTO appUserDTO = userFeign.userDetailById(registerQueueDTO.getAppUserId()).getData();
+
+        //获取活动code,并且注册来源是app 并且 是邀请注册
+        if(POPULARIZE_0101.equals(registerQueueDTO.getInParamDTO().getActivityCode())
+                && RegisterQueueDTO.SIGN_LOGIN.equals(registerQueueDTO.getSign())) {
+
+            ActivityPopularize activityPopularize = popularizeBiz.selectOne(new ActivityPopularize(){{
+                setCode(activityCode);
+            }});
+
+            Integer majorUserId = Integer.valueOf(appUserDTO.getInviterAccount());
+
             //添加活动关系
+            relationBiz.insertSelective(new ActivityPopularizeRelation(){{
+                setPopularizeId(activityPopularize.getId());
+                setMajorUserId(majorUserId);
+                setMinorUserId(appUserDTO.getUserid());
+            }});
+
+            ActivityPopularizeLog popularizeLog = popularizeLogBiz.selectOne(new ActivityPopularizeLog(){{
+                setUserId(majorUserId);
+                setItemId(3);
+            }});
+
+            //生成任务项
+            if(null == popularizeLog){
+                popularizeLogBiz.insertSelectiveRe(new ActivityPopularizeLog(){{
+                    setItemId(3);
+                    setUserId(majorUserId);
+                    setStatus(SYS_FALSE);
+                    setPopularizeId(activityPopularize.getId());
+                }});
+            }
+
+            //查出majorUser参与活动信息
+            ActivityPopularizeUser activityPopularizeUser = popularizeUserBiz.selectOne(new ActivityPopularizeUser(){{
+                setUserId(majorUserId);
+                setPopularizeId(activityPopularize.getId());
+            }});
 
+            //任务没有完成
+            if(!SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
+                //检查是否满足奖励
+                if(relationBiz.selectList(new ActivityPopularizeRelation(){{
+                    setMajorUserId(appUserDTO.getUserid());
+                    setPopularizeId(activityPopularize.getId());
+                }}).size() >= 10) {
+                    activityPopularizeUser.setStatus(SYS_TRUE);
+                    popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
+                    popularizeLog.setStatus(SYS_TRUE);
+                    popularizeLogBiz.updateSelectiveById(popularizeLog);
+                }
+            }
         }
     }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RabbitActivityConfig.java

@@ -22,44 +22,18 @@ import java.util.ArrayList;
 public class RabbitActivityConfig extends RabbitCommonConfig {
 
     public static final String INTEGRAL_QUEUE = "integral_queue";
+//    public static final String POPULARZIE_REGISTER_QUEUE = "popularzie.register.queue";
+//    public static final String POPULARZIE_AUTH_QUEUE = "popularzie.auth.queue";
+    public static final String POPULARZIE_0101_QUEUE = "popularzie.0101.queue";
+
     static {
         myQueue = new ArrayList<BindDTO>(){{
-            add(new BindDTO(INTEGRAL_QUEUE,  RabbitConstant.ADMIN_TOPIC, "order.#"));
+            add(new BindDTO(INTEGRAL_QUEUE,  RabbitConstant.ORDER_TOPIC, "order.#"));
+            add(new BindDTO(POPULARZIE_0101_QUEUE,  RabbitConstant.ADMIN_TOPIC, "appUser.#"));
+//            add(new BindDTO(POPULARZIE_REGISTER_QUEUE,  RabbitConstant.ADMIN_TOPIC, "appUser.register"));
+//            add(new BindDTO(POPULARZIE_AUTH_QUEUE,  RabbitConstant.ADMIN_TOPIC, "appUser.login"));
         }};
     }
 
-
-//    public static final String BASE_EXC = "hz_exchange";
-//    public static final String INTEGRAL_QUEUE = "integral_queue";
-//    public static final String ORDER_WATER_KEY = "order";
-
-//    /**
-//     * 队列交换机
-//     * 注意这里的交换机类型：CustomExchange
-//     * @return
-//     */
-//    @Bean
-//    public DirectExchange directExchange(){
-//        return new DirectExchange(BASE_EXC, true, false);
-//    }
-//
-//    /**
-//     * 队列
-//     * @return
-//     */
-//    @Bean
-//    public Queue orderWaterQueue(){
-//        return new Queue(INTEGRAL_QUEUE,true);
-//    }
-//
-//     /**
-//     * 队列绑定交换机
-//     * @return
-//     */
-//    @Bean
-//    public Binding orderWaterBinding(Queue orderWaterQueue, DirectExchange directExchange){
-//        return BindingBuilder.bind(orderWaterQueue).to(directExchange).with(ORDER_WATER_KEY);
-//    }
-
 }
 

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RabbitIntegralConfig.java

-package com.xxfc.platform.activity.config;
-
-import org.springframework.amqp.core.Queue;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * rabbitmq配置类
- * 包含： 不知道什么orderWater队列
- * @author zhoujw
- * @date 2019/7/15
- */
-@Configuration
-public class RabbitIntegralConfig {
-
-    public static final String HZ_EXC = "hz_exchange";
-    public static final String INTEGRAL_QUEUE = "integral_queue";
-    public static final String ORDER_WATER_KEY = "order";
-
-//    /**
-//     * 队列交换机
-//     * 注意这里的交换机类型：CustomExchange
-//     * @return
-//     */
-//    @Bean
-//    public DirectExchange directExchange(){
-//        return new DirectExchange(HZ_EXC, true, false);
-//    }
-
-    /**
-     * 队列
-     * @return
-     */
-    @Bean
-    public Queue orderWaterQueue(){
-        return new Queue(INTEGRAL_QUEUE,true);
-    }
-
-//     /**
-//     * 队列绑定交换机
-//     * @return
-//     */
-//    @Bean
-//    public Binding orderWaterBinding(Queue orderWaterQueue, DirectExchange directExchange){
-//        return BindingBuilder.bind(orderWaterQueue).to(directExchange).with(ORDER_WATER_KEY);
-//    }
-
-}
-

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/handler/PopularizeMQHandler.java

@@ -30,7 +30,8 @@ public class PopularizeMQHandler {
     @Autowired
     ActivityPopularizeBiz activityPopularizeBiz;
 
-    @RabbitListener(queues = RabbitActivityConfig.INTEGRAL_QUEUE)
+    //@RabbitListener(queues = {RabbitActivityConfig.POPULARZIE_REGISTER_QUEUE,RabbitActivityConfig.POPULARZIE_AUTH_QUEUE})
+    @RabbitListener(queues = {RabbitActivityConfig.POPULARZIE_0101_QUEUE})
     public void popularizeHandler(Message message, @Headers Map<String, Object> headers, Channel channel) {
         ExecutorService executorService = Executors.newCachedThreadPool();
         executorService.execute(new Runnable() {

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeController.java

@@ -77,10 +77,6 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
             setType(type);
         }}).stream().map(v -> {
             PopularizeVO vo = BeanUtil.toBean(v, PopularizeVO.class);
-            vo.setUserVOs(new ArrayList<UserVO>(){{
-                add(new UserVO(){{setNickname("小A");setHeadimgurl("https://xxtest.upyuns.com/image/app/default_%20avatar.png");}});
-                add(new UserVO(){{setNickname("小B");setHeadimgurl("https://xxtest.upyuns.com/image/app/default_%20avatar.png");}});
-            }});
             ActivityPopularizeUser[] apu = new ActivityPopularizeUser[1];
             Map<Integer, ActivityPopularizeLog>[] aplMap = new HashMap[1];
             if(null != appUserDTO) {