Merge remote-tracking branch 'origin/master'

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/AppCoursesPriceRulesMapper.java

@@ -16,5 +16,5 @@ import java.util.List;
 public interface AppCoursesPriceRulesMapper extends BaseMapper<AppCoursesPriceRules> {
     List<String> selectRuleIdsByCourseId(@Param("coursesId") String coursesId);
 
-    JobExtendedClassNoticeVo findByClassPrice(@Param("userId") String userId);
+    JobExtendedClassNoticeVo findByClassPrice(@Param("userId") String userId,@Param("id") String id);
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppCoursesPriceRulesMapper.xml

@@ -9,9 +9,6 @@
         LEFT JOIN nm_order b on b.id =a.order_id
         LEFT JOIN nm_courses c on a.courses_id = c.id
         LEFT JOIN nm_site d on  c.address_site_id =d.id
-        where a.use_user_id = #{userId}
-        GROUP BY b.user_open_id,d.`name`
-        order by b.user_open_id desc
-        limit 1
+        where a.use_user_id = #{userId} and a.courses_price_rule_id = #{id} order by  a.create_time desc limit 1
     </select>
 </mapper>

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppCoureseServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.system.app.service.impl;
 
 import cn.hutool.core.util.ObjUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -451,15 +452,24 @@ public class AppCoureseServiceImpl extends ServiceImpl<AppCoursesMapper, AppCour
             verificationRecord.setVerifyStatus(CommonConstant.STATUS_0_INT);
             verificationRecord.setCoursesType(CommonConstant.STATUS_1_INT);
             appCoursesVerificationRecordMapper.insert(verificationRecord);
-            JobExtendedClassNoticeVo jobExtendedClassNoticeVo =  priceRulesMapper.findByClassPrice(familyMembers.getId());
+            log.warn("查询主用户信息：use_user_id:"+familyMembers.getId()+";courses_price_rule_id:"+coursesPriceRules.getId());
+            JobExtendedClassNoticeVo jobExtendedClassNoticeVo =  priceRulesMapper.findByClassPrice(familyMembers.getId(),coursesPriceRules.getId());
+            log.warn("查询主用户信息:"+ JSONObject.toJSONString(jobExtendedClassNoticeVo));
             if (jobExtendedClassNoticeVo==null||StringUtils.isEmpty(jobExtendedClassNoticeVo.getUserOpenId())|| StringUtils.isEmpty(jobExtendedClassNoticeVo.getSiteName())){
                 continue;
             }
-            getDate(coursesPriceRules.getStartTime(),coursesPriceRules.getEndTime());
+
+            String date = getDate(coursesPriceRules.getStartTime(), coursesPriceRules.getEndTime());
+            jobExtendedClassNoticeVo.setLassHourTime(date);
+            jobExtendedClassNoticeVo.setReasonClassExtension(form.getPostponeReason());
             jobExtendedClassNoticeVos.add(jobExtendedClassNoticeVo);
 
         }
-        wxNotificationService.extendedClassesJob(jobExtendedClassNoticeVos);
+        log.warn("需要通知列表:"+JSONObject.toJSONString(jobExtendedClassNoticeVos));
+        if (!jobExtendedClassNoticeVos.isEmpty()){
+            wxNotificationService.extendedClassesJob(jobExtendedClassNoticeVos);
+        }
+
         return Boolean.TRUE;
     }