Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPaymentRouteOrder.java

@@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
 
+import static com.ym.mec.biz.dal.enums.AuditStatusEnum.ING;
+
 public class StudentPaymentRouteOrder {
     private Long id;
 
@@ -60,7 +62,7 @@ public class StudentPaymentRouteOrder {
 
     private String goodsJson;
     
-    private AuditStatusEnum auditStatus;
+    private AuditStatusEnum auditStatus = ING;
     
     private String auditComment;
     

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

@@ -153,7 +153,7 @@
             #{routeOrder.userId},#{routeOrder.schoolId},#{routeOrder.transNo},#{routeOrder.payTime},
             #{routeOrder.saleAmount},#{routeOrder.serviceAmount},#{routeOrder.memo},#{routeOrder.goodsJson},
             #{routeOrder.auditStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{routeOrder.auditComment},
-            #{routeOrder.createTime},#{routeOrder.updateTime},NOW(),NOW())
+            NOW(),NOW(),#{routeOrder.createBy},#{routeOrder.updateBy})
         </foreach>
     </insert>