订单审核bug

mec-biz/src/main/resources/config/mybatis/StudentPaymentRouteOrderMapper.xml

@@ -96,7 +96,10 @@
                 fee_flag_ = #{feeFlag},
             </if>
                 user_id_ = #{userId},
-            <if test="schoolId != null">
+            <if test="schoolId != null and schoolId==999999999">
+                school_id_ = null,
+            </if>
+            <if test="schoolId != null and schoolId!=999999999">
                 school_id_ = #{schoolId},
             </if>
             <if test="transNo != null">
@@ -338,7 +341,7 @@
         	<if test="type != null and type != ''">
         		and
         		<if test="type == 'SERVICE'">
-        			(spro.service_amount_ is not null and spro.service_amount_ &gt; 0) 
+        			(spro.service_amount_ is not null and spro.service_amount_ &gt; 0)
         		</if>
         		<if test="type == 'SELL'">
         			(spro.sale_amount_ is not null and spro.sale_amount_ &gt; 0)
@@ -367,7 +370,7 @@
         	<if test="type != null and type != ''">
         		and
         		<if test="type == 'SERVICE'">
-        			(spro.service_amount_ is not null and spro.service_amount_ &gt; 0) 
+        			(spro.service_amount_ is not null and spro.service_amount_ &gt; 0)
         		</if>
         		<if test="type == 'SELL'">
         			(spro.sale_amount_ is not null and spro.sale_amount_ &gt; 0)

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentRouteOrderController.java

@@ -176,6 +176,9 @@ public class StudentPaymentRouteOrderController extends BaseController {
         	studentPaymentRouteOrder.setSaleAmount(BigDecimal.ZERO);
         }
         studentPaymentRouteOrder.setUpdateBy(sysUser.getId());
+        if(studentPaymentRouteOrder.getSchoolId() == null){
+            studentPaymentRouteOrder.setSchoolId(999999999);
+        }
 
         return succeed(studentPaymentRouteOrderService.updateOutOrder(studentPaymentRouteOrder));
     }