fix 合并

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/CourseSectionController.java

@@ -127,6 +127,7 @@ public class CourseSectionController extends BaseController {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String operName = loginUser.getUsername();
         String message = iCourseSectionService.importSection(sectionList, updateSupport, operName);
+
         return AjaxResult.success(message);
     }
 

zhongzheng-api/src/main/java/com/zhongzheng/controller/base/UserProfileStampController.java

@@ -21,6 +21,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**

zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -41,7 +41,9 @@ import java.io.InputStream;
 import java.security.KeyStore;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 课程Controller
@@ -90,4 +92,12 @@ public class CommonController extends BaseController {
         return AjaxResult.success(Printer.num);
     }
 
+    @ApiOperation("小程序配置")
+    @GetMapping("/config")
+    public AjaxResult<Map<String,Object>> config(CourseQueryBo bo) throws InterruptedException, ParseException {
+        Map<String,Object> map = new HashMap<>();
+        map.put("hide",false);
+        return AjaxResult.success(map);
+    }
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/mapper/UserProfileMapper.java

@@ -26,4 +26,5 @@ public interface UserProfileMapper extends BaseMapper<UserProfile> {
     Long selectCountProfile(@Param("userId") Long userId,@Param("goodsId") Long goodsId);
 
     Long selectGrade(@Param("userId") Long userId,@Param("goodsId") Long goodsId);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ProfileTpServiceImpl.java

@@ -162,6 +162,7 @@ public class ProfileTpServiceImpl extends ServiceImpl<ProfileTpMapper, ProfileTp
         //查询该商品的资料模板字段
         ProfileTpQueryBo profileTpQueryBo = new ProfileTpQueryBo();
         profileTpQueryBo.setGoodsId(goodsId);
+        profileTpQueryBo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
         List<ProfileTpVo> profileTpVos = profileTpMapper.selectList(profileTpQueryBo);
         if (!CollectionUtils.isEmpty(profileTpVos)){
             return profileTpVos.get(0);

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

@@ -196,9 +196,8 @@ public class CourseSectionServiceImpl extends ServiceImpl<CourseSectionMapper, C
         String importNo = ServletUtils.getEncoded("IMPORT");
         int i=10;
         int Index = 0;
-        int size = sectionList.size();
+        int size = sectionList.size()+1;
         for (CourseSectionImport sectionImport : sectionList) {
-
             Index++;
             CourseSectionAddBo bo = new CourseSectionAddBo();
             if(!Validator.isNotEmpty(sectionImport.getName())){
@@ -287,6 +286,7 @@ public class CourseSectionServiceImpl extends ServiceImpl<CourseSectionMapper, C
             }
             errorLog = insertByAddBoImport(bo,errorLog,(size - Index));
             i++;
+
         }
         return errorLog;
     }

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

@@ -44,6 +44,8 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 
 	Integer updateUserPeriodStatus(ClassGradeUserQueryBo bo);
 
+	ClassPeriodStudentVo getUserPeriodStatus(ClassGradeUserQueryBo bo);
+
 	String pushOfficialInfo(ClassGradeUserQueryBo bo);
 
 	String pushOfficialInfoMore(List<ClassGradeUserQueryBo> list);

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

@@ -287,13 +287,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         return true;
     }
 
-    /**
-     * 获取单个用户的最新审核状态并更新
-     * @param bo
-     * @return
-     */
     @Override
-    public Integer updateUserPeriodStatus(ClassGradeUserQueryBo bo) {
+    public ClassPeriodStudentVo getUserPeriodStatus(ClassGradeUserQueryBo bo) {
         if(Validator.isEmpty(bo.getUserId())){
             throw new CustomException("参数错误");
         }
@@ -360,6 +355,26 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 gradePeriodStatus = -1;
             }
         }
