小小训练营

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankSettingServiceImpl.java

@@ -89,6 +89,8 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
     private LiveGoodsService liveGoodsService;
     @Autowired
     private TempBuyFreeLiveTheoryCourseDao tempBuyFreeLiveTheoryCourseDao;
+    @Autowired
+    private TempLittleArtistTrainingCampUserRelationDao tempLittleArtistTrainingCampUserRelationDao;
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -240,7 +242,10 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             if (result.getCode() != 200) {
                 return result;
             }
+            //还原库存
+            liveGoodsService.addGoodsStock(memberPayParamDto.getLiveGoodsId(),memberPayParamDto.getLiveId());
         }
+        BigDecimal amount = BigDecimal.ZERO;
         //判断当前商品是否可以购买（库存、上架状态、是否购买过）
         //如果是云教练商品，那么只能购买一次、如果是免费直播课，那么每次上架只能买一次，总共只能买2次
         if(memberPayParamDto.getLiveGoodsId() == 1){
@@ -260,6 +265,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                     throw new BizException("您已达到购买次数上限");
                 }
             }
+            amount = vipGroupActivity.getMarketPrice();
             //扣减库存
             liveGoodsService.reduceGoodsStock(memberPayParamDto.getLiveGoodsId(),memberPayParamDto.getLiveId());
         } else if (memberPayParamDto.getLiveGoodsId() == 2){
@@ -290,7 +296,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         //优惠券使用范围
         String[] checkCoupon = CouponDetailTypeEnum.getAllowType(MEMBER);
         //校验优惠券
-        StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(memberPayParamDto.getCouponIdList(),BigDecimal.ZERO, true, checkCoupon);
+        StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(memberPayParamDto.getCouponIdList(),amount, true, checkCoupon);
         studentPaymentOrder.setUserId(sysUser.getId());
         studentPaymentOrder.setOrganId(sysUser.getOrganId());
         studentPaymentOrder.setMemo("小小训练营云教练购买");
@@ -561,6 +567,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
                 cloudTeacherOrder.setAmount(studentPaymentOrder.getExpectAmount());
                 cloudTeacherOrderService.save(cloudTeacherOrder,tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId()));
+                //赠送陪练课
                 ActivityUserMapper activityUserMapper = new ActivityUserMapper();
                 activityUserMapper.setPaymentOrderId(studentPaymentOrder.getId());
                 activityUserMapper.setUserId(studentPaymentOrder.getUserId());
@@ -569,6 +576,11 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 activityUserMapper.setGivePracticeFlag(1);
                 activityUserMapper.setReturnFee(false);
                 activityUserMapperDao.insert(activityUserMapper);
+                //赠送训练营
+                TempLittleArtistTrainingCampUserRelation tempLittleArtistTrainingCamp = new TempLittleArtistTrainingCampUserRelation();
+                tempLittleArtistTrainingCamp.setUserId(studentPaymentOrder.getUserId());
+                tempLittleArtistTrainingCamp.setState("NOT_APPLY");
+                tempLittleArtistTrainingCampUserRelationDao.insert(tempLittleArtistTrainingCamp);
                 //赠送优惠券
 //                Integer giveCouponId = activity.getGiveCouponId();
 //                Integer giveCouponNum = activity.getGiveCouponNum();

mec-biz/src/main/resources/config/mybatis/LiveGoodsMapper.xml

@@ -113,6 +113,6 @@
 		<include refid="queryPageSql" />
 	</select>
 	<select id="getLock" resultMap="LiveGoods">
-		SELECT * FROM live_goods WHERE id_ = #{id} FOR UPDATE LIMIT 1
+		SELECT * FROM live_goods WHERE id_ = #{id} LIMIT 1 FOR UPDATE
 	</select>
 </mapper>