修改

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

@@ -15,4 +15,5 @@ public class RegisterParamDTO {
     String unionid;
     Integer type;
     String code;
+    String activityCode;
 }

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

@@ -216,7 +216,7 @@ public class AppPermissionService {
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public JSONObject register(String username, String password, String headimgurl,
                                String nickname, String mobilecode, String openId, String unionid, Integer type,String code) {
-        String activityCode;
+        String activityCode = null;
 
         // 判断参数和验证码
         if (StringUtils.isBlank(username) || StringUtils.isBlank(password) || StringUtils.isBlank(mobilecode)) {
@@ -321,12 +321,11 @@ public class AppPermissionService {
             if (data != null) {
                 try {
                     //入参
-                    RegisterQueueDTO registerQueueDTO = new RegisterQueueDTO(){{
-                        setData(data);
-                        setAppUserId(userid);
-                        setRegisterParamDTO(new RegisterParamDTO(username, password, headimgurl,
-                                nickname, mobilecode, openId, unionid, type, null));
-                    }};
+                    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){

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPopularizeLog.java

@@ -78,7 +78,7 @@ public class ActivityPopularizeLog implements Serializable {
 
 
 	/**
-	 *  推广活动项id
+	 *  状态 0--未完成；1--完成；-1--失败
 	 */
 	@Column(name = "status")
 	@ApiModelProperty(value = "状态 0--未完成；1--完成；-1--失败")

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/ActivityPopularizeUser.java

@@ -90,5 +90,11 @@ public class ActivityPopularizeUser implements Serializable {
 	@ApiModelProperty(value = "参与的用户的id")
 	private Integer userId;
 
+	/**
+	 *  状态 0--未完成；1--完成；-1--失败
+	 */
+	@Column(name = "status")
+	@ApiModelProperty(value = "状态 0--未完成；1--完成；-1--失败")
+	private Integer status;
 
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/feign/ActivityFeign.java

@@ -18,6 +18,9 @@ import java.math.BigDecimal;
 @FeignClient(value = "xx-activity")
 public interface ActivityFeign {
 
+    public static final Integer IS_USE = 1;
+    public static final Integer NOT_USE = 0;
+
     @ApiOperation("用户自动领取新人卷")
     @RequestMapping(value = "/user/auth/led", method = RequestMethod.POST)
     public String led(@RequestParam(value = "userId") Integer userId);

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/popularize/FinishUserVO.java

+package com.xxfc.platform.activity.vo.popularize;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FinishUserVO extends UserVO{
+    /**
+     *  头像
+     */
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+}

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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.activity.entity.ActivityPopularize;
@@ -15,4 +17,16 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  */
 @Service
 public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,ActivityPopularize> {
+
+//    @Autowired
+
+    public static final String POPULARIZE_0101 = "0101";
+
+    public void handleRegister(RegisterQueueDTO registerQueueDTO) {
+        //获取活动code
+        if(POPULARIZE_0101.equals(registerQueueDTO.getRegisterParamDTO().getActivityCode())) {
+            //添加活动关系
+
+        }
+    }
 }
\ No newline at end of file

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

@@ -4,6 +4,7 @@ package com.xxfc.platform.activity.handler;
 import com.alibaba.fastjson.JSONObject;
 import com.rabbitmq.client.Channel;
 import com.xxfc.platform.activity.biz.IntegralUserRecordBiz;
+import com.xxfc.platform.activity.config.RabbitActivityConfig;
 import com.xxfc.platform.activity.vo.IntegralUserRecordDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +27,7 @@ public class IntegralMQHandler {
     @Autowired
     IntegralUserRecordBiz integralUserRecordBiz;
 
-    @RabbitListener(queues = "integral_queue")
+    @RabbitListener(queues = RabbitActivityConfig.INTEGRAL_QUEUE)
     public void integralHandler(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/handler/PopularizeMQHandler.java

+package com.xxfc.platform.activity.handler;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.admin.dto.RegisterQueueDTO;
+import com.rabbitmq.client.Channel;
+import com.xxfc.platform.activity.biz.ActivityPopularizeBiz;
+import com.xxfc.platform.activity.biz.IntegralUserRecordBiz;
+import com.xxfc.platform.activity.config.RabbitActivityConfig;
+import com.xxfc.platform.activity.entity.ActivityPopularize;
+import com.xxfc.platform.activity.vo.IntegralUserRecordDto;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.support.AmqpHeaders;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.handler.annotation.Headers;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+@Component
+@Slf4j
+public class PopularizeMQHandler {
+
+    @Autowired
+    ActivityPopularizeBiz activityPopularizeBiz;
+
+    @RabbitListener(queues = RabbitActivityConfig.INTEGRAL_QUEUE)
+    public void popularizeHandler(Message message, @Headers Map<String, Object> headers, Channel channel) {
+        ExecutorService executorService = Executors.newCachedThreadPool();
+        executorService.execute(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    String messageId = message.getMessageProperties().getMessageId();
+                    String msg = new String(message.getBody(), "UTF-8");
+                    log.info("接收到的消息：msg = {}, 消息ID是：messageId = {} ", msg, messageId);
+
+                    if (StringUtils.isNotBlank(msg)) {
+                        RegisterQueueDTO registerQueueDTO = JSONObject.parseObject(msg, RegisterQueueDTO.class);
+                        activityPopularizeBiz.handleRegister(registerQueueDTO);
+                    }
+
+                    executorService.shutdown();
+                    Long deliveryTag = (Long) headers.get(AmqpHeaders.DELIVERY_TAG);
+                    // 手动签收
+                    channel.basicAck(deliveryTag, false);
+                } catch (Exception e) {
+                    log.info("接收到的消息失败");
+                    try {
+                        channel.basicNack(message.getMessageProperties().getDeliveryTag(), false, false);
+                    } catch (IOException i) {
+                        i.printStackTrace();
+                    }
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+
+}

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

@@ -11,14 +11,18 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.XxBizAssert;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.activity.biz.*;
 import com.xxfc.platform.activity.dto.ItemAddDTO;
 import com.xxfc.platform.activity.entity.*;
+import com.xxfc.platform.activity.vo.popularize.FinishUserVO;
 import com.xxfc.platform.activity.vo.popularize.ItemVO;
 import com.xxfc.platform.activity.vo.popularize.PopularizeVO;
 import com.xxfc.platform.activity.vo.popularize.UserVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
@@ -35,6 +39,7 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
 @RestController
 @RequestMapping("activityPopularize")
 @Api(value = "推广活动", tags = "推广活动")
+@Slf4j
 public class ActivityPopularizeController extends BaseController<ActivityPopularizeBiz,ActivityPopularize> implements UserRestInterface {
 
     @Autowired
@@ -182,15 +187,27 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
 
     @RequestMapping(value = "/app/unauth/relation-list", method = RequestMethod.GET)
     @ResponseBody
-    @ApiOperation(value = "查询该活动邀请的好友")
+    @ApiOperation(value = "查询该活动参与成功的人")
     @IgnoreClientToken
     @IgnoreUserToken
-    public ObjectRestResponse<PopularizeVO> relationList(String code) {
-        checkAppUser();
-//        ActivityPopularize activityPopularize = popularizeBiz.selectOne(new ActivityPopularize(){{
-//            setCode(code);
-//        }});
-//        activityPopularize.get
-        return ObjectRestResponse.succ();
+    public ObjectRestResponse<List<FinishUserVO>> relationList(String code) {
+
+        ActivityPopularize activityPopularize = popularizeBiz.selectOne(new ActivityPopularize(){{
+            setCode(code);
+        }});
+
+        PageDataVO<ActivityPopularizeUser> pageDataVO = PageDataVO.pageInfo(1, 20, () -> popularizeUserBiz.selectByExample(new Example.Builder(ActivityPopularizeUser.class)
+                .where(WeekendSqls.<ActivityPopularizeUser>custom()
+                        .andEqualTo(ActivityPopularizeUser::getPopularizeId, activityPopularize.getId())
+                        .andEqualTo(ActivityPopularizeUser::getStatus, SYS_TRUE))
+                .orderByDesc("updTime").build()));
+
+        return ObjectRestResponse.succ(pageDataVO.getData().stream().map(value -> {
+            AppUserDTO appUserDTO = userFeign.userDetailById(value.getUserId()).getData();
+            FinishUserVO finishUserVO = BeanUtil.toBean(appUserDTO, FinishUserVO.class);
+            log.error(StringUtils.overlay(appUserDTO.getUsername(), "*****", 3, 8));
+            finishUserVO.setPhone(StringUtils.overlay(appUserDTO.getUsername(), "*****", 3, 8));
+            return finishUserVO;
+        }).collect(Collectors.toList()));
     }
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -216,7 +216,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
         //优惠券处理
             //待完成
-//        activityFeign.use(dto.getUserid());
+//        activityFeign.use();
 
         //如果有使用会员权益或者优惠券，则设置订单已优惠
         if(SYS_TRUE.equals(detail.getOrder().getHasMemberRight())) {