FIX 合并

zhongzheng-admin/src/main/resources/application-prod.yml

@@ -111,7 +111,7 @@ wx:
         notifyUrl: https://api.xyyxt.net/wx/pay/callback
 
 certificate:
-    host: http://192.168.1.38:8000/
+    host: https://m.xyyxt.net/
 
 officialPush:
     infoPath: http://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan

zhongzheng-admin/src/main/resources/application.yml

@@ -267,7 +267,7 @@ aliyun:
     informationNotificationCode: SMS_230965149  #完善报名资料通知
     materialReviewCode: SMS_230980165         #报名资料审核通过通知
     NotificationOfFailureCode: SMS_230980172  #报名资料审核不通过通知
-    remainingDaysValidityCode: SMS_230960174  #开通班级有效期还剩天数
+    remainingDaysValidityCode: SMS_236566823  #开通班级有效期还剩天数
     completionReminderCode: SMS_230965157   #学时学习完成提醒
     schoolHoursCode: SMS_230970166    #学时机构审核通过提醒
     auditFailedCode: SMS_230970167  #学时机构审核不通过提醒

zhongzheng-api/src/main/resources/application-prod.yml

@@ -123,7 +123,7 @@ wx:
         notifyUrl: https://api.xyyxt.net/wx/pay/callback
 
 certificate:
-    host: http://192.168.1.38:8000/
+    host: https://m.xyyxt.net/
 
 officialPush:
     infoPath: http://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan

zhongzheng-api/src/main/resources/application.yml

@@ -262,7 +262,7 @@ aliyun:
     informationNotificationCode: SMS_230965149  #完善报名资料通知
     materialReviewCode: SMS_230980165         #报名资料审核通过通知
     NotificationOfFailureCode: SMS_230980172  #报名资料审核不通过通知
-    remainingDaysValidityCode: SMS_230960174  #开通班级有效期还剩天数
+    remainingDaysValidityCode: SMS_236566823  #开通班级有效期还剩天数
     completionReminderCode: SMS_230965157   #学时学习完成提醒
     schoolHoursCode: SMS_230970166    #学时机构审核通过提醒
     auditFailedCode: SMS_230970167  #学时机构审核不通过提醒

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

@@ -490,7 +490,7 @@ public class CertificateTpServiceImpl extends ServiceImpl<CertificateTpMapper, C
             g.drawString(entity.getDateM(), 2505, 1599);
             g.drawString(entity.getDateD(), 2712, 1599);
             //二维码
-            String qrTxt = CERTIFICATE_HOST+"certificate.html?code="+entity.getCode();
+            String qrTxt = CERTIFICATE_HOST+"pages/certificate/index?code="+entity.getCode();
             QRCodeWriter qrCodeWriter = new QRCodeWriter();
             BitMatrix bitMatrix = qrCodeWriter.encode(qrTxt, BarcodeFormat.QR_CODE, 320, 320);
             BufferedImage qrImage = toBufferedImage(bitMatrix);

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -367,9 +367,10 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 informUserAddBo.setGoodsId(classTwentyGradeUserVo.getGoodsId());
                 informUserAddBo.setGradeId(classTwentyGradeUserVo.getGradeId());
                 GoodsVo goodsVo1 = iGoodsService.queryById(classTwentyGradeUserVo.getGoodsId());
-                informUserAddBo.setText("尊敬的用户：您购买的课程班级有效期还剩20天，未在"+resEnd+"前完成全部学时，可能会影响审核进度，最终导致学时无效，请尽快完成学习");
+                informUserAddBo.setText("尊敬的用户：您购买的"+goodsVo1.getGoodsName()+"课程班级有效期还剩20天，未在"+resEnd+"前完成全部学时，可能会影响审核进度，最终导致学时无效，请尽快完成学习");
                 UserVo userVo = iUserService.queryById(classTwentyGradeUserVo.getUserId());
                 Map<String, Object> param = new HashMap<>();
+                param.put("goods", goodsVo1.getGoodsName());
                 param.put("time", resEnd);
                 param.put("day", 20);
                 if(Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), remainingDaysValidityCode))){
@@ -418,10 +419,11 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 informUserAddBo.setGoodsId(classTenGradeUserVo.getGoodsId());
                 informUserAddBo.setGradeId(classTenGradeUserVo.getGradeId());
                 GoodsVo goodsVo1 = iGoodsService.queryById(classTenGradeUserVo.getGoodsId());
-                informUserAddBo.setText("尊敬的用户：您购买的课程班级有效期还剩10天，未在"+resEnd+"前完成全部学时，可能会影响审核进度，最终导致学时无效，请尽快完成学习");
+                informUserAddBo.setText("尊敬的用户：您购买的"+goodsVo1.getGoodsName()+"课程班级有效期还剩10天，未在"+resEnd+"前完成全部学时，可能会影响审核进度，最终导致学时无效，请尽快完成学习");
 
                 UserVo userVo = iUserService.queryById(classTenGradeUserVo.getUserId());
                 Map<String, Object> param = new HashMap<>();
+                param.put("goods", goodsVo1.getGoodsName());
                 param.put("time", resEnd);
                 param.put("day", 10);
                 if(Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), remainingDaysValidityCode))){
@@ -470,9 +472,10 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 informUserAddBo.setGoodsId(classFiveGradeUserVo.getGoodsId());
                 informUserAddBo.setGradeId(classFiveGradeUserVo.getGradeId());
                 GoodsVo goodsVo1 = iGoodsService.queryById(classFiveGradeUserVo.getGoodsId());
-                informUserAddBo.setText("尊敬的用户：您购买的课程班级有效期还剩5天，未在"+resEnd+"前完成全部学时，可能会影响审核进度，最终导致学时无效，请尽快完成学习");
+                informUserAddBo.setText("尊敬的用户：您购买的"+goodsVo1.getGoodsName()+"课程班级有效期还剩5天，未在"+resEnd+"前完成全部学时，可能会影响审核进度，最终导致学时无效，请尽快完成学习");
                 UserVo userVo = iUserService.queryById(classFiveGradeUserVo.getUserId());
                 Map<String, Object> param = new HashMap<>();
+                param.put("goods", goodsVo1.getGoodsName());
                 param.put("time", resEnd);
                 param.put("day", 5);
                 if(Validator.isNotEmpty(IAliSmsService.sendInformSms(userVo.getTelphone(), JSON.toJSONString(param), remainingDaysValidityCode))){

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

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN question_chapter qc ON mc.chapter_exam_id = qc.chapter_exam_id
         WHERE
             qm.module_exam_id  =#{moduleExamId}
-          AND mc.chapter_exam_id IN ( SELECT chapter_exam_id FROM user_exam_record WHERE user_id = #{userId} AND goods_id = #{goodsId} AND module_exam_id = 0 AND chapter_exam_id > 0 GROUP BY chapter_exam_id)
+          AND mc.chapter_exam_id IN ( SELECT chapter_exam_id FROM user_exam_record WHERE user_id = #{userId} AND goods_id = #{goodsId} AND module_exam_id = #{moduleExamId} AND chapter_exam_id > 0 GROUP BY chapter_exam_id)
 
     </select>
 </mapper>