Merge remote-tracking branch 'origin/master-vehicle-price' into master-vehicle-price

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,11 +23,22 @@
             <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.stauts in (0 ,2)
+                   </when>
+                   <otherwise>
+                       wc.stauts =#{status}
+                   </otherwise>
+               </choose>
+            </if>
             <if test="startTime != null and startTime > 0">
-                and  wc.crt_time > = {startTime}
+                and  wc.crt_time >= #{startTime}
             </if>
             <if test="endTime != null and endTime > 0">
-                and  wc.crt_time &lt;= {endTime}
+                and  wc.crt_time &lt;= #{endTime}
             </if>
             <if test="dataCompanyIds != null and dataCompanyIds.size() > 0">
                 and wc.company_id= in

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

@@ -24,10 +24,10 @@
                 and  d.branch_id=#{branchId}
             </if>
             <if test="startTime != null and startTime > 0">
-                and  d.crt_time > = {startTime}
+                and  d.crt_time >= #{startTime}
             </if>
             <if test="endTime != null and endTime > 0">
-                and  d.crt_time &lt;= {endTime}
+                and  d.crt_time &lt;= #{endTime}
             </if>
             <if test="dataCompanyIds != null and dataCompanyIds.size() > 0">
                 and d.company_id= in