Merge branch 'master-vehicle-price' into dev-tiande

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/WalletCathDTO.java

@@ -35,6 +35,11 @@ public class WalletCathDTO extends PageParam implements DataInter {
     private  Integer branchId;
 
 
+    @ApiModelProperty("提现状态：0-未提现；1-已提现")
+    private  Integer status;
+
+
+
     @ApiModelProperty("开始时间")
     private  Long startTime;
 

xx-order/xx-order-server/src/main/resources/mapper/CompanyWaterCathMapper.xml

@@ -23,6 +23,17 @@
             <if test="orderNo != null and orderNo != '' ">
                 and  wc.order_no like concat('%',#{orderNo},'%')
             </if>
+            <if test="status != null ">
+                and
+               <choose>
+                   <when test="status == 0">
+                       wc.status in (0 ,2)
+                   </when>
+                   <otherwise>
+                       wc.status =#{status}
+                   </otherwise>
+               </choose>
+            </if>
             <if test="startTime != null and startTime > 0">
                 and  wc.crt_time > = {startTime}
             </if>