MERGE

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -2103,9 +2103,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             }
             item.setUserId(user.getUserId());
             //查询购买课程
-            UserBusinessGoodsVo goodsVo = baseMapper.getCourseByUser(item);
-            goodsVo.setIdNum(item.getIdNum());
-            goodsBoList.add(goodsVo);
+            List<UserBusinessGoodsVo> goodsVo = baseMapper.getCourseByUser(item);
+            if (!CollectionUtils.isEmpty(goodsVo)){
+                goodsVo.forEach(x -> x.setIdNum(item.getIdNum()));
+                goodsBoList.addAll(goodsVo);
+            }
         }
         return goodsBoList;
     }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -1000,6 +1000,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             goodsUserVo.setExamNum(classGradeVo.getExamNum());
             goodsUserVo.setRecordNum(classGradeVo.getRecordNum());
             goodsUserVo.setPeriodStatus(classGradeVo.getPeriodStatus());
+            goodsUserVo.setSignId(classGradeVo.getId());
+            goodsUserVo.setOfficialStatus(classGradeVo.getOfficialStatus());
         }
         return goodsUserVos;
     }

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

@@ -451,4 +451,7 @@ public class GoodsUserVo {
 
 	@ApiModelProperty("失败原因")
 	private String pushFailReason;
+
+	@ApiModelProperty("标签Id")
+	private Long signId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -354,8 +354,12 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                             }
                         });
                     }
+                if (StringUtils.isNotBlank(bo.getOfficialName()) && ObjectUtils.isNotNull(bo.getClassStatus()) && bo.getClassStatus() == 1){
+                    add.setSevenCode(ServletUtils.getEncoded("SEV"));
+                }else {
                     String sevenCode = getSevenCode(goodsId,add.getStudentUpper());
                     add.setSevenCode(sevenCode);
+                }
             }
             else if (("继续教育二级建造师".equals(businessName)|| ("继续教育二级造价师".equals(businessName))) && sysTenant.getShareClass() == 1){
                 erJfalg = true;

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeVo.java

@@ -24,6 +24,8 @@ import java.util.List;
 public class ClassGradeVo {
 	private static final long serialVersionUID = 1L;
 
+	private Long id;
+
 	/** $pkColumn.columnComment */
 	@ApiModelProperty("$pkColumn.columnComment")
 	private Long gradeId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserMapper.java

@@ -95,5 +95,5 @@ public interface UserMapper extends BaseMapper<User> {
     @InterceptorIgnore(tenantLine = "true")
     Long getFistStudyTime(@Param("userId")Long userId,@Param("tenantId")Long tenantId,@Param("businessName")String businessName);
 
-    UserBusinessGoodsVo getCourseByUser(UserBusinessGoodsBo item);
+    List<UserBusinessGoodsVo> getCourseByUser(UserBusinessGoodsBo item);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserBusinessGoodsVo.java

@@ -21,5 +21,5 @@ public class UserBusinessGoodsVo implements Serializable {
 
     private String categoryName;
 
-    private Long createTime;
+    private Long createTimeStamp;
 }

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

@@ -228,6 +228,7 @@
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeVo" id="ClassGradeVoResult">
+        <result property="id" column="id"/>
         <result property="gradeId" column="grade_id"/>
         <result property="classStatus" column="class_status"/>
         <result property="officialName" column="official_name"/>
@@ -868,6 +869,7 @@
         cgu.period_plush,
         cgu.order_goods_id,
         cg.official_name,
+        cgu.id,
         cgu.period_wait_time
         FROM
         class_grade_user cgu

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -695,7 +695,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             CONCAT( cet.education_name, cb.business_name, cpt.project_name ) AS business_name,
             m.category_name AS majorName,
             g.goods_name AS categoryName,
-            og.create_time AS createTime
+            og.create_time AS createTimeStamp
         FROM
             `order` o
                 LEFT JOIN order_goods og ON o.order_sn = og.order_sn
@@ -710,10 +710,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND og.`status` = 1
           AND o.user_id = #{userId}
           AND INSTR( CONCAT( cet.education_name, cb.business_name, cpt.project_name ), #{businessName} )
-          AND INSTR( m.category_name, #{majorName} )
         ORDER BY
             og.create_time DESC
-            LIMIT 1
     </select>
 
     <select id="getUserOrderCount" parameterType="map" resultType="java.lang.Long">