+        classPeriodStudentVo.setGradePeriodStatus(gradePeriodStatus);
+        return classPeriodStudentVo;
+    }
+
+    /**
+     * 获取单个用户的最新审核状态并更新
+     * @param bo
+     * @return
+     */
+    @Override
+    public Integer updateUserPeriodStatus(ClassGradeUserQueryBo bo) {
+        ClassPeriodStudentVo classPeriodStudentVo = getUserPeriodStatus(bo);
+        Integer gradePeriodStatus = classPeriodStudentVo.getGradePeriodStatus();
+        if(Validator.isEmpty(bo.getUserId())){
+            throw new CustomException("参数错误");
+        }
+        if(Validator.isEmpty(bo.getGradeId())){
+            throw new CustomException("参数错误");
+        }
+
         LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
         classGradeUser.eq(ClassGradeUser::getUserId, bo.getUserId());
         classGradeUser.eq(ClassGradeUser::getGradeId, bo.getGradeId());
@@ -388,6 +403,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         return gradePeriodStatus;
     }
 
+
+
     /**
      * 信息推送
      * @param bo

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

@@ -178,5 +178,5 @@ public class ClassPeriodStudentVo {
 
 	private Long classEndTime;
 
-
+	private Integer gradePeriodStatus;
 }

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

@@ -31,8 +31,9 @@ import com.zhongzheng.modules.grade.domain.UserPeriodStatus;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.service.IUserPeriodService;
 import com.zhongzheng.modules.grade.service.IUserPeriodStatusService;
-import com.zhongzheng.modules.grade.vo.ClassPeriodChapterVo;
-import com.zhongzheng.modules.grade.vo.ClassPeriodSectionVo;
+
+import com.zhongzheng.modules.grade.vo.ClassPeriodStudentVo;
+
 import com.zhongzheng.modules.grade.vo.ClassPeriodVo;
 import com.zhongzheng.modules.grade.vo.UserPeriodStatusVo;
 import com.zhongzheng.modules.inform.bo.InformRemindQueryBo;
@@ -305,10 +306,11 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
 
         //新增学时记录,照片
         userPeriodSave(add, bo);
-        //完成当天学习计划
-        userPlanSave(add);
         //判断有无学习结束
         studyFinish(add);
+        //完成当天学习计划
+        userPlanSave(add);
+
         return 0;
     }
 
@@ -316,7 +318,13 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
     public void studyFinish(UserStudyRecord bo) {
         //获得当前所在班级
         if (bo.getStatus() != null && bo.getStatus().equals(1)){
-            Long secLong = 0L;
+            ClassGradeUserQueryBo gradeUserQueryBo = new ClassGradeUserQueryBo();
+            gradeUserQueryBo.setGoodsId(bo.getGoodsId());
+            gradeUserQueryBo.setUserId(bo.getUserId());
+            gradeUserQueryBo.setGradeId(bo.getGradeId());
+            ClassPeriodStudentVo classPeriodStudentVo = iClassGradeUserService.getUserPeriodStatus(gradeUserQueryBo);
+            Integer gradePeriodStatus = classPeriodStudentVo.getGradePeriodStatus();
+           /* Long secLong = 0L;
             Long studyLong = 0L;
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
             subjectStudyRecordQueryBo.setGoodsId(bo.getGoodsId());
@@ -327,15 +335,16 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
                 secLong = new BigDecimal(secLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getSectionNum().toString())).longValue();
                 studyLong = new BigDecimal(studyLong.toString()).add(new BigDecimal(subjectStudyRecordVo.getRecordNum().toString())).longValue();
-            }
+            }*/
             //发送课时完成
+            //获取旧信息
             ClassGradeUser gradeUser =iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>()
                     .eq(ClassGradeUser::getUserId,bo.getUserId()).eq(ClassGradeUser::getGradeId,bo.getGradeId()
                     ).eq(ClassGradeUser::getStatus,1).eq(ClassGradeUser::getChangeGrade,0).eq(ClassGradeUser::getPeriodStatus,-1).last("limit 1"));
