Merge branch 'luck_draw_feature' into dev

# Conflicts:
#	xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeRelationBiz.java

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

@@ -36,7 +36,7 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TR
  */
 @Service
 @Slf4j
-public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,ActivityPopularize> {
+public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, ActivityPopularize> {
 
     @Autowired
     ActivityPopularizeRelationBiz relationBiz;
@@ -71,9 +71,9 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
             String activityCode = registerQueueDTO.getInParamDTO().getActivityCode().replace(PREFIX, "").replace("p", "");
             AppUserDTO appUserDTO = userFeign.userDetailById(registerQueueDTO.getAppUserId()).getData();
             //获取活动code,并且注册来源是app 并且 非普通登录
-            if(!RegisterQueueDTO.SIGN_LOGIN.equals(registerQueueDTO.getSign()) && StringUtils.isNotBlank(activityCode)) {
+            if (!RegisterQueueDTO.SIGN_LOGIN.equals(registerQueueDTO.getSign()) && StringUtils.isNotBlank(activityCode)) {
                 //查询出活动
-                ActivityPopularize activityPopularize = popularizeBiz.selectOne(new ActivityPopularize(){{
+                ActivityPopularize activityPopularize = popularizeBiz.selectOne(new ActivityPopularize() {{
                     setCode(activityCode);
                 }});
                 log.info("活动邀请注册：activityPopularize = {}", activityPopularize.toString());
@@ -85,13 +85,13 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
                     Date end = DateUtil.date(activityPopularize.getEndTime());
 
                     //判断是否活动超时
-                    if(now.before(start) || now.after(end)) {
-                        log.error("不在活动范围内 入参Json："+ JSONUtil.toJsonStr(registerQueueDTO));
+                    if (now.before(start) || now.after(end)) {
+                        log.error("不在活动范围内 入参Json：" + JSONUtil.toJsonStr(registerQueueDTO));
                         return;
                     }
 
                     Integer majorUserId = Integer.valueOf(appUserDTO.getInviterAccount());
-                    ActivityPopularizeRelation activityPopularizeRelation = new ActivityPopularizeRelation(){{
+                    ActivityPopularizeRelation activityPopularizeRelation = new ActivityPopularizeRelation() {{
                         setMajorUserId(majorUserId);
                         setPopularizeId(activityPopularize.getId());
                     }};
@@ -113,7 +113,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
                     }
                     Integer a = amount;
                     //添加活动关系
-                    relationBiz.insertSelective(new ActivityPopularizeRelation(){{
+                    relationBiz.insertSelective(new ActivityPopularizeRelation() {{
                         setPopularizeId(activityPopularize.getId());
                         setMajorUserId(majorUserId);
                         setMinorUserId(appUserDTO.getUserid());
@@ -121,14 +121,14 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
                         setAmount(new BigDecimal(a));
                     }});
 
-                    ApLogDTO apLogDTO = popularizeLogBiz.selectOneApLogDTO(new ActivityPopularizeLog(){{
+                    ApLogDTO apLogDTO = popularizeLogBiz.selectOneApLogDTO(new ActivityPopularizeLog() {{
                         setUserId(majorUserId);
                         setItemId(activityPopularizeItem.getId());
                     }});
 
                     //生成任务项
-                    if(null == apLogDTO){
-                        popularizeLogBiz.insertSelectiveRe(new ActivityPopularizeLog(){{
+                    if (null == apLogDTO) {
+                        popularizeLogBiz.insertSelectiveRe(new ActivityPopularizeLog() {{
                             setItemId(activityPopularizeItem.getId());
                             setUserId(majorUserId);
                             setStatus(SYS_FALSE);
@@ -137,17 +137,17 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
                     }
 
                     //查出majorUser参与活动信息
-                    ActivityPopularizeUser activityPopularizeUser = popularizeUserBiz.selectOne(new ActivityPopularizeUser(){{
+                    ActivityPopularizeUser activityPopularizeUser = popularizeUserBiz.selectOne(new ActivityPopularizeUser() {{
                         setUserId(majorUserId);
                         setPopularizeId(activityPopularize.getId());
                     }});
                     //修改当前进度
                     activityPopularizeUser.setCurrentProgress(activityPopularizeUser.getCurrentProgress().add(new BigDecimal(a)));
                     //任务没有完成
-                    if(!SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
+                    if (!SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
 //                AwardDTO awardDTO = JSONUtil.toBean(activityPopularize.getValue(), AwardDTO.class);
                         //检查是否满足奖励
-                        if(relationBiz.selectList(new ActivityPopularizeRelation(){{
+                        if (relationBiz.selectList(new ActivityPopularizeRelation() {{
                             setMajorUserId(majorUserId);
                             setPopularizeId(activityPopularize.getId());
                         }}).size() >= 10) {
@@ -156,7 +156,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
                             activityPopularizeUser.setStatus(SYS_TRUE);
                             activityPopularizeUser.setCurrentProgress(new BigDecimal(apLogDTO.getItem().getProgress()));
                             popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
-                            mqSenderFeign.sendMessage(RabbitConstant.ADMIN_TOPIC, RabbitConstant.KEY_WALLET_ADD, JSONUtil.toJsonStr(new MyWalletDetail(){{
+                            mqSenderFeign.sendMessage(RabbitConstant.ADMIN_TOPIC, RabbitConstant.KEY_WALLET_ADD, JSONUtil.toJsonStr(new MyWalletDetail() {{
                                 setAmount(new BigDecimal("50"));
                                 setSource(SOURCE_ACTIVITY);
                                 setUserId(majorUserId);

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

@@ -30,7 +30,7 @@ public class ActivityPopularizeRelationBiz extends BaseBiz<ActivityPopularizeRel
     }
 
     public Integer getByUserIdAndPopularizeId(ActivityPopularizeRelation activityPopularizeRelation) {
-       Integer num = mapper.getByUserIdAndPopularizeId(activityPopularizeRelation);
-        return num == null ? 1 : num + 1;
+        Integer num = mapper.getByUserIdAndPopularizeId(activityPopularizeRelation);
+        return num == null ? 1 : num + 1 ;
     }
 }
\ No newline at end of file