参与活动修改

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/activity/ActivityController.java

@@ -72,4 +72,11 @@ public class ActivityController extends BaseController {
         return activityService.inviteDetail(activityQO);
     }
 
+    @ApiOperation(value = "测试参与活动")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("test")
+    public ResultBody test(@RequestParam Integer activityType, @RequestParam("userAccountId") Integer userAccountId, @RequestParam("pUserAccountId") Integer pUserAccountId) {
+        return activityService.participateActivity(activityType, userAccountId, pUserAccountId);
+    }
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/activity/ActivityPartDO.java

@@ -22,9 +22,10 @@ public class ActivityPartDO implements Serializable {
     private Integer userAccountId;
     private Integer pUserAccountId;
     private Date createTime;
+    private Integer rewardValue;
 
     public ActivityPartDTO buildActivityPartDTO() {
         return ActivityPartDTO.builder().id(this.id).activityId(this.activityId).userAccountId(this.userAccountId)
-                .pUserAccountId(this.pUserAccountId).createTime(this.createTime).build();
+                .pUserAccountId(this.pUserAccountId).createTime(this.createTime).rewardValue(this.rewardValue).build();
     }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserAccountServiceImpl.java

@@ -230,7 +230,7 @@ public class UserAccountServiceImpl implements UserAccountService {
             return ResultBody.success();
         }
         String userPhoneNumber = wxService.getUserPhoneNumber(id, code);
-        log.info("授权手机号，用户：{}，手机号：{}", id, userPhoneNumber);
+        log.info("授权手机号，用户：{}，手机号：{}，上级推荐人:{}", id, userPhoneNumber, rcdUserId);
         if (StringUtils.isBlank(userPhoneNumber)) {
             return ResultBody.error(ResultEnum.AUTH_PHONE_NUMBER_ERROR);
         }