Просмотр исходного кода

Merge branch 'test' of jishutao/kede-server into prod

anderx лет назад: 6
Родитель
Сommit
68d4bb6dad
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

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

@@ -1187,7 +1187,7 @@ where super_id is null )  e on e.order_no=a.order_no
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
   	</if>
   	<if test="specially == 3">
   	<if test="specially == 3">
-  	and a.approval = 1 and  a.order_status=2
+  	and a.approval = 1 and  a.order_status=2 and a.process_status != 99 
   	</if>
   	</if>
   	<if test="specially == 4">
   	<if test="specially == 4">
   	and e.main=1
   	and e.main=1
@@ -1273,7 +1273,7 @@ where super_id is null ) e on e.order_no=a.order_no
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
   	</if>
   	<if test="specially == 3">
   	<if test="specially == 3">
-  	and a.approval = 1 and  a.order_status=2
+  	and a.approval = 1 and  a.order_status=2 and a.process_status != 99 
   	</if>
   	</if>
   	<if test="specially == 4">
   	<if test="specially == 4">
   	 and e.main=1
   	 and e.main=1