订单活动id

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

@@ -37,10 +37,7 @@ import com.yonge.cooleshow.biz.dal.vo.MusicActivityVo;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-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.RegistrationMethodEnum;
+import com.yonge.cooleshow.common.enums.*;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.payment.util.DistributedLock;
@@ -151,6 +148,8 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
             if (ActivityTypeEnum.STANDARD_GIFT.equals(detail.getActivityType())) {
                 detail.setPlanStandard(activityPlanStandardService.getById(id));
             }
+        } else {
+            return null;
         }
         //查询活动奖品
         List<ActivityPlanRewardDto> activityRewardList = activityPlanRewardService.queryActivityPlanReward(id);

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

@@ -19,7 +19,7 @@ public class MemberPriceSettingsVo extends MemberPriceSettings{
 
 
     @ApiModelProperty("专属优惠 0：否 1：是")
-    private YesOrNoEnum discount;
+    private YesOrNoEnum discount = YesOrNoEnum.NO;
 
     @ApiModelProperty("优惠价格")
     private BigDecimal discountPrice;