dcs 3 月之前
父節點
當前提交
bf2ba2db50

+ 3 - 3
virgo.api/src/main/java/com/bosshand/virgo/api/workark/model/OrderInfo.java

@@ -67,7 +67,7 @@ public class OrderInfo {
     /**
      * 订单状态
      */
-    private int status;
+    private Integer status;
 
     /**
      * 优惠券ids
@@ -182,11 +182,11 @@ public class OrderInfo {
         this.orderStatus = orderStatus;
     }
 
-    public int getStatus() {
+    public Integer getStatus() {
         return status;
     }
 
-    public void setStatus(int status) {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 

+ 6 - 0
virgo.api/src/main/resources/mapper/OrderInfoMapper.xml

@@ -58,7 +58,9 @@
             <if test="orderStatus != null">
                 and orderStatus = #{orderStatus}
             </if>
+            <if test="status != null">
                 and status = #{status}
+            </if>
             <if test="paymentType != null">
                 and paymentType = #{paymentType}
             </if>
@@ -92,7 +94,9 @@
             <if test="orderStatus != null">
                 and orderStatus = #{orderStatus}
             </if>
+            <if test="status != null">
                 and status = #{status}
+            </if>
             <if test="paymentType != null">
                 and paymentType = #{paymentType}
             </if>
@@ -126,7 +130,9 @@
             <if test="p.orderStatus != null">
                 and orderStatus = #{p.orderStatus}
             </if>
+            <if test="p.status != null">
                 and status = #{p.status}
+            </if>
             <if test="p.paymentType != null">
                 and paymentType = #{p.paymentType}
             </if>