fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityRecommendVo.java

@@ -71,4 +71,6 @@ public class ActivityRecommendVo {
 	private String businessName;
 	@ApiModelProperty("商品列表")
 	private List<ActivityRecommendGoodsVo> goodsList;
+	@ApiModelProperty("业务别名称")
+	private String aliasName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseMenuAddBo.java

@@ -42,4 +42,7 @@ public class CourseMenuAddBo {
     /** 排序 */
     @ApiModelProperty("排序")
     private Integer sort;
+    /** 是否优选  0没有 1选中 */
+    @ApiModelProperty("是否优选  0没有 1选中")
+    private Integer firstChoiceStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseMenuEditBo.java

@@ -48,4 +48,8 @@ public class CourseMenuEditBo {
     /** 排序 */
     @ApiModelProperty("排序")
     private Integer sort;
+
+    /** 是否优选  0没有 1选中 */
+    @ApiModelProperty("是否优选  0没有 1选中")
+    private Integer firstChoiceStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseMenu.java

@@ -45,4 +45,6 @@ private static final long serialVersionUID=1L;
     /** 排序 */
     private Integer sort;
     private Long tenantId;
+    /** 是否优选  0没有 1选中 */
+    private Integer firstChoiceStatus;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseMenuVo.java

@@ -95,4 +95,9 @@ public class CourseMenuVo {
 	@ApiModelProperty("章下面的节")
 	private List<CourseChapterSectionVo> courseChapterSectionList;
 
+	/** 是否优选  0没有 1选中 */
+	@Excel(name = "是否优选  0没有 1选中")
+	@ApiModelProperty("是否优选  0没有 1选中")
+	private Integer firstChoiceStatus;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -202,4 +202,13 @@ public class GoodsAddBo {
     private String sevenYear;
     @ApiModelProperty("商品试卷限制终端学习，多个,拼接  1公众号 2小程序")
     private String examLimitClient;
+    /** 是否优选  0没有 1选中 */
+    @ApiModelProperty("是否优选  0没有 1选中")
+    private Integer firstChoiceStatus;
+    /** 优选至少学习学时 */
+    @ApiModelProperty("优选至少学习学时")
+    private Long minClassHour;
+    /** 优选生成商品 0否 1是 */
+    @ApiModelProperty("优选生成商品 0否 1是")
+    private Integer firstChoiceGoods;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -236,4 +236,13 @@ public class GoodsEditBo {
     private String sevenYear;
     @ApiModelProperty("商品试卷限制终端学习，多个,拼接  1公众号 2小程序")
     private String examLimitClient;
+    /** 是否优选  0没有 1选中 */
+    @ApiModelProperty("是否优选  0没有 1选中")
+    private Integer firstChoiceStatus;
+    /** 优选至少学习学时 */
+    @ApiModelProperty("优选至少学习学时")
+    private Long minClassHour;
+    /** 优选生成商品 0否 1是 */
+    @ApiModelProperty("优选生成商品 0否 1是")
+    private Integer firstChoiceGoods;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -170,4 +170,10 @@ private static final long serialVersionUID=1L;
     private String sevenYear;
     /** 补考商品统一标识 */
     private Integer unifySign;
+    /** 是否优选  0没有 1选中 */
+    private Integer firstChoiceStatus;
+    /** 优选至少学习学时 */
+    private Long minClassHour;
+    /** 优选生成商品 0否 1是 */
+    private Integer firstChoiceGoods;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/IGoodsService.java

@@ -162,4 +162,6 @@ public interface IGoodsService extends IService<Goods> {
 	List<Goods> getRelevanceGoodsNoTenant(String businessName,String majName,Long goodsId);
 
 	List<Goods> getRelGoodsNoTenant(String businessName, String categoryName, Long tenantId);
+
+	Long firstChoiceGoods();
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -5199,6 +5199,11 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return baseMapper.getRelGoodsNoTenant(businessName,categoryName,tenantId);
     }
 
+    @Override
+    public Long firstChoiceGoods() {
+        return null;
+    }
+
     private void updateHandoutsId(Long goodsId, Long tenantId, Long handoutsId) {
         baseMapper.updateHandoutsId(goodsId,tenantId,handoutsId);
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -376,4 +376,16 @@ public class GoodsVo {
 	private Boolean jjShiGongYuan;
 	@ApiModelProperty("补考商品统一标识：1统一")
 	private Integer unifySign;
+	/** 是否优选  0没有 1选中 */
+	@Excel(name = "是否优选  0没有 1选中")
+	@ApiModelProperty("是否优选  0没有 1选中")
+	private Integer firstChoiceStatus;
+	/** 优选至少学习学时 */
+	@Excel(name = "优选至少学习学时")
+	@ApiModelProperty("优选至少学习学时")
+	private Long minClassHour;
+	/** 优选生成商品 0否 1是 */
+	@Excel(name = "优选生成商品 0否 1是")
+	@ApiModelProperty("优选生成商品 0否 1是")
+	private Integer firstChoiceGoods;
 }

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityRecommendMapper.xml

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="educationName" column="education_name"/>
         <result property="projectName" column="project_name"/>
         <result property="businessName" column="business_name"/>
+        <result property="aliasName" column="alias_name"/>
         <result property="majorId" column="major_id"/>
         <result property="subjectIdList" column="subject_ids"/>
         <collection property="goodsList" column="recommend_id" select="findGoodsList"/>
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             g.goods_id,
             g.goods_name,
             g.stand_price,
+            g.line_price,
             rg.sort,
             g.code,
             g.year,
@@ -70,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectListByBo" parameterType="com.zhongzheng.modules.activity.bo.ActivityRecommendQueryBo" resultMap="ActivityRecommendVoResult">
         SELECT ar.*, cet.education_name,
                cpt.project_name,
+               cb.alias_name,
                cb.business_name from activity_recommend ar
             LEFT JOIN course_education_type cet ON ar.education_type_id = cet.id
             LEFT JOIN course_project_type cpt ON ar.project_id = cpt.id

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMenuMapper.xml

@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
         <result property="sort" column="sort"/>
+        <result property="firstChoiceStatus" column="first_choice_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseMenuVo" id="CourseMenuResultVo">
@@ -36,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="freeExamName" column="free_exam_name"/>
         <result property="code" column="code"/>
         <result property="publishStatus" column="publish_status"/>
+        <result property="firstChoiceStatus" column="first_choice_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseUserMenuVo" id="CourseUserMenuVo">

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -55,6 +55,9 @@
         <result property="commitPeriodRemark" column="commit_period_remark"/>
         <result property="gradeType" column="grade_type"/>
         <result property="examLimitClient" column="exam_limit_client"/>
+        <result property="firstChoiceStatus" column="first_choice_status"/>
+        <result property="minClassHour" column="min_class_hour"/>
+        <result property="firstChoiceGoods" column="first_choice_goods"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsVo" id="GoodsResultVo">
@@ -145,6 +148,9 @@
         <result property="gradeType" column="grade_type"/>
         <result property="examLimitClient" column="exam_limit_client"/>
         <result property="optionalYear" column="optional_year"/>
+        <result property="firstChoiceStatus" column="first_choice_status"/>
+        <result property="minClassHour" column="min_class_hour"/>
+        <result property="firstChoiceGoods" column="first_choice_goods"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">