fix 同步公共课程

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -1239,15 +1239,22 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
         if(Validator.isEmpty(newOrderGoods.getSevenYear())){
             return 0;
         }
-        OrderGoods copyOrderGoods = iOrderGoodsService.getSevenLastOne(goods.getProjectId(),newOrderGoods.getSevenYear(),userId);
-        if(Validator.isEmpty(copyOrderGoods)){
+        OrderGoods oldOrderGoods = iOrderGoodsService.getSevenLastOne(goods.getProjectId(),newOrderGoods.getSevenYear(),userId);
+        if(Validator.isEmpty(oldOrderGoods)){
             newOrderGoods.setSevenClassVersion(newOrderGoods.getSevenClassVersion()+1);
             newOrderGoods.setSevenClassStatus(1);
             newOrderGoods.setUpdateTime(DateUtils.getNowTime());
             iOrderGoodsService.updateById(newOrderGoods);
             return 1;
         }
-        UserStudyRecord userStudyRecord = baseMapper.getSevenStudyRecord(copyOrderGoods.getOrderGoodsId(),copyOrderGoods.getGradeId());
+        if(newOrderGoods.getSevenClassStatus()==4){
+            newOrderGoods.setSevenClassVersion(oldOrderGoods.getSevenClassVersion()+1);
+            newOrderGoods.setSevenClassStatus(1);
+            newOrderGoods.setUpdateTime(DateUtils.getNowTime());
+            iOrderGoodsService.updateById(newOrderGoods);
+            return 1;
+        }
+        UserStudyRecord userStudyRecord = baseMapper.getSevenStudyRecord(oldOrderGoods.getOrderGoodsId(),oldOrderGoods.getGradeId());
         if(Validator.isEmpty(userStudyRecord)){
             throw new CustomException("公共章学习数据错误");
         }
@@ -1326,7 +1333,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                 userStudyRecordPhotoService.save(copyPhoto);
             }
         }
-        newOrderGoods.setSevenClassVersion(copyOrderGoods.getSevenClassVersion());
+        newOrderGoods.setSevenClassVersion(oldOrderGoods.getSevenClassVersion());
         newOrderGoods.setSevenClassStatus(2);
         newOrderGoods.setUpdateTime(DateUtils.getNowTime());
         iOrderGoodsService.updateById(newOrderGoods);

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

@@ -1745,8 +1745,13 @@
 
 
     <select id="getSevenStudyRecord" parameterType="map" resultType="com.zhongzheng.modules.user.domain.UserStudyRecord">
-        SELECT usr.* FROM user_study_record usr LEFT JOIN course_chapter cc ON usr.chapter_id = cc.chapter_id
-        WHERE usr.order_goods_id = #{orderGoodsId} AND usr.grade_id = #{gradeId} AND cc.common_sign = 1 AND usr.current_status = 1 AND usr.`status` = 1  LIMIT 1
+        SELECT
+            usr.*
+        FROM
+            user_study_record usr
+                LEFT JOIN course_chapter cc ON usr.chapter_id = cc.chapter_id
+        WHERE
+            usr.order_goods_id = #{orderGoodsId} AND usr.grade_id = #{gradeId} AND cc.common_sign = 1 AND usr.current_status = 1 AND usr.`status` = 1  LIMIT 1
     </select>
 
     <select id="selectSevenUserPeriod" parameterType="com.zhongzheng.modules.user.domain.UserBankRecord" resultType="com.zhongzheng.modules.grade.domain.UserPeriod">