diff --git a/src/main/java/com/gxwebsoft/shop/entity/Order.java b/src/main/java/com/gxwebsoft/shop/entity/Order.java
index 7b9f0a8..1b059dd 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/Order.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/Order.java
@@ -89,16 +89,16 @@ public class Order implements Serializable {
     private Integer coachId;
 
     @ApiModelProperty(value = "1微信支付，2积分，3支付宝，4现金，5POS机，6VIP月卡，7VIP年卡，8VIP次卡，9IC月卡，10IC年卡，11IC次卡，12免费，13VIP充值卡，14IC充值卡，15积分支付，16VIP季卡，17IC季卡")
-    private Boolean payType;
+    private Integer payType;
 
     @ApiModelProperty(value = "1已付款，2未付款")
-    private Boolean payStatus;
+    private Integer payStatus;
 
     @ApiModelProperty(value = "1已完成，2未使用，3已取消，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款")
-    private Boolean orderStatus;
+    private Integer orderStatus;
 
     @ApiModelProperty(value = "优惠类型：0无、1抵扣优惠券、2折扣优惠券、3、VIP月卡、4VIP年卡，5VIP次卡、6VIP会员卡、7IC月卡、8IC年卡、9IC次卡、10IC会员卡、11免费订单、12VIP充值卡、13IC充值卡、14VIP季卡、15IC季卡")
-    private Boolean type;
+    private Integer type;
 
     @ApiModelProperty(value = "二维码地址，保存订单号，支付成功后才生成")
     private String qrcode;
@@ -116,7 +116,7 @@ public class Order implements Serializable {
     private String startTime;
 
     @ApiModelProperty(value = "是否已开具发票：1已开发票，2未开发票，3不能开具发票")
-    private Boolean isInvoice;
+    private Integer isInvoice;
 
     @ApiModelProperty(value = "下单时间")
     private Integer createTime;
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml
index 874760c..4947e10 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/OrderMapper.xml
@@ -129,6 +129,10 @@
             </if>
             <if test="param.keywords != null">
                 AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
+                  OR a.order_id = #{param.keywords}
+                  OR a.order_no = #{param.keywords}
+                  OR a.phone = #{param.keywords}
+                  OR a.name LIKE CONCAT('%', #{param.keywords}, '%')
                 )
               </if>
         </where>