vip定制课

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/UserPaymentCoreService.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.microsvc.toolkit.config.jwt.utils.JwtUserInfo;
 import com.microsvc.toolkit.middleware.payment.common.api.entity.PaymentResp;
 import com.microsvc.toolkit.middleware.payment.common.api.entity.RefundResp;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,6 +41,8 @@ public interface UserPaymentCoreService {
     UserPaymentOrderWrapper.PaymentConfig executeOrderCreate(UserPaymentOrderWrapper.UserPaymentOrder orderReq);
 
 
+    int getActivityCount(Long userId, ClientEnum client, Long activityId);
+
     /**
      * 用户支付请求
      * @param userInfo JwtUserInfo

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanServiceImpl.java

@@ -7,11 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.ActivityPlanDao;
 import com.yonge.cooleshow.biz.dal.dao.StudentDao;
-import com.yonge.cooleshow.biz.dal.dao.SubjectDao;
 import com.yonge.cooleshow.biz.dal.dto.ActivityPlanDto;
 import com.yonge.cooleshow.biz.dal.dto.ActivityPlanPayDto;
 import com.yonge.cooleshow.biz.dal.dto.ActivityPlanRewardDto;
@@ -23,23 +21,13 @@ import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.enums.activity.ActivityRankingMethodEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
-import com.yonge.cooleshow.biz.dal.vo.ActivityMusicVo;
-import com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo;
-import com.yonge.cooleshow.biz.dal.vo.ActivityRankingVo;
-import com.yonge.cooleshow.biz.dal.vo.MusicActivityVo;
-import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
+import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.biz.dal.vo.activity.ActivityTeacherWrapper;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.enums.ActivityResourceEnum;
-import com.yonge.cooleshow.common.enums.ActivityShareEnum;
-import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
-import com.yonge.cooleshow.common.enums.CacheNameEnum;
-import com.yonge.cooleshow.common.enums.EStatus;
-import com.yonge.cooleshow.common.enums.RegistrationMethodEnum;
-import com.yonge.cooleshow.common.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.enums.*;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.base.util.ThreadPool;
@@ -60,13 +48,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -93,7 +75,7 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
     private ActivityRewardService activityRewardService;
 
     @Resource
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
 
     @Autowired
     private ActivityRegistrationService activityRegistrationService;
@@ -115,7 +97,7 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
     private UserOrderService userOrderService;
 
     @Autowired
-    private RedisCacheService redisCacheService;
+    private UserPaymentCoreService userPaymentCoreService;
 
     @Autowired
     private TeacherService teacherService;
@@ -176,6 +158,9 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
         //查询活动奖品
         List<ActivityPlanRewardDto> activityRewardList = activityPlanRewardService.queryActivityPlanReward(id);
         detail.setActivityRewardList(activityRewardList);
+        //获取已购买次数
+        Long userId = sysUserService.getUserId();
+        detail.setBuyNum(userPaymentCoreService.getActivityCount(userId,ClientEnum.STUDENT,id));
         return detail;
     }
 
@@ -677,9 +662,6 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
     public HttpResponseResult<OrderCreateRes> orderCreate(OrderReq.OrderReqInfo orderReqInfo) {
 
         log.info("活动购买 参数 --> {}", orderReqInfo);
-
-        // 检查用户
-        getSysUser(orderReqInfo.getUserId());
         ActivityPlanPayDto activityPlanPayDto = JSON.parseObject(
                 JSON.toJSONString(orderReqInfo.getBizContent()), ActivityPlanPayDto.class);
 
@@ -1011,8 +993,6 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
 
         log.info("活动购买 参数 --> {}", JSON.toJSONString(orderGoodsInfo));
 
-        // 检查用户
-        getSysUser(orderGoodsInfo.getUserId());
         ActivityPlanPayDto activityPlanPayDto = JSON.parseObject(
                 JSON.toJSONString(orderGoodsInfo.getBizContent()), ActivityPlanPayDto.class);
 
@@ -1055,7 +1035,7 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
     private void sendMessage(String activityName, Long userId) {
         try {
             //  发送消息
-            SysUser user = sysUserFeignService.queryUserById(userId);
+            SysUser user = sysUserService.getByUserId(userId);
 
             Map<Long, String> receivers = new HashMap<>();
             receivers.put(userId, user.getPhone());
@@ -1084,10 +1064,4 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
             throw new BizException("活动已结束");
         }
     }
-
-    private SysUser getSysUser(Long userId) {
-        return Optional.ofNullable(userId)
-                .map(sysUserFeignService::queryUserById)
-                .orElseThrow(() -> new BizException("用户不存在"));
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

@@ -17,7 +17,6 @@ import com.microsvc.toolkit.middleware.payment.enums.EPaymentVendor;
 import com.yonge.cooleshow.biz.dal.dto.ActivityPlanRewardDto;
 import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.*;
-import com.yonge.cooleshow.biz.dal.enums.coupon.CouponCategoryEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponUseStateEnum;
 import com.yonge.cooleshow.biz.dal.mapper.CouponInfoMapper;
 import com.yonge.cooleshow.biz.dal.queryInfo.CouponInfoQuery;
@@ -945,7 +944,8 @@ DISCOUNT("畅学卡")
      * @param activityId 活动ID
      * @return int 活动参与次数
      */
-    private int getActivityCount(Long userId, ClientEnum client, Long activityId) {
+    @Override
+    public int getActivityCount(Long userId, ClientEnum client, Long activityId) {
         return userOrderService.lambdaQuery()
                     .eq(UserOrder::getActivityId, activityId)
                     .eq(UserOrder::getUserId, userId)

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ActivityPlanVo.java

@@ -36,6 +36,17 @@ public class ActivityPlanVo extends ActivityPlan{
 	@ApiModelProperty("最后操作人")
 	private String updateByName;
 
+	@ApiModelProperty("当前用户购买次数")
+	private Integer buyNum;
+
+	public Integer getBuyNum() {
+		return buyNum;
+	}
+
+	public void setBuyNum(Integer buyNum) {
+		this.buyNum = buyNum;
+	}
+
 	public ActivityPlanEvaluation getPlanEvaluation() {
 		return planEvaluation;
 	}