分页查询会员推广记录新增特殊照顾查询接口

src/main/java/com/sqx/modules/member/query/VipPromoRecordQuery.java

@@ -20,8 +20,11 @@ public class VipPromoRecordQuery extends PageQuery {
     @ApiModelProperty(value = "用户手机号")
     private String userPhone;
 
-    @ApiModelProperty(value = "支付类型 1微信支付、2余额支付、3暖心照顾")
-    private String payType;
+    // @ApiModelProperty(value = "支付类型 1微信支付、2余额支付、3暖心照顾")
+    // private String payType;
+
+    @ApiModelProperty(value = "是否暖心照顾 1是、0否")
+    private String specialFlag;
     
     @ApiModelProperty(value = "查询开始时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -48,25 +51,41 @@ public class VipPromoRecordQuery extends PageQuery {
             sb.append("用户手机号:").append(getUserPhone()).append(", ");
         }
 
-        // 支付类型
-        if (getPayType() != null && !getPayType().trim().isEmpty()) {
-            String payTypeText = "";
-            switch (getPayType()) {
+        // 是否暖心照顾
+        if (getSpecialFlag() != null && !getSpecialFlag().trim().isEmpty()) {
+            String specialFlagText = "";
+            switch (getSpecialFlag()) {
                 case "1":
-                    payTypeText = "微信支付";
-                    break;
-                case "2":
-                    payTypeText = "余额支付";
+                    specialFlagText = "是";
                     break;
-                case "3":
-                    payTypeText = "暖心照顾";
+                case "0":
+                    specialFlagText = "否";
                     break;
                 default:
-                    payTypeText = getPayType();
+                    specialFlagText = getSpecialFlag();
             }
-            sb.append("支付类型:").append(payTypeText).append(", ");
+            sb.append("是否暖心照顾:").append(specialFlagText).append(", ");
         }
 
+        // 支付类型
+        // if (getPayType() != null && !getPayType().trim().isEmpty()) {
+        //     String payTypeText = "";
+        //     switch (getPayType()) {
+        //         case "1":
+        //             payTypeText = "微信支付";
+        //             break;
+        //         case "2":
+        //             payTypeText = "余额支付";
+        //             break;
+        //         case "3":
+        //             payTypeText = "暖心照顾";
+        //             break;
+        //         default:
+        //             payTypeText = getPayType();
+        //     }
+        //     sb.append("支付类型:").append(payTypeText).append(", ");
+        // }
+
         // 开始时间
         if (getStartTime() != null) {
             sb.append("开始时间:").append(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(getStartTime())).append(", ");

src/main/resources/mapper/member/VipPromoRecordMapper.xml

@@ -25,8 +25,15 @@
             <if test="query.userPhone != null and query.userPhone != ''">
                 and vpr.user_phone like concat('%', #{query.userPhone}, '%')
             </if>
-            <if test="query.payType != null and query.payType != ''">
-                and vpr.pay_type = #{query.payType}
+<!--            <if test="query.payType != null and query.payType != ''">-->
+<!--                and vpr.pay_type = #{query.payType}-->
+<!--            </if>-->
+            <!-- 是否暖心照顾 -->
+            <if test="query.specialFlag != null and query.specialFlag != '' and query.specialFlag == '1'">
+                and vpr.pay_type = '3'
+            </if>
+            <if test="query.specialFlag != null and query.specialFlag != '' and query.specialFlag == '0'">
+                and vpr.pay_type != '3'
             </if>
             <if test="query.startTime != null">
                 and vpr.create_time >= #{query.startTime}