Browse Source

财务列表遗留数据剔除

anderx 6 years ago
parent
commit
c097fa10e3

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -899,7 +899,7 @@
   	<if test="o.outsource == 1">
   	and f.refund_status=1
   	</if>
-  	and process_status &gt;= 2
+  	and process_status &gt;= 2 and process_status &lt; 7
   	<if test="o.processStatus == 2">
   	and (o.finance_id is null or o.finance_id='') 
   	</if>
@@ -943,7 +943,7 @@
   	<if test="o.outsource == 1">
   	and f.refund_status=1
   	</if>
-  	and process_status &gt;= 2
+  	and process_status &gt;= 2 and process_status &lt; 7
   	<if test="o.processStatus == 2">
   	and (o.finance_id is null or o.finance_id='')
   	</if>

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -60,7 +60,7 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.1.13
+static.host=//sb.jishutao.com/1.1.15
 avatar.host=//sb.jishutao.com
 
 #连测试