活动邀请详情修改

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

@@ -6,6 +6,7 @@ import com.mmc.iuav.group.Update;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.controller.BaseController;
 import com.mmc.iuav.user.model.dto.activity.ActivityDTO;
+import com.mmc.iuav.user.model.dto.activity.ActivityPartDTO;
 import com.mmc.iuav.user.model.qo.ActivityQO;
 import com.mmc.iuav.user.model.vo.activity.ActivityVO;
 import com.mmc.iuav.user.service.ActivityService;
@@ -18,6 +19,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
+ * @description: 当前时间只能有一个活动有效，活动requireNum为0时，不限制发放积分人数，人人可以获得积分
  * @author: zj
  * @Date: 2023/10/16 15:06
  */
@@ -66,7 +68,7 @@ public class ActivityController extends BaseController {
     @ApiOperation(value = "活动邀请详情")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("inviteDetail")
-    public ResultBody inviteDetail(@Validated(Page.class) @RequestBody ActivityQO activityQO) {
+    public ResultBody<ActivityPartDTO> inviteDetail(@Validated(Page.class) @RequestBody ActivityQO activityQO) {
         return activityService.inviteDetail(activityQO);
     }
 

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

@@ -105,16 +105,17 @@ public class ActivityServiceImpl implements ActivityService {
         // 查询是否超过奖励限制
         int count = activityDao.countActivityPart(activityDO.getId(), userAccountId);
         if (activityDO.getRequireNum() == 0 || count < activityDO.getRequireNum()) {
+            log.info("Activity invite award! userAccountId:{}", userAccountId);
             // 暂时只奖励积分
             ChangeUserPointVO changePoint = new ChangeUserPointVO();
             changePoint.setUserAccountId(userAccountId);
             changePoint.setChangePoint(activityDO.getRewardValue());
             changePoint.setChangeType(7);
             userPointsService.change(changePoint);
+            // 记录领取信息（被邀请）
+            ActivityPartDO activityPartDO = new ActivityPartDO(null, activityDO.getId(), userAccountId, pUserAccountId, new Date());
+            activityDao.insertActivityPart(activityPartDO);
         }
-        // 记录领取信息（被邀请）
-        ActivityPartDO activityPartDO = new ActivityPartDO(null, activityDO.getId(), userAccountId, pUserAccountId, new Date());
-        activityDao.insertActivityPart(activityPartDO);
         return ResultBody.success();
     }
 

csm-service/cms-service-user/src/main/resources/mapper/activity.xml

@@ -158,6 +158,9 @@
         select<include refid="activity_part_column"/>, ac.reward_value
         from activity_part ap inner join activity ac on ap.activity_id = ac.id
         where ac.id = #{activityId}
+        <if test="userAccountId != null">
+            and ap.user_account_id = #{userAccountId}
+        </if>
         order by ap.id desc
         limit #{pageNo}, #{pageSize}
     </select>
@@ -167,5 +170,8 @@
         select count(*)
         from activity_part ap inner join activity ac on ap.activity_id = ac.id
         where ac.id = #{activityId}
+        <if test="userAccountId != null">
+            and ap.user_account_id = #{userAccountId}
+        </if>
     </select>
 </mapper>
\ No newline at end of file