+            //原本未审核才可进来
             if(Validator.isNotEmpty(gradeUser)&&gradeUser.getPeriodStatus()==-1){
-                //原本未审核才可进来
-                if (secLong.equals(studyLong)&&sectionStudyRecordVo.getExamRecordNum().equals(sectionStudyRecordVo.getExamNum())) {
-
+                //最新数据学完变为待审核
+                if (gradePeriodStatus==2) {
                     LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
                     classGradeUser.eq(ClassGradeUser::getUserId, bo.getUserId());
                     classGradeUser.eq(ClassGradeUser::getGradeId, bo.getGradeId());

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

@@ -449,7 +449,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
             update.setUpdateTime(DateUtils.getNowTime());
             b = this.updateById(update);
-            if(b&&Validator.isNotEmpty(update.getResult())){
+            if(Validator.isNotEmpty(update.getResult())){
                 if(!update.getResult().equals(userSubscribeVo.getResult())){
                     //考试结果有变更,发送短信
                     UserSubscribe userSubscribe = BeanUtil.toBean(update, UserSubscribe.class);
@@ -1288,18 +1288,6 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             userSbusciEditBo.setApplyId(applyId);
 
 
-/*            if (!StringUtils.isEmpty(userSubscribeImport.getStudentTypeName())) {
-                if (userSubscribeImport.getStudentTypeName().equals("非补考学员")) {
-                    userSbusciEditBo.setStudentType(1);
-                } else {
-                    userSbusciEditBo.setStudentType(2);
-                }
-            } else {
-                userSubscribeImport.setCause("学员报名类型有误");
-                userSubscribeImports.add(userSubscribeImport);
-                continue;
-            }*/
-
             if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteAddress())) {
                 userSbusciEditBo.setApplySiteAddress(userSubscribeImport.getApplySiteAddress());
             } else {
@@ -1461,7 +1449,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                         Map<String, Object> param = new HashMap<>();
                         param.put("goods", goodsVo1.getGoodsName());
                         param.put("score", bo.getPerformance());
-                        param.put("number", bo.getCertificateCode());
+                        param.put("number", Validator.isEmpty(bo.getCertificateCode())?"":bo.getCertificateCode());
                         IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), newExamPass);
                     }
                 }

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionChapterExamMapper.xml

@@ -47,9 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                3 as type
         <if test="userId != null ">
                 ,
-            ifnull( (select `status` from user_exam_record uer where uer.exam_id = e.exam_id and uer.user_id = #{userId} and uer.goods_id = #{goodsId} ORDER BY uer.record_id desc limit 1),-1) record_status
+            ifnull( (select `status` from user_exam_record uer where uer.exam_id = e.exam_id and uer.user_id = #{userId} and uer.goods_id = #{goodsId} and uer.chapter_exam_id = qce.chapter_exam_id and uer.module_exam_id = #{moduleExamId} ORDER BY uer.record_id desc limit 1),-1) record_status
             ,
-            ifnull( (select record_id from user_exam_record uer where uer.exam_id = e.exam_id and uer.user_id = #{userId} and uer.goods_id = #{goodsId} ORDER BY uer.record_id desc limit 1),-1) record_id
+            ifnull( (select record_id from user_exam_record uer where uer.exam_id = e.exam_id and uer.user_id = #{userId} and uer.goods_id = #{goodsId} and uer.chapter_exam_id = qce.chapter_exam_id and uer.module_exam_id = #{moduleExamId} ORDER BY uer.record_id desc limit 1),-1) record_id
         </if>
         FROM
             question_chapter_exam qce

zhongzheng-system/src/main/resources/mapper/modules/base/UserProfileMapper.xml

@@ -201,6 +201,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by up.create_time desc
     </select>
 
+
+
     <select id="selectCountProfile" parameterType="map" resultType="Long">
         SELECT
             COUNT(1)

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -184,7 +184,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             o.user_id = #{userId}
           AND og.goods_id = #{goodsId}
-          AND og.pay_status > 1
+          AND og.pay_status > 1 AND og.refund_status != 2
     </select>
     <select id="getBuyGoodsReadyPay" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultType="Long">
         SELECT