Merge remote-tracking branch 'origin/feature/1113-vipCourse' into feature/1113-vipCourse

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

@@ -729,6 +729,14 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         if (null != userOrderVo) {
             userOrderDetail(userOrderVo);
 
+            // 如果有活动 设置活动类型
+            if (userOrderVo.getActivityId() != null) {
+                ActivityPlan activityPlan = activityPlanService.getById(userOrderVo
+                        .getActivityId());
+                if (activityPlan !=null) {
+                    userOrderVo.setActivityType(activityPlan.getActivityType());
+                }
+            }
 
             // 查询用户下单配置
             String ret = redisCacheService.getUserOrderConfig(query.getUserId().toString(), userOrderVo.getOrderNo());

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

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.yonge.cooleshow.biz.dal.entity.UserOrder;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
+import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
 import com.yonge.toolset.payment.base.enums.OpenEnum;
 import com.yonge.toolset.payment.base.enums.PayChannelEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -50,5 +52,7 @@ public class UserOrderVo extends UserOrder {
     @ApiModelProperty("支付配置")
     private  UserPaymentOrderWrapper.PaymentConfig paymentConfig;
 
+	@ApiModelProperty(value = "活动类型 EVALUATION 评测活动 STANDARD_GIFT 达标赠送 SHARE分享活动", required = true)
+	private ActivityTypeEnum activityType;
 
 }