修改无数BUG

src/main/java/com/ygj/yuemum/controller/college/CollegeCurriculumCoreController.java

@@ -80,7 +80,7 @@ public class CollegeCurriculumCoreController {
     }
 
     @PostMapping("/college/coreLearningUpdate")
-    public int coreLearningUpdate(@RequestParam("openid") String openid,@RequestParam("c_code") String c_code,@RequestParam("rate") Float rate) {
+    public int coreLearningUpdate(@RequestParam("openid") String openid,@RequestParam("c_code") String c_code,@RequestParam("rate") String rate) {
         return collegeCurriculumCoreService.coreLearningUpdate(openid,c_code,rate);
     }
 

src/main/java/com/ygj/yuemum/controller/college/CollegeCurriculumExperienceController.java

@@ -47,8 +47,8 @@ public class CollegeCurriculumExperienceController {
     }
 
     @PostMapping("/college/queryUserLearningExperience")
-    public String queryUserLearningExperience(@RequestParam("openid") String openid) {
-        LinkedHashMap<String, Object> orderTemps = collegeCurriculumExperienceService.queryUserLearningExperience(openid);
+    public String queryUserLearningExperience(@RequestParam("openid") String openid,@RequestParam("city") String city) {
+        LinkedHashMap<String, Object> orderTemps = collegeCurriculumExperienceService.queryUserLearningExperience(openid,city);
         String jso = JSONObject.toJSONString(orderTemps, SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue);
         return jso;
     }

src/main/java/com/ygj/yuemum/controller/college/CollegeCurriculumPracticeController.java

@@ -46,8 +46,8 @@ public class CollegeCurriculumPracticeController {
 
 
     @PostMapping("/college/queryUserLearningPractice")
-    public String queryUserLearningPractice(@RequestParam("openid") String openid) {
-        LinkedHashMap<String, Object> orderTemps = collegeCurriculumPracticeService.queryUserLearningPractice(openid);
+    public String queryUserLearningPractice(@RequestParam("openid") String openid,@RequestParam("city") String city) {
+        LinkedHashMap<String, Object> orderTemps = collegeCurriculumPracticeService.queryUserLearningPractice(openid,city);
         String jso = JSONObject.toJSONString(orderTemps, SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue);
         return jso;
     }

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

@@ -4,8 +4,16 @@ public class CollegeCurriculumQuery {
     private Integer id;
     private String openid;
     private String c_type;
+    private String city;
     private Integer c_step;
 
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
 
     public Integer getId() {
         return id;

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

@@ -8,15 +8,24 @@ public class CollegeLearningDetail {
     private Integer status;
     private String date;
     private Integer credit;
-    private Float rate;
+    private String rate;
+    private String rate_time;
     private Integer page;
     private Integer limit;
 
-    public Float getRate() {
+    public String getRate_time() {
+        return rate_time;
+    }
+
+    public void setRate_time(String rate_time) {
+        this.rate_time = rate_time;
+    }
+
+    public String getRate() {
         return rate;
     }
 
-    public void setRate(Float rate) {
+    public void setRate(String rate) {
         this.rate = rate;
     }
 

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

@@ -17,9 +17,27 @@ public class ReturnUserLearningCoreDetail {
     private Integer id;
     private Integer testid;
     private Integer positive;
+    private String video_href;
     private  Integer result;
     private Integer status;
-    private Float rate;
+    private String rate;
+    private String rate_time;
+
+    public String getRate_time() {
+        return rate_time;
+    }
+
+    public void setRate_time(String rate_time) {
+        this.rate_time = rate_time;
+    }
+
+    public String getVideo_href() {
+        return video_href;
+    }
+
+    public void setVideo_href(String video_href) {
+        this.video_href = video_href;
+    }
 
     public Integer getId() {
         return id;
@@ -165,11 +183,11 @@ public class ReturnUserLearningCoreDetail {
         this.status = status;
     }
 
-    public Float getRate() {
+    public String getRate() {
         return rate;
     }
 
-    public void setRate(Float rate) {
+    public void setRate(String rate) {
         this.rate = rate;
     }
 }

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

@@ -2,7 +2,6 @@ package com.ygj.yuemum.service.college;
 
 import com.ygj.yuemum.component.Constant;
 import com.ygj.yuemum.dao.college.CollegeCurriculumCoreDao;
-import com.ygj.yuemum.dao.college.CollegeLearningDetailDao;
 import com.ygj.yuemum.domain.college.*;
 import com.ygj.yuemum.domain.wxmini.WXUser;
 import com.ygj.yuemum.service.wxmini.WXUserService;
@@ -10,6 +9,7 @@ import com.ygj.yuemum.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.LinkedHashMap;
@@ -76,7 +76,7 @@ public class CollegeCurriculumCoreService {
                         if (DateUtil.getMonthDiff(dateNow, getDate) + 1 > AGE) {
                             collegeCurriculumQueryB.setC_step(AGE);
                         } else {
-                            collegeCurriculumQueryB.setC_step(AGE - DateUtil.getMonthDiff(dateNow, getDate) + 1);
+                            collegeCurriculumQueryB.setC_step(DateUtil.getMonthDiff(dateNow, getDate) + 1);
                         }
                     }
                     //育儿课程加孕周课程
@@ -199,8 +199,27 @@ public class CollegeCurriculumCoreService {
         tableData.put("positive", returnUserLearningCoreDetail.getPositive());
         tableData.put("t_desc", returnUserLearningCoreDetail.getT_desc());
         tableData.put("isvideo", returnUserLearningCoreDetail.isIsvideo());
+        tableData.put("video_length",returnUserLearningCoreDetail.getVideo_length());
         tableData.put("status", returnUserLearningCoreDetail.getStatus());
         tableData.put("rate", returnUserLearningCoreDetail.getRate());
+        tableData.put("countdown", returnUserLearningCoreDetail.getRate_time());
+        tableData.put("video_href",returnUserLearningCoreDetail.getVideo_href());
+        if(returnUserLearningCoreDetail.getRate_time() != null) {
+            String coreTime[] = returnUserLearningCoreDetail.getVideo_length().split(":");
+            int coreHours = Integer.parseInt(coreTime[0]) * 60 * 60;
+            int coreMinutes = Integer.parseInt(coreTime[1]) * 60;
+            int coreTimeValue = coreHours+coreMinutes;
+
+            String rateTime[] = returnUserLearningCoreDetail.getRate_time().split(":");
+            int rateHours = Integer.parseInt(rateTime[0]) * 60 * 60;
+            int rateMinutes = Integer.parseInt(rateTime[1]) * 60;
+            int rateTimeValue = rateHours+rateMinutes;
+
+            int downTimeValue = coreTimeValue - rateTimeValue;
+            tableData.put("rate_time", String.format("%02d", downTimeValue / 3600) + ":" + String.format("%02d", downTimeValue / 60 % 60));
+        } else {
+            tableData.put("rate_time", "00:00");
+        }
         return tableData;
     }
 
@@ -242,17 +261,17 @@ public class CollegeCurriculumCoreService {
             CollegeCurriculumCore collegeCurriculumCore = collegeCurriculumCoreDao.queryCoreByCode(c_code);
             CollegeUserPoints collegeUserPointsNew = new CollegeUserPoints();
             collegeUserPointsNew.setOpenid(openid);
-            if (collegeUserPoints != null) {
-                collegeUserPointsNew.setId(collegeUserPoints.getId());
-
-                collegeUserPointsNew.setCredit_available(collegeUserPoints.getCredit_available() + collegeCurriculumCore.getCredit());
-                collegeUserPointsNew.setCredit_total(collegeUserPoints.getCredit_total() + collegeCurriculumCore.getCredit());
-                collegeUserPointsService.updateCollegeUserPoints(collegeUserPointsNew);
-            } else {
-                collegeUserPointsNew.setCredit_available(collegeCurriculumCore.getCredit());
-                collegeUserPointsNew.setCredit_total(collegeCurriculumCore.getCredit());
-                collegeUserPointsService.addCollegeUserPoints(collegeUserPointsNew);
-            }
+//            if (collegeUserPoints != null) {  不加学分
+//                collegeUserPointsNew.setId(collegeUserPoints.getId());
+//
+//                collegeUserPointsNew.setCredit_available(collegeUserPoints.getCredit_available() + collegeCurriculumCore.getCredit());
+//                collegeUserPointsNew.setCredit_total(collegeUserPoints.getCredit_total() + collegeCurriculumCore.getCredit());
+//                collegeUserPointsService.updateCollegeUserPoints(collegeUserPointsNew);
+//            } else {
+//                collegeUserPointsNew.setCredit_available(collegeCurriculumCore.getCredit());
+//                collegeUserPointsNew.setCredit_total(collegeCurriculumCore.getCredit());
+//                collegeUserPointsService.addCollegeUserPoints(collegeUserPointsNew);
+//            }
             CollegeLearningDetail collegeLearningDetail1 = new CollegeLearningDetail();
             collegeLearningDetail1.setOpen_id(openid);
             collegeLearningDetail1.setC_code(c_code);
@@ -260,39 +279,70 @@ public class CollegeCurriculumCoreService {
             collegeLearningDetail1.setCredit(collegeCurriculumCore.getCredit());
             collegeLearningDetail1.setStatus(9);
             collegeLearningDetailService.addCollegeLearningDetail(collegeLearningDetail1);
+            //已学人数增加
+            collegeCurriculumCoreDao.updatePositive(c_code);
             return 1;
         }
     }
 
-    public int coreLearningUpdate(String openid, String c_code, Float rate) {
-        CollegeLearningDetail collegeLearningDetail = new CollegeLearningDetail();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        collegeLearningDetail.setOpen_id(openid);
-        collegeLearningDetail.setC_code(c_code);
-        CollegeLearningDetail collegeLearningDetailOld = collegeLearningDetailService.checkCoreLearningRate(collegeLearningDetail);
-        if(collegeLearningDetailOld == null) {
-            collegeLearningDetail.setRate(rate);
-            collegeLearningDetail.setDate(sdf.format(new Date()));
-            collegeLearningDetail.setStatus(1);
-            collegeLearningDetailService.addCollegeLearningDetail(collegeLearningDetail);
-            return 1;
-        } else {
-            if(collegeLearningDetailOld.getStatus() == 9) {
-                return 0;
+    public int coreLearningUpdate(String openid, String c_code, String rate) {
+        try {
+            CollegeLearningDetail collegeLearningDetail = new CollegeLearningDetail();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            DecimalFormat df = new DecimalFormat("00.00");
+            collegeLearningDetail.setOpen_id(openid);
+            collegeLearningDetail.setC_code(c_code);
+            CollegeLearningDetail collegeLearningDetailOld = collegeLearningDetailService.checkCoreLearningRate(collegeLearningDetail);
+            CollegeCurriculumCore collegeCurriculumCore = collegeCurriculumCoreDao.queryCoreByCode(c_code);
+
+            String rTime[] = rate.split(":");
+            int rHours = Integer.parseInt(rTime[0]) * 60 * 60;
+            int rMinutes = Integer.parseInt(rTime[1]) * 60;
+            int rateNew = rHours+rMinutes;
+
+            String coreTime[] = collegeCurriculumCore.getVideo_length().split(":");
+            int coreHours = Integer.parseInt(coreTime[0]) * 60 * 60;
+            int coreMinutes = Integer.parseInt(coreTime[1]) * 60;
+            int coreRate = coreHours+coreMinutes;
+            double rateValueTemp = ((double)coreRate - (double)rateNew)/coreRate;
+            String rateValue;
+            if (rateValueTemp >= 1) {
+                rateValue = "100%";
             } else {
-                if (rate > collegeLearningDetailOld.getRate()) {
-                    collegeLearningDetail.setId(collegeLearningDetailOld.getId());
-                    collegeLearningDetail.setRate(rate);
-                    collegeLearningDetail.setStatus(1);
-                    collegeLearningDetail.setDate(sdf.format(new Date()));
-                    collegeLearningDetailService.updateCollegeLearningDetail(collegeLearningDetail);
-                    return 1;
-                } else {
+                rateValue = df.format(rateValueTemp*100) + "%";
+            }
+
+            if(collegeLearningDetailOld == null) {
+                collegeLearningDetail.setRate(rateValue);
+                collegeLearningDetail.setDate(sdf.format(new Date()));
+                collegeLearningDetail.setStatus(1);
+                collegeLearningDetail.setRate_time(rate);
+                collegeLearningDetailService.addCollegeLearningDetail(collegeLearningDetail);
+                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.setDate(sdf.format(new Date()));
+                        collegeLearningDetail.setRate_time(rate);
+                        collegeLearningDetailService.updateCollegeLearningDetail(collegeLearningDetail);
+                        return 1;
+                    } else {
+                        return 0;
+                    }
                 }
-            }
 
+            }
+        }catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
         }
+
     }
 
 }

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

@@ -73,7 +73,7 @@ public class CollegeCurriculumExperienceService {
     }
 
 
-    public LinkedHashMap<String, Object> queryUserLearningExperience(String openid) {
+    public LinkedHashMap<String, Object> queryUserLearningExperience(String openid,String city) {
         WXUser wxUser = wxUserService.getWXUser(openid);
         LinkedHashMap<String, Object> tableData = new LinkedHashMap<>();
         try {
@@ -83,6 +83,7 @@ public class CollegeCurriculumExperienceService {
                 Date getDate = sdf.parse(wxUser.getXu_content_date());
                 CollegeCurriculumQuery collegeCurriculumQuery = new CollegeCurriculumQuery();
                 collegeCurriculumQuery.setOpenid(openid);
+                collegeCurriculumQuery.setCity(city);
                 collegeCurriculumQuery.setC_type(wxUser.getXu_content_type());
                 if (wxUser.getXu_content_type().equals("B01")) {
                     if (dateNow.getTime() < getDate.getTime()) {

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

@@ -85,16 +85,18 @@ public class CollegeCurriculumPracticeService {
         return collegeCurriculumPracticeDao.queryPracticeByStep(collegeCurriculumPractice);
     }
 
-    public LinkedHashMap<String, Object> queryUserLearningPractice(String openid) {
+    public LinkedHashMap<String, Object> queryUserLearningPractice(String openid,String city) {
         WXUser wxUser = wxUserService.getWXUser(openid);
         LinkedHashMap<String, Object> tableData = new LinkedHashMap<>();
         try {
             if (wxUser != null && wxUser.getXu_content_type() != null && wxUser.getXu_content_date() != null && wxUser.getXu_phone() != null) {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                SimpleDateFormat sd = new SimpleDateFormat("MM-dd HH:mm");
                 Date dateNow = new Date();
                 Date getDate = sdf.parse(wxUser.getXu_content_date());
                 CollegeCurriculumQuery collegeCurriculumQuery = new CollegeCurriculumQuery();
                 collegeCurriculumQuery.setOpenid(openid);
+                collegeCurriculumQuery.setCity(city);
                 collegeCurriculumQuery.setC_type(wxUser.getXu_content_type());
                 if (wxUser.getXu_content_type().equals("B01")) {
                     if (dateNow.getTime() < getDate.getTime()) {
@@ -122,13 +124,25 @@ public class CollegeCurriculumPracticeService {
                 }
                 List<CollegeCurriculumPractice> collegeCurriculumPractices = collegeCurriculumPracticeDao.queryUserLearningPractice(collegeCurriculumQuery);
                 for (CollegeCurriculumPractice collegeCurriculumPractice : collegeCurriculumPractices) {
-                    if (collegeCurriculumPractice.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
+                    long endMillisecond = sdf.parse(collegeCurriculumPractice.getDeadline()).getTime();
+                    if (collegeCurriculumPractice.getStatus() != null && collegeCurriculumPractice.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
+                        collegeCurriculumPractice.setLearningStatus("已完成");
                         collegeCurriculumPractice.setStatus("已完成");
+                    } else if (collegeCurriculumPractice.getStatus() != null && collegeCurriculumPractice.getStatus().equals("1")) {
+                        if(dateNow.getTime() > endMillisecond) {
+                            collegeCurriculumPractice.setLearningStatus("已过期");
+                            collegeCurriculumPractice.setStatus("已过期");
+                        } else {
+                            collegeCurriculumPractice.setLearningStatus("待完成");
+                            collegeCurriculumPractice.setStatus("查看报名");
+                        }
                     } else {
-                        if (collegeCurriculumPractice.getC_step() >= DateUtil.getWeekDiff(dateNow, getDate)) {
-                            collegeCurriculumPractice.setStatus("待完成");
+                        if(dateNow.getTime() > endMillisecond) {
+                            collegeCurriculumPractice.setLearningStatus("已过期");
+                            collegeCurriculumPractice.setStatus("已过期");
                         } else {
-                            collegeCurriculumPractice.setStatus("未完成");
+                            collegeCurriculumPractice.setLearningStatus("未完成");
+                            collegeCurriculumPractice.setStatus("立即报名");
                         }
                     }
                 }

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

@@ -119,13 +119,13 @@ public class CollegeUserPointsService {
                             if (LMP - DateUtil.getWeekDiff(dateNow, getDate) < 0) {
                                 return tableData; //还没怀孕
                             } else {
-                                tableData.put("stage_step", DateUtil.getWeekDiff(dateNow, getDate));
+                                tableData.put("stage_step", LMP - DateUtil.getWeekDiff(dateNow, getDate));
                                 collegeCurriculumCoreQuery.setC_type("P01");
-                                collegeCurriculumCoreQuery.setC_step(DateUtil.getWeekDiff(dateNow, getDate));
+                                collegeCurriculumCoreQuery.setC_step(LMP -DateUtil.getWeekDiff(dateNow, getDate));
                                 collegeCurriculumPracticeQuery.setC_type("P01");
-                                collegeCurriculumPracticeQuery.setC_step(DateUtil.getWeekDiff(dateNow, getDate));
+                                collegeCurriculumPracticeQuery.setC_step(LMP -DateUtil.getWeekDiff(dateNow, getDate));
                                 collegeCurriculumExperienceQuery.setC_type("P01");
-                                collegeCurriculumExperienceQuery.setC_step(DateUtil.getWeekDiff(dateNow, getDate));
+                                collegeCurriculumExperienceQuery.setC_step(LMP -DateUtil.getWeekDiff(dateNow, getDate));
                             }
                         } else {
                             return tableData;
@@ -148,7 +148,7 @@ public class CollegeUserPointsService {
                         tableData.put("credit", 0);
                     } else {
                         tableData.put("credit", collegeUserPoints.getCredit_total());
-                        point_available = collegeUserPoints.getCredit_available();
+                        point_available = collegeUserPoints.getCredit_total();
                     }
                     //礼品领取情况
                     List<CollegePresentRule> collegePresentRules = collegePresentRuleService.queryUserReceived(openid);
@@ -182,9 +182,9 @@ public class CollegeUserPointsService {
                             collegePointsDetail.setCredit(collegePresentRule.getValue() * -1);
                             collegePointsDetail.setRule_id(collegePresentRule.getId());
                             collegePointsDetailService.addCollegePointsDetail(collegePointsDetail);
-                            //更新学分  ????
-                            collegeUserPoints.setCredit_available(collegeUserPoints.getCredit_available() - collegePresentRule.getValue());
-                            collegeUserPointsDao.updateByPrimaryKeySelective(collegeUserPoints);
+                            //更新学分  学分不减
+//                            collegeUserPoints.setCredit_available(collegeUserPoints.getCredit_available() - collegePresentRule.getValue());
+//                            collegeUserPointsDao.updateByPrimaryKeySelective(collegeUserPoints);
                             break;
                         }
                     }
@@ -192,11 +192,52 @@ public class CollegeUserPointsService {
                     //常规课
                     List<CollegeCurriculumCore> collegeCurriculumCores = collegeCurriculumCoreService.queryCoreByStep(collegeCurriculumCoreQuery);
                     tableData.put("college_core", collegeCurriculumCores);
+
                     //实践课
                     collegeCurriculumPracticeQuery.setDeadline(sdf.format(new Date()));
                     collegeCurriculumPracticeQuery.setCity(city);
                     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")) {
+                            //已完成
+                            collegeCurriculumPractice.setStatus("已完成");
+                            //已完成
+                            collegeCurriculumPractice.setLearningStatus("已完成");
+                        } else if (collegeCurriculumPractice.getLearningStatus() != null && collegeCurriculumPractice.getLearningStatus().equals("1")) {
+                            if(now.getTime() > deadLine.getTime()){
+                                //未完成
+                                collegeCurriculumPractice.setStatus("已过期");
+                                //已过期
+                                collegeCurriculumPractice.setLearningStatus("未完成");
+                            }  else {
+                                //待完成
+                                collegeCurriculumPractice.setStatus("查看报名");
+                                //查看报名
+                                collegeCurriculumPractice.setLearningStatus("待完成");
+                            }
+                        } else {
+                            if(now.getTime() > deadLine.getTime()){
+                                //未完成
+                                collegeCurriculumPractice.setStatus("已过期");
+                                //已过期
+                                collegeCurriculumPractice.setLearningStatus("未完成");
+                            } else if (collegeCurriculumPractice.getPcount() >= 99) {
+                                //未完成
+                                collegeCurriculumPractice.setStatus("已约满");
+                                //已约满
+                                collegeCurriculumPractice.setLearningStatus("未完成");
+                            } else {
+                                //待完成
+                                collegeCurriculumPractice.setStatus("立即报名");
+                                //立即报名
+                                collegeCurriculumPractice.setLearningStatus("待完成");
+                            }
+                        }
+                    }
                     tableData.put("college_practice", collegeCurriculumPractices);
                     //体验课
                     collegeCurriculumExperienceQuery.setCity(city);

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

@@ -36,7 +36,6 @@
         *
         from college_booking
         where openid = #{openid,jdbcType=VARCHAR}
-        and phone = #{phone,jdbcType=VARCHAR}
         and college_code = #{college_code,jdbcType=VARCHAR}
     </select>
 

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

@@ -53,7 +53,7 @@
             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`,
-            (select rate from college_learning_detail where c_code = ccc.c_code  and open_id = #{openid,jdbcType=VARCHAR} order by `status` desc limit 1) `rate`
+            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`
         FROM
             college_curriculum_core  as ccc
         WHERE
@@ -73,8 +73,11 @@
             ccc.positive,
             ccc.t_desc,
             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`,
-            (select rate from college_learning_detail where c_code = ccc.c_code  and open_id = #{openid,jdbcType=VARCHAR} order by `status` desc limit 1) `rate`
+            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`
         FROM
             college_curriculum_core  as ccc
         WHERE

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

@@ -202,9 +202,11 @@
         FROM
         college_curriculum_experience
         where
-        c_type = #{c_type,jdbcType=VARCHAR}
+            c_type = #{c_type,jdbcType=VARCHAR}
+        and
+            FIND_IN_SET(#{c_step,jdbcType=INTEGER},c_step))
         and
-        FIND_IN_SET(#{c_step,jdbcType=INTEGER},c_step))
+            city = #{city,jdbcType=VARCHAR}
         ORDER BY
         c_seq desc
     </select>

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

@@ -58,9 +58,11 @@
         FROM
         college_curriculum_practice
         where
-        c_type = #{c_type,jdbcType=VARCHAR}
+            c_type = #{c_type,jdbcType=VARCHAR}
+        and
+            FIND_IN_SET(#{c_step,jdbcType=INTEGER},c_step))
         and
-        FIND_IN_SET(#{c_step,jdbcType=INTEGER},c_step))
+            city = #{city,jdbcType=VARCHAR}
         ORDER BY
         c_seq desc
     </select>
@@ -101,7 +103,7 @@
     <select id="queryPracticeDetail" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumPractice" parameterType="com.ygj.yuemum.domain.college.CollegeQuery" >
         SELECT
             ccp.* ,
-            (select id from college_booking where phone = #{phone,jdbcType=VARCHAR}  and openid =  #{openid,jdbcType=VARCHAR} and college_code = ccp.c_code ) bookingid,
+            (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
         FROM
             college_curriculum_practice  ccp

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

@@ -9,7 +9,8 @@
         <result column="status" property="status" jdbcType="INTEGER" />
         <result column="date" property="date" jdbcType="VARCHAR" />
         <result column="credit" property="credit" jdbcType="INTEGER" />
-        <result column="rate" property="rate" jdbcType="DECIMAL" />
+        <result column="rate" property="rate" jdbcType="VARCHAR" />
+        <result column="rate_time" property="rate_time" jdbcType="VARCHAR" />
     </resultMap>
     <!--获取所有数据-->
 
@@ -43,6 +44,7 @@
         from college_learning_detail
         where open_id = #{open_id,jdbcType=INTEGER}
         and c_code = #{c_code,jdbcType=INTEGER}
+        and status = 1
         order by id desc limit 1
     </select>
 
@@ -78,7 +80,10 @@
                 credit,
             </if>
             <if test="rate != null" >
-                rate
+                rate,
+            </if>
+            <if test="rate_time != null" >
+                rate_time
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -98,7 +103,10 @@
                 #{credit,jdbcType=INTEGER},
             </if>
             <if test="rate != null" >
-                #{rate,jdbcType=DECIMAL}
+                #{rate,jdbcType=VARCHAR},
+            </if>
+            <if test="rate_time != null" >
+                #{rate_time,jdbcType=VARCHAR}
             </if>
         </trim>
     </insert>
@@ -122,7 +130,10 @@
                 credit = #{credit,jdbcType=INTEGER},
             </if>
             <if test="rate != null" >
-                rate = #{rate,jdbcType=DECIMAL}
+                rate = #{rate,jdbcType=VARCHAR},
+            </if>
+            <if test="rate_time != null" >
+                rate_time = #{rate_time,jdbcType=VARCHAR}
             </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
@@ -130,7 +141,7 @@
 
     <update id="updateLearningRate" parameterType="com.ygj.yuemum.domain.college.CollegeLearningDetail" >
         update college_learning_detail
-        set rate = #{rate,jdbcType=DECIMAL}
+        set rate = #{rate,jdbcType=VARCHAR}
         where  open_id = #{open_id,jdbcType=VARCHAR}
         and  c_code = #{c_code,jdbcType=VARCHAR}
     </update>