Browse Source

首页日历

change 4 years ago
parent
commit
306da444c4

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationUseServiceImpl.java

@@ -115,6 +115,8 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
         }
         //未领取过领取活动
         bo.setCreateTime(DateUtils.getNowTime());
+        ActivityConfigurationVo activityConfigurationVo = activityConfigurationService.queryById(bo.getConfigurationId());
+        bo.setActivityType(Convert.toInt(activityConfigurationVo.getActivityType()));
         switch (bo.getActivityType()){
             case 3:
             case 4:
@@ -125,7 +127,6 @@ public class ActivityConfigurationUseServiceImpl extends ServiceImpl<ActivityCon
             //向卡券表中生成优惠券或折扣券
             default:
                 bo.setUse(0);
-                ActivityConfigurationVo activityConfigurationVo = activityConfigurationService.queryById(bo.getConfigurationId());
                 CouponAddBo couponAddBo = new CouponAddBo();
                 couponAddBo.setPrice(activityConfigurationVo.getPrice());
                 couponAddBo.setEndTime(afterSixMonthDate(new Date(),activityConfigurationVo.getCouponEnd()));