fix

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

@@ -188,6 +188,9 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
 
     @Override
     public Boolean updateByEditBo(UserBankRecordEditBo bo) {
+        if(Validator.isEmpty(bo.getOrderGoodsId())){
+            throw new CustomException("OrderGoodsId缺失");
+        }
         UserBankRecord update = BeanUtil.toBean(bo, UserBankRecord.class);
         validEntityBeforeSave(update);
         update.setStatus(1);
@@ -201,6 +204,7 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
             userStudyRecord.setUserId(bo.getUserId());
             userStudyRecord.setGoodsId(bo.getGoodsId());
             userStudyRecord.setGradeId(bo.getGradeId());
+            userStudyRecord.setOrderGoodsId(bo.getOrderGoodsId());
             userStudyRecord.setStatus(1);
             iUserStudyRecordService.studyFinish(userStudyRecord);
         }

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

@@ -553,6 +553,9 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
 
     @Override
     public void studyFinish(UserStudyRecord bo) {
+        if(Validator.isEmpty(bo.getOrderGoodsId())){
+            throw new CustomException("OrderGoodsId缺失");
+        }
         //获得当前所在班级
         if (bo.getStatus() != null && bo.getStatus().equals(1)){
             ClassGradeUserQueryBo gradeUserQueryBo = new ClassGradeUserQueryBo();
@@ -588,6 +591,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                     LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
                     classGradeUser.eq(ClassGradeUser::getUserId, bo.getUserId());
                     classGradeUser.eq(ClassGradeUser::getGradeId, bo.getGradeId());
+                    classGradeUser.eq(ObjectUtils.isNotNull(bo.getOrderGoodsId()),ClassGradeUser::getOrderGoodsId, bo.getOrderGoodsId());
                     ClassGradeUser classGradeUser1 = new ClassGradeUser();
                     classGradeUser1.setPeriodStatus(2);
                     classGradeUser1.setPeriodWaitTime(DateUtils.getNowTime());
@@ -607,12 +611,14 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                         editBo.setGoodsId(bo.getGoodsId());
                         editBo.setGradeId(bo.getGradeId());
                         editBo.setUserId(bo.getUserId());
+                        editBo.setOrderGoodsId(bo.getOrderGoodsId());
                         iUserPeriodService.editPeriodAll(editBo);
                         //复审
                         UserPeriodEditBo confirm = new UserPeriodEditBo();
                         confirm.setGoodsId(bo.getGoodsId());
                         confirm.setGradeId(bo.getGradeId());
                         confirm.setUserId(bo.getUserId());
+                        confirm.setOrderGoodsId(bo.getOrderGoodsId());
                         iUserPeriodService.confirmPeriod(confirm);
                         return;
                     }