bug修改

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

@@ -23,8 +23,8 @@ public class CollegeBookingController {
     }
 
     @PostMapping("/college/getCollegeBooking")
-    public String getCollegeBooking(@RequestParam("id") Integer id) {
-        String jso = JSONObject.toJSONString(collegeBookingService.getCollegeBooking(id), SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue);
+    public String getCollegeBooking(@ModelAttribute CollegeBooking collegeBooking) {
+        String jso = JSONObject.toJSONString(collegeBookingService.getCollegeBooking(collegeBooking), SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue);
         return jso;
     }
 

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

@@ -10,7 +10,7 @@ public interface CollegeBookingDao {
 
     List<CollegeBooking> getAll();
 
-    CollegeBooking selectByPrimaryKey(Integer id);
+    CollegeBooking selectByPrimaryKey(CollegeBooking collegeBooking);
 
     int deleteByPrimaryKey(Integer id);
 

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

@@ -20,9 +20,14 @@ public interface CollegeCurriculumCoreDao {
     int insertSelective(CollegeCurriculumCore record);
     int updateByPrimaryKeySelective(CollegeCurriculumCore record);
     List<CollegeCurriculumCore> queryCoreByStep(CollegeCurriculumCore record);
+
+    CollegeCurriculumCore queryCoreByLast(CollegeCurriculumCore record);
     List<CollegeCurriculumCore> queryELearning_Index(CollegeCurriculumCore collegeCurriculumCore);
 
     List<CollegeCurriculumCore> queryUserLearningCore(CollegeCurriculumQuery collegeCurriculumQuery);
+    CollegeCurriculumCore queryUserLearningCoreLast(CollegeCurriculumQuery collegeCurriculumQuery);
+
+    List<CollegeCurriculumCore> queryUserLearningCoreByB(CollegeCurriculumQuery collegeCurriculumQuery);
 
     ReturnUserLearningCoreDetail queryUserLearningCoreDetail (CollegeCurriculumQuery collegeCurriculumQuery);
     ReturnUserLearningCoreDetail queryCourseworkList(CollegeCurriculumQuery collegeCurriculumQuery);

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

@@ -34,8 +34,8 @@ public class CollegeBookingService {
         return collegeBookingDao.checkELearningBooking(collegeBooking);
     }
 
-    public CollegeBooking getCollegeBooking(Integer id) {
-        return collegeBookingDao.selectByPrimaryKey(id);
+    public CollegeBooking getCollegeBooking(CollegeBooking collegeBooking) {
+        return collegeBookingDao.selectByPrimaryKey(collegeBooking);
     }
 
 

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

@@ -79,6 +79,10 @@ public class CollegeCurriculumCoreService {
         return collegeCurriculumCoreDao.queryCoreByStep(collegeCurriculumCore);
     }
 
+    public CollegeCurriculumCore queryCoreByLast(CollegeCurriculumCore collegeCurriculumCore) {
+        return collegeCurriculumCoreDao.queryCoreByLast(collegeCurriculumCore);
+    }
+
     public LinkedHashMap<String, Object> queryUserLearningCore(String openid) {
         WXUser wxUser = wxUserService.getWXUser(openid);
         LinkedHashMap<String, Object> tableData = new LinkedHashMap<>();
@@ -103,7 +107,10 @@ public class CollegeCurriculumCoreService {
                         }
                     }
                     //育儿课程加孕周课程
-                    List<CollegeCurriculumCore> collegeCurriculumCores = collegeCurriculumCoreDao.queryUserLearningCore(collegeCurriculumQueryB);
+                    List<CollegeCurriculumCore> collegeCurriculumCores = collegeCurriculumCoreDao.queryUserLearningCoreByB(collegeCurriculumQueryB);
+                    if(collegeCurriculumCores.size() ==0) {
+                        collegeCurriculumCores.add(collegeCurriculumCoreDao.queryUserLearningCoreLast(collegeCurriculumQueryB));
+                    }
                     for (CollegeCurriculumCore collegeCurriculumCore : collegeCurriculumCores) {
                         if (collegeCurriculumCore.getStatus() != null && collegeCurriculumCore.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
                             collegeCurriculumCore.setStatus("已完成");
@@ -136,7 +143,7 @@ public class CollegeCurriculumCoreService {
                     }
                     collegeCurriculumQueryP.setC_type("P01");
                     collegeCurriculumQueryP.setOpenid(openid);
-                    collegeCurriculumQueryP.setC_step(LMP);
+                    collegeCurriculumQueryP.setC_step(40); //先写死 原值 LMP
                     List<CollegeCurriculumCore> collegeCurriculumCore_p = collegeCurriculumCoreDao.queryUserLearningCore(collegeCurriculumQueryP);
                     for (CollegeCurriculumCore collegeCurriculumCore : collegeCurriculumCore_p) {
                         if (collegeCurriculumCore.getStatus() != null && collegeCurriculumCore.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
@@ -180,7 +187,7 @@ public class CollegeCurriculumCoreService {
                             collegeCurriculumQuery.setC_step(LMP - DateUtil.getWeekDiff(dateNow, getDate));
                         }
                     } else {
-                        collegeCurriculumQuery.setC_step(LMP); //已出生
+                        collegeCurriculumQuery.setC_step(40); //已出生
                     }
                     //孕周课程
                     List<CollegeCurriculumCore> collegeCurriculumCores = collegeCurriculumCoreDao.queryUserLearningCore(collegeCurriculumQuery);

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

@@ -132,7 +132,7 @@ public class CollegeCurriculumExperienceService {
             Calendar calendar = Calendar.getInstance();
             if (wxUser.getXu_content_type().equals("P01")) {
                 if (collegeCurriculumExperience.getC_type().equals("P01")) {
-                    if (collegeCurriculumExperience.getC_step() > collegeCurriculumQuery.getC_step()) {  //判断是否过期
+                    if (collegeCurriculumExperience.getC_step() - collegeCurriculumQuery.getC_step() > 1) {  //判断是否过期
                         calendar.setTime(sdf.parse(wxUser.getXu_content_date()));
                         collegeCurriculumExperience.setDistance_status("true");
                         int temp = ( LMP - collegeCurriculumExperience.getC_step() + 1) * -7;
@@ -151,7 +151,7 @@ public class CollegeCurriculumExperienceService {
             }
             if (wxUser.getXu_content_type().equals("B01")) {
                 if (collegeCurriculumExperience.getC_type().equals("B01")) {
-                    if (collegeCurriculumExperience.getC_step() > collegeCurriculumQuery.getC_step()) { //判断是否过期
+                    if (collegeCurriculumExperience.getC_step() > collegeCurriculumQuery.getC_step() ) { //判断是否过期
                         calendar.setTime(sdf.parse(wxUser.getXu_content_date()));
                         collegeCurriculumExperience.setDistance_status("true");
                         int temp = (collegeCurriculumExperience.getC_step()-1) ;
@@ -185,7 +185,7 @@ public class CollegeCurriculumExperienceService {
                         if (DateUtil.getMonthDiff(dateNow, getDate) + 1 > AGE) {
                             collegeCurriculumQuery.setC_step(AGE);
                         } else {
-                            collegeCurriculumQuery.setC_step(AGE - DateUtil.getMonthDiff(dateNow, getDate) + 1);
+                            collegeCurriculumQuery.setC_step(DateUtil.getMonthDiff(dateNow, getDate) + 1);
                         }
                     }
                 } else if (wxUser.getXu_content_type().equals("P01")) {
@@ -230,7 +230,7 @@ public class CollegeCurriculumExperienceService {
                         Calendar calendar = Calendar.getInstance();
                         if (wxUser.getXu_content_type().equals("P01")) {
                             if (collegeCurriculumExperience.getC_type().equals("P01")) {
-                                if (collegeCurriculumExperience.getC_step() > collegeCurriculumQuery.getC_step()) {  //判断是否过期
+                                if (collegeCurriculumExperience.getC_step() - collegeCurriculumQuery.getC_step() > 1) {  //判断是否过期
                                     calendar.setTime(sdf.parse(wxUser.getXu_content_date()));
                                     collegeCurriculumExperience.setDistance_status("true");
                                     int temp = ( LMP - collegeCurriculumExperience.getC_step() + 1) * -7;
@@ -249,7 +249,7 @@ public class CollegeCurriculumExperienceService {
                         }
                         if (wxUser.getXu_content_type().equals("B01")) {
                             if (collegeCurriculumExperience.getC_type().equals("B01")) {
-                                if (collegeCurriculumExperience.getC_step() > collegeCurriculumQuery.getC_step()) { //判断是否过期
+                                if (collegeCurriculumExperience.getC_step() > collegeCurriculumQuery.getC_step() ) { //判断是否过期
                                     calendar.setTime(sdf.parse(wxUser.getXu_content_date()));
                                     collegeCurriculumExperience.setDistance_status("true");
                                     int temp = (collegeCurriculumExperience.getC_step()-1) ;

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

@@ -53,6 +53,7 @@ public class CollegeCurriculumPracticeService {
 
     public CollegeCurriculumPractice queryPracticeDetail(CollegeQuery collegeQuery) throws ParseException {
         CollegeCurriculumPractice collegeCurriculumPractice = collegeCurriculumPracticeDao.queryPracticeDetail(collegeQuery);
+        WXMktInfo wxMktInfo = wxMktInfoService.queryMktInfo(collegeCurriculumPractice.getBranche_id());
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         SimpleDateFormat sd = new SimpleDateFormat("MM-dd HH:mm");
         long beginMillisecond = new Date().getTime();
@@ -97,9 +98,12 @@ public class CollegeCurriculumPracticeService {
                 collegeCurriculumPractice.setScholarships("0-100");
             }
         }
+
         collegeCurriculumPractice.setStartdate(sd.format(sdf.parse(collegeCurriculumPractice.getStartdate())));
         collegeCurriculumPractice.setEnddate(sd.format(sdf.parse(collegeCurriculumPractice.getEnddate())));
         collegeCurriculumPractice.setDeadline(sd.format(sdf.parse(collegeCurriculumPractice.getDeadline())));
+        collegeCurriculumPractice.setMi_latitude(wxMktInfo.getMi_latitude());
+        collegeCurriculumPractice.setMi_longitude(wxMktInfo.getMi_longitude());
         return collegeCurriculumPractice;
     }
 

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

@@ -100,11 +100,15 @@ public class CollegeUserPointsService {
         WXUser wxUser = wxUserService.getWXUser(openid);
         tableData.put("stage", null);
         tableData.put("stage_date", null);
-        if (wxUser != null && wxUser.getXu_phone() != null) {
+        if (wxUser != null ) {
             if(!wxUser.isCollege_enable()) {
                 tableData.put("errStatus", "9"); //没有开通超人学院
                 return tableData;
             }
+            if ( wxUser.getXu_phone() == null) {
+                tableData.put("errStatus", "6"); //没有授权手机号
+                return tableData;
+            }
             if (wxUser.getXu_content_type() != null && wxUser.getXu_content_date() != null) {
                 try {
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -119,38 +123,52 @@ public class CollegeUserPointsService {
                     collegeCurriculumExperienceQuery.setOpenid(openid);
                     CollegePointsDetail collegePointsDetail = new CollegePointsDetail();
                     if (wxUser.getXu_content_type().equals("B01")) { //育儿
-                        if (dateNow.getTime() < getDate.getTime()) {
-                            //还没出生
-                            return tableData;
-                        } else {
-                            if (DateUtil.getMonthDiff(dateNow, getDate) + 1 > AGE) {
-                                return tableData;
-                            } else {
-                                tableData.put("stage_step", DateUtil.getMonthDiff(dateNow, getDate) + 1);
-                                collegeCurriculumCoreQuery.setC_type("B01");
-                                collegeCurriculumCoreQuery.setC_step(DateUtil.getMonthDiff(dateNow, getDate) + 1);
-                                collegeCurriculumPracticeQuery.setC_type("B01");
-                                collegeCurriculumPracticeQuery.setC_step(DateUtil.getMonthDiff(dateNow, getDate) + 1);
-                                collegeCurriculumExperienceQuery.setC_type("B01");
-                                collegeCurriculumExperienceQuery.setC_step(DateUtil.getMonthDiff(dateNow, getDate) + 1);
-                            }
-                        }
+//                        if (dateNow.getTime() < getDate.getTime()) {
+//                            //还没出生
+//                            return tableData;
+//                        } else {
+//                            if (DateUtil.getMonthDiff(dateNow, getDate) + 1 > AGE) {
+//                                return tableData;
+//                            } else {
+//                                tableData.put("stage_step", DateUtil.getMonthDiff(dateNow, getDate) + 1);
+//                                collegeCurriculumCoreQuery.setC_type("B01");
+//                                collegeCurriculumCoreQuery.setC_step(DateUtil.getMonthDiff(dateNow, getDate) + 1);
+//                                collegeCurriculumPracticeQuery.setC_type("B01");
+//                                collegeCurriculumPracticeQuery.setC_step(DateUtil.getMonthDiff(dateNow, getDate) + 1);
+//                                collegeCurriculumExperienceQuery.setC_type("B01");
+//                                collegeCurriculumExperienceQuery.setC_step(DateUtil.getMonthDiff(dateNow, getDate) + 1);
+//                            }
+//                        }
+                        tableData.put("stage_step", DateUtil.getMonthDiff(dateNow, getDate) + 1);
+                        collegeCurriculumCoreQuery.setC_type("B01");
+                        collegeCurriculumCoreQuery.setC_step(DateUtil.getMonthDiff(dateNow, getDate) + 1);
+                        collegeCurriculumPracticeQuery.setC_type("B01");
+                        collegeCurriculumPracticeQuery.setC_step(DateUtil.getMonthDiff(dateNow, getDate) + 1);
+                        collegeCurriculumExperienceQuery.setC_type("B01");
+                        collegeCurriculumExperienceQuery.setC_step(DateUtil.getMonthDiff(dateNow, getDate) + 1);
                     } else if (wxUser.getXu_content_type().equals("P01")) { //孕周
-                        if (dateNow.getTime() < getDate.getTime()) {
-                            if (LMP - DateUtil.getWeekDiff(dateNow, getDate) < 0) {
-                                return tableData; //还没怀孕
-                            } else {
-                                tableData.put("stage_step", LMP - DateUtil.getWeekDiff(dateNow, getDate));
-                                collegeCurriculumCoreQuery.setC_type("P01");
-                                collegeCurriculumCoreQuery.setC_step(LMP - DateUtil.getWeekDiff(dateNow, getDate));
-                                collegeCurriculumPracticeQuery.setC_type("P01");
-                                collegeCurriculumPracticeQuery.setC_step(LMP - DateUtil.getWeekDiff(dateNow, getDate));
-                                collegeCurriculumExperienceQuery.setC_type("P01");
-                                collegeCurriculumExperienceQuery.setC_step(LMP - DateUtil.getWeekDiff(dateNow, getDate));
-                            }
-                        } else {
-                            return tableData;
-                        }
+//                        if (dateNow.getTime() < getDate.getTime()) {
+//                            if (LMP - DateUtil.getWeekDiff(dateNow, getDate) < 0) {
+//                                return tableData; //还没怀孕
+//                            } else {
+//                                tableData.put("stage_step", LMP - DateUtil.getWeekDiff(dateNow, getDate));
+//                                collegeCurriculumCoreQuery.setC_type("P01");
+//                                collegeCurriculumCoreQuery.setC_step(LMP - DateUtil.getWeekDiff(dateNow, getDate));
+//                                collegeCurriculumPracticeQuery.setC_type("P01");
+//                                collegeCurriculumPracticeQuery.setC_step(LMP - DateUtil.getWeekDiff(dateNow, getDate));
+//                                collegeCurriculumExperienceQuery.setC_type("P01");
+//                                collegeCurriculumExperienceQuery.setC_step(LMP - DateUtil.getWeekDiff(dateNow, getDate));
+//                            }
+//                        } else {
+//                            return tableData;
+//                        }
+                        tableData.put("stage_step", LMP - DateUtil.getWeekDiff(dateNow, getDate));
+                        collegeCurriculumCoreQuery.setC_type("P01");
+                        collegeCurriculumCoreQuery.setC_step(LMP - DateUtil.getWeekDiff(dateNow, getDate));
+                        collegeCurriculumPracticeQuery.setC_type("P01");
+                        collegeCurriculumPracticeQuery.setC_step(LMP - DateUtil.getWeekDiff(dateNow, getDate));
+                        collegeCurriculumExperienceQuery.setC_type("P01");
+                        collegeCurriculumExperienceQuery.setC_step(LMP - DateUtil.getWeekDiff(dateNow, getDate));
                     } else {
                         return tableData;
                     }
@@ -182,7 +200,7 @@ public class CollegeUserPointsService {
                             tableData.put("surprise_type", collegePresentCredit.getType());
                             tableData.put("surprise_name", collegePresentCredit.getPresent_name());
                             //自动发放礼品
-                            if (collegePresentCredit.getType() == 1) {
+                            if (collegePresentCredit.getType() == 2) {
                                 // 实物生成一条预约信息并发送通知
                                 CustomerBooking customerBooking = new CustomerBooking();
                                 customerBooking.setBk_branches_id(Integer.valueOf(city));
@@ -214,6 +232,9 @@ public class CollegeUserPointsService {
                     tableData.put("present_received", collegePresentCredits);
                     //常规课
                     List<CollegeCurriculumCore> collegeCurriculumCores = collegeCurriculumCoreService.queryCoreByStep(collegeCurriculumCoreQuery);
+                    if(collegeCurriculumCores.size() == 0){
+                        collegeCurriculumCores.add(collegeCurriculumCoreService.queryCoreByLast(collegeCurriculumCoreQuery));
+                    }
                     for (CollegeCurriculumCore collegeCurriculumCore : collegeCurriculumCores) {
                         if (collegeCurriculumCore.getStatus() != null && collegeCurriculumCore.getStatus().equals("9")) { //1-已预约,2-学习中,3-已过期, 9-已完成
                             collegeCurriculumCore.setStatus("已完成");
@@ -356,7 +377,7 @@ public class CollegeUserPointsService {
                 return tableData;
             }
         } else {
-            tableData.put("errStatus", "6"); //没有授权手机号
+            tableData.put("errStatus", "系统异常"); //没有授权手机号
             return tableData;
         }
     }

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

@@ -28,11 +28,12 @@
     </select>
 
 
-    <select id="selectByPrimaryKey" resultType="com.ygj.yuemum.domain.college.CollegeBooking" parameterType="java.lang.Integer" >
+    <select id="selectByPrimaryKey" resultType="com.ygj.yuemum.domain.college.CollegeBooking" parameterType="com.ygj.yuemum.domain.college.CollegeBooking" >
         select
         *
         from college_booking
-        where id = #{id,jdbcType=INTEGER}
+        where openid = #{openid,jdbcType=VARCHAR}
+        and college_code = #{college_code,jdbcType=VARCHAR}
         and sys_type = 'YueSuo'
     </select>
 

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

@@ -112,14 +112,45 @@
         where
         c_type = #{c_type,jdbcType=VARCHAR}
         and
-        FIND_IN_SET(#{c_step,jdbcType=INTEGER},c_step)
+        c_step <= #{c_step,jdbcType=INTEGER}
         and sys_type = 'YueSuo'
         )
         and sys_type = 'YueSuo'
+        order by c_seq desc
+    </select>
+
+
+    <select id="queryUserLearningCoreByB" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumCore"
+            parameterType="com.ygj.yuemum.domain.college.CollegeCurriculumQuery">
+        SELECT
+        ccc.*,
+        (select status from college_learning_detail where c_code = ccc.c_code  and sys_type = 'YueSuo' and open_id = #{openid,jdbcType=VARCHAR} and `status` != 8 order by `status` desc limit 1) `status`
+        FROM
+        college_curriculum_core AS ccc
+        WHERE
+        c_type = #{c_type,jdbcType=VARCHAR}
+        and
+        FIND_IN_SET(#{c_step,jdbcType=INTEGER},c_step)
+        and sys_type = 'YueSuo'
         ORDER BY
         c_seq desc
     </select>
 
+
+    <select id="queryUserLearningCoreLast" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumCore"
+            parameterType="com.ygj.yuemum.domain.college.CollegeCurriculumQuery">
+        SELECT
+        ccc.*,
+        (select status from college_learning_detail where c_code = ccc.c_code  and sys_type = 'YueSuo' and open_id = #{openid,jdbcType=VARCHAR} and `status` != 8 order by `status` desc limit 1) `status`
+        FROM
+        college_curriculum_core AS ccc
+        WHERE
+        c_type = #{c_type,jdbcType=VARCHAR}
+        and sys_type = 'YueSuo'
+        ORDER BY
+        c_seq asc limit 1
+    </select>
+
     <select id="queryCoreByStep" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumCore"
             parameterType="com.ygj.yuemum.domain.college.CollegeCurriculumCore">
         select
@@ -134,6 +165,18 @@
         order by id desc
     </select>
 
+    <select id="queryCoreByLast" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumCore"
+            parameterType="com.ygj.yuemum.domain.college.CollegeCurriculumCore">
+        select
+        ccc.*,
+        IFNULL((select `status` from college_learning_detail where c_code = ccc.c_code  and sys_type = 'YueSuo' and open_id = #{openid,jdbcType=VARCHAR}  and `status` != 8 order by `status` desc limit 1),0) `status`
+        from college_curriculum_core as ccc
+        where
+        ccc.c_type = #{c_type,jdbcType=VARCHAR}
+        and ccc.sys_type = 'YueSuo'
+        order by c_seq desc limit 1
+    </select>
+
 
     <select id="selectByPrimaryKey" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumCore"
             parameterType="java.lang.Integer">

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

@@ -249,11 +249,9 @@
     <select id="queryUserLearningExperience" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumExperience" parameterType="com.ygj.yuemum.domain.college.CollegeCurriculumQuery">
         SELECT
         cc.*,
-        cd.c_code AS cd_code,
-        IFNULL(cd.`status`,0) status
+        (select status from college_learning_detail where open_id =  #{openid,jdbcType=VARCHAR} and college_learning_detail.c_code  = cc.c_code order by id desc limit 1 ) status
         FROM
         college_curriculum_experience 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
         WHERE
             city = #{city,jdbcType=VARCHAR}
         Order by REPLACE(REPLACE(stage,'第',''),'期','')*100000  asc

src/main/resources/mybatis/mapper/wxmini/WXUserMapper.xml

@@ -114,9 +114,6 @@
     <update id="updateWXUser" parameterType="com.ygj.yuemum.domain.wxmini.WXUser" >
         update wx_user
         <set >
-            <if test="xu_openid != null" >
-                xu_openid = #{xu_openid,jdbcType=VARCHAR},
-            </if>
             <if test="xu_sessionkey != null" >
                 xu_sessionkey = #{xu_sessionkey,jdbcType=VARCHAR},
             </if>