查询调整

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支付

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);

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;
+
 }

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:

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>