修改无数BUG

src/main/java/com/ygj/yuemum/dao/college/CollegeCurriculumCoreDao.java

@@ -24,6 +24,7 @@ public interface CollegeCurriculumCoreDao {
     ReturnUserLearningCoreDetail queryCoreDetail (CollegeCurriculumQuery collegeCurriculumQuery);
 
     int updatePositive(String c_code);
+    int updateCoreCount(String c_code);
 
     CollegeCurriculumCore queryCoreByCode(String c_code);
 

src/main/java/com/ygj/yuemum/dao/college/CollegeUserPointsDao.java

@@ -1,5 +1,6 @@
 package com.ygj.yuemum.dao.college;
 
+import com.ygj.yuemum.domain.college.CollegePointsDetail;
 import com.ygj.yuemum.domain.college.CollegeUserPoints;
 import org.springframework.stereotype.Repository;
 
@@ -20,5 +21,5 @@ public interface CollegeUserPointsDao {
 
     int updateByPrimaryKeySelective(CollegeUserPoints record);
 
-    int updatePointsByTest(String openid);
+    int updatePointsByTest(CollegePointsDetail collegePointsDetail);
 }

src/main/java/com/ygj/yuemum/domain/college/ReturnUserLearningCoreDetail.java

@@ -17,12 +17,21 @@ public class ReturnUserLearningCoreDetail {
     private Integer id;
     private Integer testid;
     private Integer positive;
+    private Integer ispositive;
     private String video_href;
     private  Integer result;
     private Integer status;
     private String rate;
     private String rate_time;
 
+    public Integer getIspositive() {
+        return ispositive;
+    }
+
+    public void setIspositive(Integer ispositive) {
+        this.ispositive = ispositive;
+    }
+
     public String getRate_time() {
         return rate_time;
     }

src/main/java/com/ygj/yuemum/service/college/CollegeCurriculumCoreService.java

@@ -82,8 +82,10 @@ public class CollegeCurriculumCoreService {
                     //育儿课程加孕周课程
                     List<CollegeCurriculumCore> collegeCurriculumCores = collegeCurriculumCoreDao.queryUserLearningCore(collegeCurriculumQueryB);
                     for (CollegeCurriculumCore collegeCurriculumCore : collegeCurriculumCores) {
-                        if (collegeCurriculumCore.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
+                        if (collegeCurriculumCore.getStatus() != null && collegeCurriculumCore.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
                             collegeCurriculumCore.setStatus("已完成");
+                        } else if(collegeCurriculumCore.getStatus() != null && collegeCurriculumCore.getStatus().equals("2")){
+                            collegeCurriculumCore.setStatus("待完成");
                         } else {
                             if (collegeCurriculumCore.getC_step() >= DateUtil.getWeekDiff(dateNow, getDate)) {
                                 collegeCurriculumCore.setStatus("待完成");
@@ -98,8 +100,10 @@ public class CollegeCurriculumCoreService {
                     collegeCurriculumQueryP.setC_step(LMP);
                     List<CollegeCurriculumCore> collegeCurriculumCore_p = collegeCurriculumCoreDao.queryUserLearningCore(collegeCurriculumQueryP);
                     for (CollegeCurriculumCore collegeCurriculumCore : collegeCurriculumCore_p) {
-                        if (collegeCurriculumCore.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
+                        if (collegeCurriculumCore.getStatus() != null && collegeCurriculumCore.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
                             collegeCurriculumCore.setStatus("已完成");
+                        } else if (collegeCurriculumCore.getStatus() != null && collegeCurriculumCore.getStatus().equals("2")) {
+                            collegeCurriculumCore.setStatus("待完成");
                         } else {
                             if (collegeCurriculumCore.getC_step() >= DateUtil.getWeekDiff(dateNow, getDate)) {
                                 collegeCurriculumCore.setStatus("待完成");
@@ -126,8 +130,10 @@ public class CollegeCurriculumCoreService {
                     //孕周课程
                     List<CollegeCurriculumCore> collegeCurriculumCores = collegeCurriculumCoreDao.queryUserLearningCore(collegeCurriculumQuery);
                     for (CollegeCurriculumCore collegeCurriculumCore : collegeCurriculumCores) {
-                        if (collegeCurriculumCore.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
+                        if (collegeCurriculumCore.getStatus() != null && collegeCurriculumCore.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
                             collegeCurriculumCore.setStatus("已完成");
+                        } else if (collegeCurriculumCore.getStatus() != null && collegeCurriculumCore.getStatus().equals("2")) {
+                            collegeCurriculumCore.setStatus("待完成");
                         } else {
                             if (collegeCurriculumCore.getC_step() >= DateUtil.getWeekDiff(dateNow, getDate)) {
                                 collegeCurriculumCore.setStatus("待完成");
@@ -162,8 +168,14 @@ public class CollegeCurriculumCoreService {
                 list.put("collegeStatus", "完成度100%");
                 list.put("collegeFinish", "已完成");
             } else if (returnUserLearningCoreDetail.getStatus() != null && returnUserLearningCoreDetail.getStatus() == 2) {
-                list.put("collegeStatus", "完成度" + returnUserLearningCoreDetail.getRate() + "%");
-                list.put("collegeFinish", "未完成");
+                if(returnUserLearningCoreDetail.getRate().equals("100%")) {
+                    list.put("collegeStatus", "完成度100%");
+                    list.put("collegeFinish", "已完成");
+                } else {
+                    list.put("collegeStatus", "完成度" + returnUserLearningCoreDetail.getRate());
+                    list.put("collegeFinish", "未完成");
+                }
+
             } else {
                 list.put("collegeStatus", "完成度0%");
                 list.put("collegeFinish", "未完成");
@@ -204,6 +216,7 @@ public class CollegeCurriculumCoreService {
         tableData.put("rate", returnUserLearningCoreDetail.getRate());
         tableData.put("countdown", returnUserLearningCoreDetail.getRate_time());
         tableData.put("video_href",returnUserLearningCoreDetail.getVideo_href());
+        tableData.put("ispositive",returnUserLearningCoreDetail.getIspositive());
         if(returnUserLearningCoreDetail.getRate_time() != null) {
             String coreTime[] = returnUserLearningCoreDetail.getVideo_length().split(":");
             int coreHours = Integer.parseInt(coreTime[0]) * 60 * 60;
@@ -272,15 +285,13 @@ public class CollegeCurriculumCoreService {
 //                collegeUserPointsNew.setCredit_total(collegeCurriculumCore.getCredit());
 //                collegeUserPointsService.addCollegeUserPoints(collegeUserPointsNew);
 //            }
-            CollegeLearningDetail collegeLearningDetail1 = new CollegeLearningDetail();
-            collegeLearningDetail1.setOpen_id(openid);
-            collegeLearningDetail1.setC_code(c_code);
-            collegeLearningDetail1.setDate(sdf.format(new Date()));
-            collegeLearningDetail1.setCredit(collegeCurriculumCore.getCredit());
-            collegeLearningDetail1.setStatus(9);
-            collegeLearningDetailService.addCollegeLearningDetail(collegeLearningDetail1);
             //已学人数增加
-            collegeCurriculumCoreDao.updatePositive(c_code);
+            collegeLearningDetail.setId(collegeLearningDetailOld.getId());
+            collegeLearningDetail.setRate("100%");
+            collegeLearningDetail.setStatus(2);
+            collegeLearningDetail.setDate(sdf.format(new Date()));
+            collegeLearningDetail.setRate_time("00:00");
+            collegeLearningDetailService.updateCollegeLearningDetail(collegeLearningDetail);
             return 1;
         }
     }
@@ -315,19 +326,19 @@ public class CollegeCurriculumCoreService {
             if(collegeLearningDetailOld == null) {
                 collegeLearningDetail.setRate(rateValue);
                 collegeLearningDetail.setDate(sdf.format(new Date()));
-                collegeLearningDetail.setStatus(1);
+                collegeLearningDetail.setStatus(2);
                 collegeLearningDetail.setRate_time(rate);
                 collegeLearningDetailService.addCollegeLearningDetail(collegeLearningDetail);
+                collegeCurriculumCoreDao.updateCoreCount(c_code);
                 return 1;
             } else {
-
                 if(collegeLearningDetailOld.getStatus() == 9) {
                     return 0;
                 } else {
                     if (Double.parseDouble(rateValue.replace("%","")) > Double.parseDouble(collegeLearningDetailOld.getRate().replace("%",""))) {
                         collegeLearningDetail.setId(collegeLearningDetailOld.getId());
                         collegeLearningDetail.setRate(rateValue);
-                        collegeLearningDetail.setStatus(1);
+                        collegeLearningDetail.setStatus(2);
                         collegeLearningDetail.setDate(sdf.format(new Date()));
                         collegeLearningDetail.setRate_time(rate);
                         collegeLearningDetailService.updateCollegeLearningDetail(collegeLearningDetail);

src/main/java/com/ygj/yuemum/service/college/CollegeCurriculumExperienceService.java

@@ -111,14 +111,15 @@ public class CollegeCurriculumExperienceService {
                 }
                 List<CollegeCurriculumExperience> collegeCurriculumExperiences = collegeCurriculumExperienceDao.queryUserLearningExperience(collegeCurriculumQuery);
                 for (CollegeCurriculumExperience collegeCurriculumExperience : collegeCurriculumExperiences) {
-                    if (collegeCurriculumExperience.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
+                    if (collegeCurriculumExperience.getStatus() != null && collegeCurriculumExperience.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
                         collegeCurriculumExperience.setStatus("已完成");
+                        collegeCurriculumExperience.setLearningStatus("已完成");
+                    } else if (collegeCurriculumExperience.getStatus() != null && collegeCurriculumExperience.getStatus().equals("1")) {
+                        collegeCurriculumExperience.setStatus("已预约");
+                        collegeCurriculumExperience.setLearningStatus("查看预约");
                     } else {
-                        if (collegeCurriculumExperience.getC_step() >= DateUtil.getWeekDiff(dateNow, getDate)) {
-                            collegeCurriculumExperience.setStatus("待完成");
-                        } else {
-                            collegeCurriculumExperience.setStatus("未完成");
-                        }
+                        collegeCurriculumExperience.setStatus("未完成");
+                        collegeCurriculumExperience.setLearningStatus("立即预约");
                     }
                 }
                 tableData.put("collegeCurriculumExperiences", collegeCurriculumExperiences);

src/main/java/com/ygj/yuemum/service/college/CollegeCurriculumPracticeService.java

@@ -133,16 +133,16 @@ public class CollegeCurriculumPracticeService {
                             collegeCurriculumPractice.setLearningStatus("已过期");
                             collegeCurriculumPractice.setStatus("已过期");
                         } else {
-                            collegeCurriculumPractice.setLearningStatus("待完成");
-                            collegeCurriculumPractice.setStatus("查看报名");
+                            collegeCurriculumPractice.setLearningStatus("查看报名");
+                            collegeCurriculumPractice.setStatus("已报名");
                         }
                     } else {
                         if(dateNow.getTime() > endMillisecond) {
                             collegeCurriculumPractice.setLearningStatus("已过期");
                             collegeCurriculumPractice.setStatus("已过期");
                         } else {
-                            collegeCurriculumPractice.setLearningStatus("未完成");
-                            collegeCurriculumPractice.setStatus("立即报名");
+                            collegeCurriculumPractice.setLearningStatus("立即报名");
+                            collegeCurriculumPractice.setStatus("待完成");
                         }
                     }
                 }

src/main/java/com/ygj/yuemum/service/college/CollegeTestDetailService.java

@@ -1,14 +1,13 @@
 package com.ygj.yuemum.service.college;
 
 import com.ygj.yuemum.dao.college.CollegeTestDetailDao;
-import com.ygj.yuemum.domain.college.CollegeTest;
-import com.ygj.yuemum.domain.college.CollegeTestDetail;
-import com.ygj.yuemum.domain.college.CollegeTestResult;
-import com.ygj.yuemum.domain.college.CollegeUserPoints;
+import com.ygj.yuemum.domain.college.*;
 import org.omg.PortableInterceptor.INACTIVE;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 
@@ -23,6 +22,10 @@ public class CollegeTestDetailService {
     private CollegeTestService collegeTestService;
     @Autowired
     private CollegeUserPointsService collegeUserPointsService;
+    @Autowired
+    private CollegeLearningDetailService collegeLearningDetailService;
+    @Autowired
+    private CollegeCurriculumCoreService collegeCurriculumCoreService;
 
     public List<CollegeTestDetail> getCollegeTestDetails() {
         List<CollegeTestDetail> collegeTestDetails = collegeTestDetailDao.getAll();
@@ -53,6 +56,7 @@ public class CollegeTestDetailService {
     public LinkedHashMap<String, Object> addTestDetail(String openid, Integer core_id, String answers) {
         LinkedHashMap<String, Object> tableData = new LinkedHashMap<>();
         CollegeTestDetail collegeTestDetailQuery = new CollegeTestDetail();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         collegeTestDetailQuery.setOpenid(openid);
         collegeTestDetailQuery.setCoreid(core_id);
         if(collegeTestDetailDao.selectByOpenId(collegeTestDetailQuery) == null) {
@@ -82,14 +86,28 @@ public class CollegeTestDetailService {
             collegeTestDetail.setResult(score);
             collegeTestDetail.setAnswers(answers);
             collegeTestDetailDao.insertSelective(collegeTestDetail);
+
+            // 常规课完成
+            CollegeCurriculumCore collegeCurriculumCore = collegeCurriculumCoreService.getCollegeCurriculumCore(core_id);
+            CollegeLearningDetail collegeLearningDetail1 = new CollegeLearningDetail();
+            collegeLearningDetail1.setOpen_id(openid);
+            collegeLearningDetail1.setC_code(collegeCurriculumCore.getC_code());
+            collegeLearningDetail1.setDate(sdf.format(new Date()));
+            collegeLearningDetail1.setCredit(collegeCurriculumCore.getCredit());
+            collegeLearningDetail1.setStatus(9);
+            collegeLearningDetail1.setRate("100%");
+            collegeLearningDetailService.addCollegeLearningDetail(collegeLearningDetail1);
             //增加学分
+            CollegePointsDetail collegePointsDetail = new CollegePointsDetail();
+            collegePointsDetail.setOpenid(openid);
+            collegePointsDetail.setCredit(collegeCurriculumCore.getCredit());
             if (collegeUserPointsService.queryOneUserPoints(openid) != null) {
-                collegeUserPointsService.updatePointsByTest(openid);
+                collegeUserPointsService.updatePointsByTest(collegePointsDetail);
             } else {
                 CollegeUserPoints collegeUserPoints = new CollegeUserPoints();
                 collegeUserPoints.setOpenid(openid);
-                collegeUserPoints.setCredit_available(1);
-                collegeUserPoints.setCredit_total(1);
+                collegeUserPoints.setCredit_available(collegeCurriculumCore.getCredit());
+                collegeUserPoints.setCredit_total(collegeCurriculumCore.getCredit());
                 collegeUserPointsService.addCollegeUserPoints(collegeUserPoints);
             }
             return tableData;

src/main/java/com/ygj/yuemum/service/college/CollegeUserPointsService.java

@@ -73,8 +73,8 @@ public class CollegeUserPointsService {
         return collegeUserPointsDao.updateByPrimaryKeySelective(collegeUserPoints);
     }
 
-    public int updatePointsByTest(String openid) {
-        return collegeUserPointsDao.updatePointsByTest(openid);
+    public int updatePointsByTest(CollegePointsDetail collegePointsDetail) {
+        return collegeUserPointsDao.updatePointsByTest(collegePointsDetail);
     }
 
     public CollegeUserPoints queryOneUserPoints(String openid) {
@@ -96,6 +96,9 @@ public class CollegeUserPointsService {
                     CollegeCurriculumCore collegeCurriculumCoreQuery = new CollegeCurriculumCore();
                     CollegeCurriculumPractice collegeCurriculumPracticeQuery = new CollegeCurriculumPractice();
                     CollegeCurriculumExperience collegeCurriculumExperienceQuery = new CollegeCurriculumExperience();
+                    collegeCurriculumCoreQuery.setOpenid(openid);
+                    collegeCurriculumPracticeQuery.setOpenid(openid);
+                    collegeCurriculumExperienceQuery.setOpenid(openid);
                     CollegePointsDetail collegePointsDetail = new CollegePointsDetail();
                     if (wxUser.getXu_content_type().equals("B01")) { //育儿
                         if (dateNow.getTime() < getDate.getTime()) {
@@ -121,11 +124,11 @@ public class CollegeUserPointsService {
                             } else {
                                 tableData.put("stage_step", LMP - DateUtil.getWeekDiff(dateNow, getDate));
                                 collegeCurriculumCoreQuery.setC_type("P01");
-                                collegeCurriculumCoreQuery.setC_step(LMP -DateUtil.getWeekDiff(dateNow, getDate));
+                                collegeCurriculumCoreQuery.setC_step(LMP - DateUtil.getWeekDiff(dateNow, getDate));
                                 collegeCurriculumPracticeQuery.setC_type("P01");
-                                collegeCurriculumPracticeQuery.setC_step(LMP -DateUtil.getWeekDiff(dateNow, getDate));
+                                collegeCurriculumPracticeQuery.setC_step(LMP - DateUtil.getWeekDiff(dateNow, getDate));
                                 collegeCurriculumExperienceQuery.setC_type("P01");
-                                collegeCurriculumExperienceQuery.setC_step(LMP -DateUtil.getWeekDiff(dateNow, getDate));
+                                collegeCurriculumExperienceQuery.setC_step(LMP - DateUtil.getWeekDiff(dateNow, getDate));
                             }
                         } else {
                             return tableData;
@@ -191,6 +194,19 @@ public class CollegeUserPointsService {
                     tableData.put("present_received", collegePresentRules);
                     //常规课
                     List<CollegeCurriculumCore> collegeCurriculumCores = collegeCurriculumCoreService.queryCoreByStep(collegeCurriculumCoreQuery);
+                    for (CollegeCurriculumCore collegeCurriculumCore : collegeCurriculumCores) {
+                        if (collegeCurriculumCore.getStatus() != null && collegeCurriculumCore.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
+                            collegeCurriculumCore.setStatus("已完成");
+                        } else if (collegeCurriculumCore.getStatus() != null && collegeCurriculumCore.getStatus().equals("2")) {
+                            collegeCurriculumCore.setStatus("待完成");
+                        } else {
+                            if (collegeCurriculumCore.getC_step() >= DateUtil.getWeekDiff(dateNow, getDate)) {
+                                collegeCurriculumCore.setStatus("待完成");
+                            } else {
+                                collegeCurriculumCore.setStatus("未完成");
+                            }
+                        }
+                    }
                     tableData.put("college_core", collegeCurriculumCores);
 
                     //实践课
@@ -199,42 +215,42 @@ public class CollegeUserPointsService {
                     collegeCurriculumPracticeQuery.setStartdate(sdf.format(new Date()));
                     List<CollegeCurriculumPractice> collegeCurriculumPractices = collegeCurriculumPracticeService.queryPracticeByStep(collegeCurriculumPracticeQuery);
                     //判断日期
-                    for(CollegeCurriculumPractice collegeCurriculumPractice:collegeCurriculumPractices) {
-                        Date deadLine =  ldf.parse(collegeCurriculumPractice.getDeadline());
-                        Date now  =new Date();
-                        if(collegeCurriculumPractice.getLearningStatus() != null && collegeCurriculumPractice.getLearningStatus().equals("9")) {
+                    for (CollegeCurriculumPractice collegeCurriculumPractice : collegeCurriculumPractices) {
+                        Date deadLine = ldf.parse(collegeCurriculumPractice.getDeadline());
+                        Date now = new Date();
+                        if (collegeCurriculumPractice.getLearningStatus() != null && collegeCurriculumPractice.getLearningStatus().equals("9")) {
                             //已完成
                             collegeCurriculumPractice.setStatus("已完成");
                             //已完成
                             collegeCurriculumPractice.setLearningStatus("已完成");
                         } else if (collegeCurriculumPractice.getLearningStatus() != null && collegeCurriculumPractice.getLearningStatus().equals("1")) {
-                            if(now.getTime() > deadLine.getTime()){
+                            if (now.getTime() > deadLine.getTime()) {
                                 //未完成
-                                collegeCurriculumPractice.setStatus("已过期");
+                                collegeCurriculumPractice.setStatus("未完成");
                                 //已过期
-                                collegeCurriculumPractice.setLearningStatus("未完成");
-                            }  else {
+                                collegeCurriculumPractice.setLearningStatus("已过期");
+                            } else {
                                 //待完成
-                                collegeCurriculumPractice.setStatus("查看报名");
+                                collegeCurriculumPractice.setStatus("已报名");
                                 //查看报名
-                                collegeCurriculumPractice.setLearningStatus("待完成");
+                                collegeCurriculumPractice.setLearningStatus("查看报名");
                             }
                         } else {
-                            if(now.getTime() > deadLine.getTime()){
+                            if (now.getTime() > deadLine.getTime()) {
                                 //未完成
-                                collegeCurriculumPractice.setStatus("已过期");
+                                collegeCurriculumPractice.setStatus("未完成");
                                 //已过期
-                                collegeCurriculumPractice.setLearningStatus("未完成");
+                                collegeCurriculumPractice.setLearningStatus("已过期");
                             } else if (collegeCurriculumPractice.getPcount() >= 99) {
                                 //未完成
-                                collegeCurriculumPractice.setStatus("已约满");
+                                collegeCurriculumPractice.setStatus("未完成");
                                 //已约满
-                                collegeCurriculumPractice.setLearningStatus("未完成");
+                                collegeCurriculumPractice.setLearningStatus("已约满");
                             } else {
                                 //待完成
-                                collegeCurriculumPractice.setStatus("立即报名");
+                                collegeCurriculumPractice.setStatus("待完成");
                                 //立即报名
-                                collegeCurriculumPractice.setLearningStatus("待完成");
+                                collegeCurriculumPractice.setLearningStatus("立即报名");
                             }
                         }
                     }
@@ -242,6 +258,18 @@ public class CollegeUserPointsService {
                     //体验课
                     collegeCurriculumExperienceQuery.setCity(city);
                     List<CollegeCurriculumExperience> collegeCurriculumExperiences = collegeCurriculumExperienceService.queryExperienceByStep(collegeCurriculumExperienceQuery);
+                    for (CollegeCurriculumExperience collegeCurriculumExperience : collegeCurriculumExperiences) {
+                        if (collegeCurriculumExperience.getStatus() != null && collegeCurriculumExperience.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
+                            collegeCurriculumExperience.setStatus("已完成");
+                            collegeCurriculumExperience.setLearningStatus("已完成");
+                        } else if (collegeCurriculumExperience.getStatus() != null && collegeCurriculumExperience.getStatus().equals("1")) {
+                            collegeCurriculumExperience.setStatus("已预约");
+                            collegeCurriculumExperience.setLearningStatus("查看预约");
+                        } else {
+                            collegeCurriculumExperience.setStatus("未完成");
+                            collegeCurriculumExperience.setLearningStatus("立即预约");
+                        }
+                    }
                     tableData.put("college_experience", collegeCurriculumExperiences);
                     return tableData;
                 } catch (Exception ex) {
@@ -292,7 +320,7 @@ public class CollegeUserPointsService {
                 CollegeLearningDetail collegeLearningDetail = new CollegeLearningDetail();
                 collegeLearningDetail.setOpen_id(openid);
                 collegeLearningDetail.setC_code(c_code.substring(8, c_code.length()));
-                CollegeLearningDetail collegeLearningDetailC  = collegeLearningDetailService.checkCorePositive(collegeLearningDetail);
+                CollegeLearningDetail collegeLearningDetailC = collegeLearningDetailService.checkCorePositive(collegeLearningDetail);
                 if (collegeLearningDetailC.getStatus() != 9) {
                     collegeLearningDetailC.setDate(sdf.format(new Date()));
                     collegeLearningDetailC.setStatus(9);
@@ -303,7 +331,7 @@ public class CollegeUserPointsService {
                 }
                 //判断是否已经学习 增加学分
                 CollegeUserPoints collegeUserPoints = collegeUserPointsDao.queryOneUserPoints(openid);
-                if(collegeUserPoints == null) {
+                if (collegeUserPoints == null) {
                     CollegeUserPoints collegeUserPointsNew = new CollegeUserPoints();
                     collegeUserPointsNew.setOpenid(openid);
                     collegeUserPointsNew.setCredit_total(credit);

src/main/resources/mybatis/mapper/college/CollegeBookingMapper.xml

@@ -43,7 +43,6 @@
     <delete id="bookingCancel" parameterType="com.ygj.yuemum.domain.college.CollegeBooking"  >
         delete from college_booking
         where openid = #{openid,jdbcType=VARCHAR}
-        and phone = #{phone,jdbcType=VARCHAR}
         and college_code = #{college_code,jdbcType=VARCHAR}
     </delete>
 

src/main/resources/mybatis/mapper/college/CollegeCurriculumCoreMapper.xml

@@ -37,23 +37,10 @@
 
     <select id="queryUserLearningCoreDetail" resultType="com.ygj.yuemum.domain.college.ReturnUserLearningCoreDetail" parameterType="com.ygj.yuemum.domain.college.CollegeCurriculumQuery">
         SELECT
-            ccc.c_code,
-            ccc.c_name,
-            ccc.pcount,
-            ccc.credit,
-            ccc.video_length,
-            ccc.img_head_href,
-            ccc.t_image_href,
-            ccc.t_name,
-            ccc.t_desc,
-            ccc.c_desc,
-            ccc.isvideo,
-            ccc.istest,
-            ccc.testid,
-            ccc.id,
-            (select result from college_test_detail where coreid = ccc.id and openid = #{openid,jdbcType=VARCHAR}) result,
-            (select status from college_learning_detail where c_code = ccc.c_code  and open_id = #{openid,jdbcType=VARCHAR} order by `status` desc limit 1) `status`,
-            IFNULL((select rate from college_learning_detail where c_code = ccc.c_code  and open_id = #{openid,jdbcType=VARCHAR} order by `status` desc limit 1),'0%') `rate`
+            ccc.*,
+            (select result from college_test_detail where coreid = ccc.id and  `status` != 8 and openid = #{openid,jdbcType=VARCHAR}) result,
+            (select status from college_learning_detail where c_code = ccc.c_code  and  `status` != 8 and open_id = #{openid,jdbcType=VARCHAR} order by `status` desc limit 1) `status`,
+            IFNULL((select rate from college_learning_detail where c_code = ccc.c_code  and  `status` != 8 and open_id = #{openid,jdbcType=VARCHAR} order by `status` desc limit 1),'0%') `rate`
         FROM
             college_curriculum_core  as ccc
         WHERE
@@ -75,9 +62,10 @@
             ccc.isvideo,
             ccc.video_length,
             ccc.video_href,
-            (select status from college_learning_detail where c_code = ccc.c_code  and open_id = #{openid,jdbcType=VARCHAR} order by `status` desc limit 1) `status`,
-            IFNULL((select rate from college_learning_detail where c_code = ccc.c_code  and open_id = #{openid,jdbcType=VARCHAR} order by `status` desc limit 1),'0%') `rate`,
-            IFNULL((select rate_time from college_learning_detail where c_code = ccc.c_code  and open_id = #{openid,jdbcType=VARCHAR} order by `status` desc limit 1),ccc.video_length) `rate_time`
+            (select status from college_learning_detail where c_code = ccc.c_code and  `status` != 8 and open_id = #{openid,jdbcType=VARCHAR} order by `status` desc limit 1) `status`,
+            IFNULL((select rate from college_learning_detail where c_code = ccc.c_code  and  `status` != 8 and open_id = #{openid,jdbcType=VARCHAR} order by `status` desc limit 1),'0%') `rate`,
+            IFNULL((select rate_time from college_learning_detail where c_code = ccc.c_code  and  `status` != 8 and open_id = #{openid,jdbcType=VARCHAR} order by `status` desc limit 1),ccc.video_length) `rate_time`,
+            IFNULL((select status from college_learning_detail where c_code = ccc.c_code and  `status` = 8 and open_id = #{openid,jdbcType=VARCHAR} order by `status` desc limit 1),0) ispositive
         FROM
             college_curriculum_core  as ccc
         WHERE
@@ -89,32 +77,10 @@
     <select id="queryUserLearningCore" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumCore"
             parameterType="com.ygj.yuemum.domain.college.CollegeCurriculumQuery">
         SELECT
-        cc.id,
-        cc.c_code,
-        c_seq,
-        c_name,
-        c_type,
-        c_step,
-        c_desc,
-        cc.credit,
-        img_head_href,
-        cd.c_code AS cd_code,
-        IFNULL(cd.`status`,0) status,
-        pcount,
-        positive,
-        negative,
-        t_name,
-        t_desc,
-        t_image_href,
-        c_content,
-        istest,
-        isvideo,
-        testid,
-        video_href,
-        video_length
+        ccc.*,
+        (select status from college_learning_detail where c_code = ccc.c_code  and open_id = #{openid,jdbcType=VARCHAR} and `status` != 8 order by `status` desc limit 1) `status`
         FROM
-        college_curriculum_core AS cc
-        LEFT JOIN ( SELECT * FROM college_learning_detail WHERE open_id = #{openid,jdbcType=VARCHAR} ORDER BY id DESC LIMIT 1 ) AS cd ON cc.c_code = cd.c_code
+        college_curriculum_core AS ccc
         WHERE
         c_type = #{c_type,jdbcType=VARCHAR}
         and
@@ -302,6 +268,11 @@
         where c_code =  #{c_code,jdbcType=VARCHAR}
     </update>
 
+    <update id="updateCoreCount" parameterType="java.lang.String">
+        update college_curriculum_core set pcount = pcount +1
+        where c_code =  #{c_code,jdbcType=VARCHAR}
+    </update>
+
     <update id="updateByPrimaryKeySelective" parameterType="com.ygj.yuemum.domain.college.CollegeCurriculumCore">
         update college_curriculum_core
         <set>

src/main/resources/mybatis/mapper/college/CollegeCurriculumPracticeMapper.xml

@@ -70,7 +70,7 @@
     <select id="queryPracticeByStep" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumPractice" parameterType="com.ygj.yuemum.domain.college.CollegeCurriculumPractice">
         select
         ccp.*,
-        IFNULL((select `status` from college_learning_detail where c_code = ccp.c_code  and open_id = #{openid,jdbcType=VARCHAR}  order by `status` desc limit 1),0) `status`
+        IFNULL((select `status` from college_learning_detail where c_code = ccp.c_code  and open_id = #{openid,jdbcType=VARCHAR}  order by `status` desc limit 1),0) learningStatus
         from college_curriculum_practice as ccp
         where 1=1
         <if test="c_step != null and c_step != ''">
@@ -104,7 +104,9 @@
         SELECT
             ccp.* ,
             (select id from college_booking where openid =  #{openid,jdbcType=VARCHAR} and college_code = ccp.c_code ) bookingid,
-            (select status from college_learning_detail where open_id =  #{openid,jdbcType=VARCHAR} and college_learning_detail.c_code  = ccp.c_code order by id desc limit 1 ) learningStatus
+            (select status from college_learning_detail where open_id =  #{openid,jdbcType=VARCHAR} and college_learning_detail.c_code  = ccp.c_code order by id desc limit 1 ) learningStatus,
+            (select mi_latitude from wx_mkt_info where id = ccp.branches) mi_latitude,
+            (select mi_longitude from wx_mkt_info where id = ccp.branches) mi_longitude
         FROM
             college_curriculum_practice  ccp
         where

src/main/resources/mybatis/mapper/college/CollegeLearningDetailMapper.xml

@@ -44,7 +44,7 @@
         from college_learning_detail
         where open_id = #{open_id,jdbcType=INTEGER}
         and c_code = #{c_code,jdbcType=INTEGER}
-        and status = 1
+        and status = 2
         order by id desc limit 1
     </select>
 

src/main/resources/mybatis/mapper/college/CollegeUserPointsMapper.xml

@@ -81,8 +81,10 @@
     </update>
 
 
-    <update id="updatePointsByTest"  parameterType="java.lang.String" >
-        update college_user_points set credit_total = credit_total + 1, credit_available = credit_available + 1
+    <update id="updatePointsByTest"  parameterType="com.ygj.yuemum.domain.college.CollegePointsDetail" >
+        update college_user_points
+        set credit_total = credit_total + #{credit,jdbcType=VARCHAR},
+        credit_available = credit_available + #{credit,jdbcType=VARCHAR}
         where openid = #{openid,jdbcType=VARCHAR}
     </update>