fix 同步公共课程

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

@@ -290,10 +290,12 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         classGradeUserQueryBo.setGoodsId(userPeriodVo.getGoodsId());
         if(Validator.isNotEmpty(userPeriodVo.getOrderGoodsId())){
             classGradeUserQueryBo.setOrderGoodsId(userPeriodVo.getOrderGoodsId());
+            bo.setOrderGoodsId(userPeriodVo.getOrderGoodsId());
         }else{
             //非七大员
             ClassGradeUser classGradeUser =iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getGradeId, userPeriodVo.getGradeId()).eq(ClassGradeUser::getUserId, userPeriodVo.getUserId()).last("limit 1"));
             classGradeUserQueryBo.setOrderGoodsId(classGradeUser.getOrderGoodsId());
+            bo.setOrderGoodsId(classGradeUser.getOrderGoodsId());
         }
         Integer gradePeriodStatus = iClassGradeUserService.updateUserPeriodStatus(classGradeUserQueryBo);
         //发送审核不通过消息
@@ -407,10 +409,12 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         classGradeUserQueryBo.setGoodsId(bo.getGoodsId());
         if(Validator.isNotEmpty(orderGoodsId)){
             classGradeUserQueryBo.setOrderGoodsId(orderGoodsId);
+            bo.setOrderGoodsId(orderGoodsId);
         }else{
             //非七大员
             ClassGradeUser classGradeUser =iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getGradeId, bo.getGradeId()).eq(ClassGradeUser::getUserId, bo.getUserId()).last("limit 1"));
             classGradeUserQueryBo.setOrderGoodsId(classGradeUser.getOrderGoodsId());
+            bo.setOrderGoodsId(classGradeUser.getOrderGoodsId());
         }
         Integer gradePeriodStatus = iClassGradeUserService.updateUserPeriodStatus(classGradeUserQueryBo);
         //发送审核不通过消息
@@ -434,6 +438,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
         ClassGradeUser classGradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>()
                 .eq(ClassGradeUser::getUserId, bo.getUserId())
                 .eq(ClassGradeUser::getGradeId, bo.getGradeId())
+                .eq(ClassGradeUser::getOrderGoodsId, bo.getOrderGoodsId())
                 .last("limit 1"));
         //获取业务学时审核数据
         Goods goods = iGoodsService.getById(bo.getGoodsId());
@@ -483,6 +488,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             classGradeUserQueryBo.setUserId(bo.getUserId());
             classGradeUserQueryBo.setGradeId(bo.getGradeId());
             classGradeUserQueryBo.setGoodsId(bo.getGoodsId());
+            classGradeUserQueryBo.setOrderGoodsId(bo.getOrderGoodsId());
 
             ClassGradeUser gradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getUserId,bo.getUserId()).eq(ClassGradeUser::getGradeId,bo.getGradeId()).last("limit 1"));
             if(Validator.isNotEmpty(gradeUser)){
@@ -947,12 +953,13 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean rollbackPeriod(UserPeriodEditBo bo) {
-        if (Validator.isEmpty(bo.getUserId()) || Validator.isEmpty(bo.getGoodsId()) || Validator.isEmpty(bo.getGradeId())) {
+        if (Validator.isEmpty(bo.getUserId()) || Validator.isEmpty(bo.getGoodsId()) || Validator.isEmpty(bo.getGradeId())|| Validator.isEmpty(bo.getOrderGoodsId())) {
             throw new CustomException("参数不全");
         }
         ClassGradeUser classGradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>()
                 .eq(ClassGradeUser::getUserId, bo.getUserId())
                 .eq(ClassGradeUser::getGradeId, bo.getGradeId())
+                .eq(ClassGradeUser::getOrderGoodsId, bo.getOrderGoodsId())
                 .last("limit 1"));
         if (Validator.isEmpty(classGradeUser) || classGradeUser.getPeriodStatus() != 3) {
             throw new CustomException("非审核中状态无法打回操作");
@@ -1013,7 +1020,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             return;
         }
         redisCache.setCacheObject(key, 1L, 10, TimeUnit.SECONDS);//1分钟
-        ClassGradeUser gradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getUserId,bo.getUserId()).eq(ClassGradeUser::getGradeId,bo.getGradeId()).last("limit 1"));
+        ClassGradeUser gradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getUserId,bo.getUserId()).eq(ClassGradeUser::getGradeId,bo.getGradeId()).eq(ClassGradeUser::getOrderGoodsId,bo.getOrderGoodsId()).last("limit 1"));
         if(Validator.isNotEmpty(gradeUser)){
             bo.setOrderGoodsId(gradeUser.getOrderGoodsId());
         }
@@ -1124,7 +1131,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             return;
         }
         redisCache.setCacheObject(key, 1L, 10, TimeUnit.SECONDS);//1分钟
-        ClassGradeUser gradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getUserId,bo.getUserId()).eq(ClassGradeUser::getGradeId,bo.getGradeId()).last("limit 1"));
+        ClassGradeUser gradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getUserId,bo.getUserId()).eq(ClassGradeUser::getGradeId,bo.getGradeId()).eq(ClassGradeUser::getOrderGoodsId,bo.getOrderGoodsId()).last("limit 1"));
         if(Validator.isNotEmpty(gradeUser)){
             bo.setOrderGoodsId(gradeUser.getOrderGoodsId());
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsRefundServiceImpl.java

@@ -245,7 +245,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
             }
             //判断是否已标记
             ClassGradeUser classGradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getGradeId,orderGoods.getGradeId())
-                    .eq(ClassGradeUser::getUserId,order.getUserId()));
+                    .eq(ClassGradeUser::getUserId,order.getUserId()).eq(ClassGradeUser::getOrderGoodsId,orderGoods.getOrderGoodsId()));
             if(Validator.isNotEmpty(classGradeUser)&&Validator.isNotEmpty(classGradeUser.getLearnStatus())&&classGradeUser.getLearnStatus()==1){
                 throw new CustomException("已标记开通不满足退款");
             }
@@ -391,7 +391,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
                 }
                 //判断是否已标记
                 ClassGradeUser classGradeUser = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>().eq(ClassGradeUser::getGradeId,orderGoods.getGradeId())
-                        .eq(ClassGradeUser::getUserId,order.getUserId()));
+                        .eq(ClassGradeUser::getUserId,order.getUserId()).eq(ClassGradeUser::getOrderGoodsId,orderGoods.getOrderGoodsId()));
                 if(Validator.isNotEmpty(classGradeUser)&&Validator.isNotEmpty(classGradeUser.getLearnStatus())&&classGradeUser.getLearnStatus()==1){
                     throw new CustomException("已标记开通不满足退款");
                 }