From 66548f73df973b82d1ca361e8f4ea6eccfcc6af7 Mon Sep 17 00:00:00 2001
From: caolin <1149034574@qq.com>
Date: Wed, 23 Aug 2023 23:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AppletPayController.java       |  1 +
 .../server/controller/H5PayController.java    |  1 +
 .../driver/server/dto/QuestionQueryDto.java   | 40 +++++++++++++++++++
 src/main/resources/application.yml            | 18 ++++-----
 .../resources/mapper/TdQuestionMapper.xml     | 29 ++++++++++++--
 5 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/jwl/driver/server/controller/AppletPayController.java b/src/main/java/com/jwl/driver/server/controller/AppletPayController.java
index 9214d0b..36ee5f1 100644
--- a/src/main/java/com/jwl/driver/server/controller/AppletPayController.java
+++ b/src/main/java/com/jwl/driver/server/controller/AppletPayController.java
@@ -60,6 +60,7 @@ public class AppletPayController {
 
         Payer payer = new Payer();
         payer.setOpenid(WechatPayUtil.getOpenId(wechatPayConfig.getAppId(), wechatPayConfig.getAppSecret(), payDto.getCode()));
+        request.setPayer(payer);
         // 调用下单方法，得到应答
         PrepayWithRequestPaymentResponse response = service.prepayWithRequestPayment(request);
         // 使用微信扫描 code_url 对应的二维码，即可体验Native支付
diff --git a/src/main/java/com/jwl/driver/server/controller/H5PayController.java b/src/main/java/com/jwl/driver/server/controller/H5PayController.java
index 0ae2630..793e6a8 100644
--- a/src/main/java/com/jwl/driver/server/controller/H5PayController.java
+++ b/src/main/java/com/jwl/driver/server/controller/H5PayController.java
@@ -61,6 +61,7 @@ public class H5PayController {
         //场景参数
         SceneInfo sceneInfo = new SceneInfo();
         sceneInfo.setPayerClientIp(payVo.getClientIp());
+        request.setSceneInfo(sceneInfo);
 
         // 调用下单方法，得到应答
         PrepayResponse response = service.prepay(request);
diff --git a/src/main/java/com/jwl/driver/server/dto/QuestionQueryDto.java b/src/main/java/com/jwl/driver/server/dto/QuestionQueryDto.java
index b8f0c7f..c801c14 100644
--- a/src/main/java/com/jwl/driver/server/dto/QuestionQueryDto.java
+++ b/src/main/java/com/jwl/driver/server/dto/QuestionQueryDto.java
@@ -93,4 +93,44 @@ public class QuestionQueryDto implements Serializable {
     @ApiModelProperty("题目")
     private String question;
 
+    /**
+     * 是否易错
+     */
+    @ApiModelProperty("是否易错")
+    private Integer isError;
+    /**
+     * 是否v新规
+     */
+    @ApiModelProperty("是否v新规")
+    private Integer isNew;
+    /**
+     * 考点
+     */
+    @ApiModelProperty("考点")
+    private String examKey;
+
+    /**
+     * 是否精讯500题
+     */
+    @ApiModelProperty("是否精讯500题")
+    private Integer isVip;
+
+    /**
+     * 是否精讯600题
+     */
+    @ApiModelProperty("是否精讯600题")
+    private Integer isVip2;
+
+    /**
+     * 是否密卷1
+     */
+    @ApiModelProperty("是否密卷1")
+    private Integer isExam1;
+
+    /**
+     * 是否密卷2
+     */
+    @ApiModelProperty("是否密卷2")
+    private Integer isExam2;
+
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 97f1c59..3455790 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -42,15 +42,15 @@ driver:
       - /driver-api/swagger-resources
       - /driver-api/favicon.ico
       - /driver-api/tdSysUser/code
-      - /tdQuestion/duima/list
-      - /tdQuestion/duima/update
-      - /payNoticeLog
-      - /tdQuestion/queryQuestionById
-      - /tdQuestion/queryQuestionByIdList
-      - /tdQuestion/queryQuestion
-      - /tdQuestion/getTestQuestion
-      - /tdQuestion/questionCategory
-      - /tdMember/queryMember
+      - /driver-api/tdQuestion/duima/list
+      - /driver-api/tdQuestion/duima/update
+      - /driver-api/payNoticeLog
+      - /driver-api/tdQuestion/queryQuestionById
+      - /driver-api/tdQuestion/queryQuestionByIdList
+      - /driver-api/tdQuestion/queryQuestion
+      - /driver-api/tdQuestion/getTestQuestion
+      - /driver-api/tdQuestion/questionCategory
+      - /driver-api/tdMember/queryMember
 
     # 需要权限校验url集合
     needAuthEndPoints:
diff --git a/src/main/resources/mapper/TdQuestionMapper.xml b/src/main/resources/mapper/TdQuestionMapper.xml
index 545c0df..456d995 100644
--- a/src/main/resources/mapper/TdQuestionMapper.xml
+++ b/src/main/resources/mapper/TdQuestionMapper.xml
@@ -62,6 +62,27 @@
             <if test="queryDto.type !=null and queryDto.type != ''">
                 and tq.TYPE = #{queryDto.type}
             </if>
+            <if test="queryDto.isError !=null">
+                and tq.IS_ERROR = #{queryDto.isError}
+            </if>
+            <if test="queryDto.isNew !=null">
+                and tq.IS_NEW = #{queryDto.isNew}
+            </if>
+            <if test="queryDto.examKey !=null and queryDto.examKey != ''">
+                and find_in_set(#{queryDto.examKey},tq.EXAM_KEYS)
+            </if>
+            <if test="queryDto.isVip !=null">
+                and tq.IS_VIP = #{queryDto.isVip}
+            </if>
+            <if test="queryDto.isVip2 !=null">
+                and tq.IS_VIP2 = #{queryDto.isVip2}
+            </if>
+            <if test="queryDto.isExam1 !=null">
+                and tq.IS_EXAM1 = #{queryDto.isExam1}
+            </if>
+            <if test="queryDto.isExam2 !=null">
+                and tq.IS_EXAM2 = #{queryDto.isExam2}
+            </if>
             <if test="queryDto.cid !=null and queryDto.cid !=''">
                 and find_in_set(#{queryDto.cid},tq.CIDS)
             </if>
@@ -124,11 +145,11 @@
     </select>
 
     <update id="updateQuestion" parameterType="com.jwl.driver.server.vo.QuestionVo">
-      update td_question
+        update td_question
         <trim prefix="SET" suffixOverrides=",">
-          <if test="questionVo.isVip !=null">
-               IS_VIP = #{questionVo.isVip},
-          </if>
+            <if test="questionVo.isVip !=null">
+                IS_VIP = #{questionVo.isVip},
+            </if>
             <if test="questionVo.isError !=null">
                 IS_ERROR = #{questionVo.isError},
             </if>