update

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

@@ -23,9 +23,6 @@ public class ChargeTypeController extends BaseController {
     @ApiOperation(value = "新增收费类型")
     @PostMapping("/add")
     public Object add(@RequestBody ChargeType chargeType) {
-        Date date = new Date();
-        chargeType.setCreateTime(date);
-        chargeType.setUpdateTime(date);
         chargeTypeService.insert(chargeType);
         return succeed();
     }

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

@@ -26,9 +26,6 @@ public class GoodsCategoryController extends BaseController {
     @ApiOperation(value = "新增商品分类")
     @PostMapping("/add")
     public Object add(@RequestBody GoodsCategory goodsCategory) {
-        Date date = new Date();
-        goodsCategory.setCreateTime(date);
-        goodsCategory.setUpdateTime(date);
         GoodsCategoryCategoryService.insert(goodsCategory);
         return succeed();
     }

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

@@ -26,9 +26,6 @@ public class GoodsController extends BaseController {
     @ApiOperation(value = "新增商品(教材、辅件)")
     @PostMapping("/add")
     public Object add(@RequestBody Goods goods){
-        Date date = new Date();
-        goods.setCreateTime(date);
-        goods.setUpdateTime(date);
         goodsService.insert(goods);
         return succeed();
     }

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

@@ -23,9 +23,6 @@ public class MusicGroupController extends BaseController {
     @ApiOperation(value = "新增乐团")
     @PostMapping("/add")
     public Object add(@RequestBody MusicGroup musicGroup){
-        Date date = new Date();
-        musicGroup.setCreateTime(date);
-        musicGroup.setUpdateTime(date);
         musicGroupService.insert(musicGroup);
         return succeed();
     }

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

@@ -23,9 +23,6 @@ public class MusicGroupPaymentCalenderController extends BaseController {
     @ApiOperation(value = "新增乐团缴费日历")
     @PostMapping("/add")
     public Object add(@RequestBody MusicGroupPaymentCalender musicGroupPaymentCalender) {
-        Date date = new Date();
-        musicGroupPaymentCalender.setCreateTime(date);
-        musicGroupPaymentCalender.setUpdateTime(date);
         musicGroupPaymentCalenderService.insert(musicGroupPaymentCalender);
         return succeed();
     }

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

@@ -24,9 +24,6 @@ public class MusicGroupPaymentEntitiesController extends BaseController {
     @ApiOperation(value = "新增乐团付费主体")
     @PostMapping("/add")
     public Object add(@RequestBody MusicGroupPaymentEntities musicGroupPaymentEntities){
-        Date date = new Date();
-        musicGroupPaymentEntities.setCreateTime(date);
-        musicGroupPaymentEntities.setUpdateTime(date);
         musicGroupPaymentEntitiesService.insert(musicGroupPaymentEntities);
         return succeed();
     }

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

@@ -33,9 +33,6 @@ public class OrganizationController extends BaseController {
         if(organizationByCode != null){
             return failed("组织机构代码已经存在,请更改");
         }
-        Date date = new Date();
-        organization.setCreateTime(date);
-        organization.setUpdateTime(date);
         return succeed(organizationService.insert(organization));
     }
 

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

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.Date;
 
 @RequestMapping("school")
@@ -22,9 +23,6 @@ public class SchoolController extends BaseController {
     @ApiOperation(value = "新增学校")
     @PostMapping("/add")
     public Object add(@RequestBody School school){
-        Date date = new Date();
-        school.setCreateTime(date);
-        school.setUpdateTime(date);
         schoolService.insert(school);
         return succeed();
     }

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

@@ -25,9 +25,6 @@ public class StudentRegistrationController extends BaseController {
     @ApiOperation(value = "新增学生报名信息")
     @PostMapping("/add")
     public Object add(@RequestBody StudentRegistration studentRegistration){
-        Date date = new Date();
-        studentRegistration.setCreateTime(date);
-        studentRegistration.setUpdateTime(date);
         studentRegistrationService.insert(studentRegistration);
         return succeed();
     }

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

@@ -25,9 +25,6 @@ public class SubjectController extends BaseController {
         if(subjectByCode != null){
             return failed("科目编号已存在，请核查");
         }
-        Date date = new Date();
-        subject.setCreateTime(date);
-        subject.setUpdateTime(date);
         subjectService.insert(subject);
         return succeed();
     }

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

@@ -1,9 +1,7 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.security.AuthUser;
 import com.ym.mec.common.security.SecurityUtils;
-import com.ym.mec.web.dal.entity.ClassGroup;
 import com.ym.mec.web.dal.entity.Teacher;
 import com.ym.mec.web.dal.page.TeacherQueryInfo;
 import com.ym.mec.web.service.ClassGroupService;
@@ -15,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
-import java.util.List;
 
 @RequestMapping("teacher")
 @Api(tags = "教师服务")
@@ -39,9 +36,6 @@ public class TeacherController extends BaseController {
         if(organId != null){
             teacher.setOrganId(organId);
         }
-        Date date = new Date();
-        teacher.setCreateTime(date);
-        teacher.setUpdateTime(date);
         teacherService.insert(teacher);
         return succeed();
     }

mec-web/src/main/java/com/ym/mec/web/dal/dao/PlatformCashAccountDao.java

@@ -1,9 +0,0 @@
-package com.ym.mec.web.dal.dao;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.PlatformCashAccount;
-
-public interface PlatformCashAccountDao extends BaseDAO<String, PlatformCashAccount> {
-
-	
-}

mec-web/src/main/java/com/ym/mec/web/dal/dao/PlatformCashAccountDetailDao.java

@@ -1,9 +0,0 @@
-package com.ym.mec.web.dal.dao;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.PlatformCashAccountDetail;
-
-public interface PlatformCashAccountDetailDao extends BaseDAO<Long, PlatformCashAccountDetail> {
-
-	
-}

mec-web/src/main/java/com/ym/mec/web/dal/entity/PlatformCashAccount.java

@@ -1,112 +0,0 @@
-package com.ym.mec.web.dal.entity;
-
-import com.ym.mec.web.dal.enums.PlatformCashAccountStatusEnum;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import java.math.BigDecimal;
-
-/**
- * 对应数据库表(platform_cash_account):
- */
-public class PlatformCashAccount {
-
-	/** 账户号 */
-	private String id;
-	
-	/** 币种 */
-	@ApiModelProperty(value = "机构名称",required = false)
-	private String currency;
-	
-	/** 账户可用余额 */
-	@ApiModelProperty(value = "账户可用余额",required = false)
-	private BigDecimal balance;
-	
-	/** 冻结金额 */
-	@ApiModelProperty(value = "冻结金额",required = false)
-	private BigDecimal frozenAmount;
-	
-	/** 保证金余额 */
-	@ApiModelProperty(value = "保证金余额",required = false)
-	private BigDecimal marginBalance;
-	
-	/** 账户状态(0,冻结,1,正常;-1,注销;) */
-	@ApiModelProperty(value = "账户状态",required = false)
-	private PlatformCashAccountStatusEnum status;
-	
-	/** 创建时间 */
-	private java.util.Date createTime;
-	
-	/** 修改时间 */
-	private java.util.Date updateTime;
-	
-	public void setId(String id){
-		this.id = id;
-	}
-	
-	public String getId(){
-		return this.id;
-	}
-			
-	public void setCurrency(String currency){
-		this.currency = currency;
-	}
-	
-	public String getCurrency(){
-		return this.currency;
-	}
-
-	public BigDecimal getFrozenAmount() {
-		return frozenAmount;
-	}
-
-	public void setFrozenAmount(BigDecimal frozenAmount) {
-		this.frozenAmount = frozenAmount;
-	}
-
-	public BigDecimal getMarginBalance() {
-		return marginBalance;
-	}
-
-	public void setMarginBalance(BigDecimal marginBalance) {
-		this.marginBalance = marginBalance;
-	}
-
-	public BigDecimal getBalance() {
-		return balance;
-	}
-
-	public void setBalance(BigDecimal balance) {
-		this.balance = balance;
-	}
-
-	public PlatformCashAccountStatusEnum getStatus() {
-		return status;
-	}
-
-	public void setStatus(PlatformCashAccountStatusEnum status) {
-		this.status = status;
-	}
-
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

mec-web/src/main/java/com/ym/mec/web/dal/entity/PlatformCashAccountDetail.java

@@ -1,149 +0,0 @@
-package com.ym.mec.web.dal.entity;
-
-import com.ym.mec.web.dal.enums.DealStatusEnum;
-import com.ym.mec.web.dal.enums.PlatformCashAccountDetailTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import java.math.BigDecimal;
-
-/**
- * 对应数据库表(platform_cash_account_detail):
- */
-public class PlatformCashAccountDetail {
-
-	/** 序号 */
-	private Long id;
-	
-	/** 用户编号 */
-	@ApiModelProperty(value = "用户编号",required = false)
-	private String platformCashAccountId;
-	
-	/** 交易流水号 */
-	@ApiModelProperty(value = "交易流水号",required = false)
-	private String transNo;
-	
-	/** 交易类型 (RECHARGE 充值,WITHDRAW 提现,PAY_FEE 缴费,REFUNDS 退费,FILL_ACCOUNT 人工补账) */
-	@ApiModelProperty(value = "交易类型",required = false)
-	private PlatformCashAccountDetailTypeEnum type;
-	
-	/** 交易状态(1,交易中;2,成功交易;3,交易失败;) */
-	@ApiModelProperty(value = "交易状态",required = false)
-	private DealStatusEnum status;
-	
-	/** 交易金额 */
-	@ApiModelProperty(value = "交易金额",required = false)
-	private BigDecimal amount;
-	
-	/** 账户可用余额 */
-	@ApiModelProperty(value = "账户可用余额",required = false)
-	private BigDecimal balance;
-	
-	/** 描述 */
-	@ApiModelProperty(value = "描述",required = false)
-	private String description;
-	
-	/** 后台备注 */
-	@ApiModelProperty(value = "后台备注",required = false)
-	private String comment;
-	
-	/** 创建时间 */
-	private java.util.Date createTime;
-	
-	/** 修改时间 */
-	private java.util.Date updateTime;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setPlatformCashAccountId(String platformCashAccountId){
-		this.platformCashAccountId = platformCashAccountId;
-	}
-	
-	public String getPlatformCashAccountId(){
-		return this.platformCashAccountId;
-	}
-			
-	public void setTransNo(String transNo){
-		this.transNo = transNo;
-	}
-	
-	public String getTransNo(){
-		return this.transNo;
-	}
-
-	public PlatformCashAccountDetailTypeEnum getType() {
-		return type;
-	}
-
-	public void setType(PlatformCashAccountDetailTypeEnum type) {
-		this.type = type;
-	}
-
-	public DealStatusEnum getStatus() {
-		return status;
-	}
-
-	public void setStatus(DealStatusEnum status) {
-		this.status = status;
-	}
-
-	public BigDecimal getAmount() {
-		return amount;
-	}
-
-	public void setAmount(BigDecimal amount) {
-		this.amount = amount;
-	}
-
-	public BigDecimal getBalance() {
-		return balance;
-	}
-
-	public void setBalance(BigDecimal balance) {
-		this.balance = balance;
-	}
-
-	public void setDescription(String description){
-		this.description = description;
-	}
-	
-	public String getDescription(){
-		return this.description;
-	}
-			
-	public void setComment(String comment){
-		this.comment = comment;
-	}
-	
-	public String getComment(){
-		return this.comment;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

mec-web/src/main/java/com/ym/mec/web/dal/entity/StudentPaymentOrderDetail.java

@@ -1,7 +1,11 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.OrderDetailTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(student_payment_order_detail):
  */
@@ -11,13 +15,16 @@ public class StudentPaymentOrderDetail {
 	private Long id;
 	
 	/** 类型(乐器、辅件、教材、课程) */
-	private String type;
+	@ApiModelProperty(value = "类型",required = true)
+	private OrderDetailTypeEnum type;
 	
 	/** 商品列表(用户|分开) */
+	@ApiModelProperty(value = "商品列表(用户|分开) ",required = true)
 	private String goodsIdList;
 	
 	/** 打包价格 */
-	private long price;
+	@ApiModelProperty(value = "打包价格",required = true)
+	private BigDecimal price;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -26,6 +33,7 @@ public class StudentPaymentOrderDetail {
 	private java.util.Date updateTime;
 	
 	/** 订单编号(对应student_payment_order) */
+	@ApiModelProperty(value = "订单编号",required = true)
 	private Long paymentOrderId;
 	
 	public void setId(Long id){
@@ -35,15 +43,23 @@ public class StudentPaymentOrderDetail {
 	public Long getId(){
 		return this.id;
 	}
-			
-	public void setType(String type){
+
+	public OrderDetailTypeEnum getType() {
+		return type;
+	}
+
+	public void setType(OrderDetailTypeEnum type) {
 		this.type = type;
 	}
-	
-	public String getType(){
-		return this.type;
+
+	public BigDecimal getPrice() {
+		return price;
 	}
-			
+
+	public void setPrice(BigDecimal price) {
+		this.price = price;
+	}
+
 	public void setGoodsIdList(String goodsIdList){
 		this.goodsIdList = goodsIdList;
 	}
@@ -52,14 +68,6 @@ public class StudentPaymentOrderDetail {
 		return this.goodsIdList;
 	}
 			
-	public void setPrice(long price){
-		this.price = price;
-	}
-	
-	public long getPrice(){
-		return this.price;
-	}
-			
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

mec-web/src/main/java/com/ym/mec/web/dal/entity/StudentRegistration.java

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.KitPurchaseMethodEnum;
 import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -38,7 +39,7 @@ public class StudentRegistration {
 	
 	/** 器材购买方式（团购、自备） */
 	@ApiModelProperty(value = "器材购买方式（团购、自备）",required = false)
-	private String kitPurchaseMethod;
+	private KitPurchaseMethodEnum kitPurchaseMethod;
 	
 	/**  */
 	@ApiModelProperty(value = "备注",required = false)
@@ -142,14 +143,14 @@ public class StudentRegistration {
 		this.paymentStatus = paymentStatus;
 	}
 
-	public void setKitPurchaseMethod(String kitPurchaseMethod){
-		this.kitPurchaseMethod = kitPurchaseMethod;
+	public KitPurchaseMethodEnum getKitPurchaseMethod() {
+		return kitPurchaseMethod;
 	}
-	
-	public String getKitPurchaseMethod(){
-		return this.kitPurchaseMethod;
+
+	public void setKitPurchaseMethod(KitPurchaseMethodEnum kitPurchaseMethod) {
+		this.kitPurchaseMethod = kitPurchaseMethod;
 	}
-			
+
 	public void setRemark(String remark){
 		this.remark = remark;
 	}

mec-web/src/main/java/com/ym/mec/web/dal/entity/SubjectGoodsMapper.java

@@ -25,6 +25,7 @@ public class SubjectGoodsMapper {
 	@ApiModelProperty(value = "商品编号", required = false)
 	private Integer goodsId;
 
+	@ApiModelProperty(value = "商品类型", required = false)
 	private GoodsType type;
 
 	/**  */

mec-web/src/main/java/com/ym/mec/web/dal/entity/SysUserCashAccount.java

@@ -1,29 +1,39 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.PlatformCashAccountStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(sys_user_cash_account):
  */
 public class SysUserCashAccount {
 
 	/** 账户号码(用户编号) */
+	@ApiModelProperty(value = "账户号码(用户编号) ",required = false)
 	private Integer userId;
 	
 	/** 币种 */
+	@ApiModelProperty(value = "币种",required = false)
 	private String currency;
 	
 	/** 账户可用余额 */
-	private long balance;
+	@ApiModelProperty(value = "账户可用余额",required = false)
+	private BigDecimal balance;
 	
 	/** 冻结金额 */
-	private long frozenAmount;
+	@ApiModelProperty(value = "冻结金额",required = false)
+	private BigDecimal frozenAmount;
 	
 	/** 保证金余额 */
-	private long marginBalance;
+	@ApiModelProperty(value = "保证金余额",required = false)
+	private BigDecimal marginBalance;
 	
 	/** 账户状态(0,冻结,1,正常;-1,注销;) */
-	private Integer status;
+	@ApiModelProperty(value = "账户状态",required = false)
+	private PlatformCashAccountStatusEnum status;
 	
 	/** 创建时间 */
 	private java.util.Date createTime;
@@ -46,39 +56,39 @@ public class SysUserCashAccount {
 	public String getCurrency(){
 		return this.currency;
 	}
-			
-	public void setBalance(long balance){
+
+	public BigDecimal getBalance() {
+		return balance;
+	}
+
+	public void setBalance(BigDecimal balance) {
 		this.balance = balance;
 	}
-	
-	public long getBalance(){
-		return this.balance;
+
+	public BigDecimal getFrozenAmount() {
+		return frozenAmount;
 	}
-			
-	public void setFrozenAmount(long frozenAmount){
+
+	public void setFrozenAmount(BigDecimal frozenAmount) {
 		this.frozenAmount = frozenAmount;
 	}
-	
-	public long getFrozenAmount(){
-		return this.frozenAmount;
+
+	public BigDecimal getMarginBalance() {
+		return marginBalance;
 	}
-			
-	public void setMarginBalance(long marginBalance){
+
+	public void setMarginBalance(BigDecimal marginBalance) {
 		this.marginBalance = marginBalance;
 	}
-	
-	public long getMarginBalance(){
-		return this.marginBalance;
+
+	public PlatformCashAccountStatusEnum getStatus() {
+		return status;
 	}
-			
-	public void setStatus(Integer status){
+
+	public void setStatus(PlatformCashAccountStatusEnum status) {
 		this.status = status;
 	}
-	
-	public Integer getStatus(){
-		return this.status;
-	}
-			
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

mec-web/src/main/java/com/ym/mec/web/dal/entity/SysUserCashAccountDetail.java

@@ -1,37 +1,51 @@
 package com.ym.mec.web.dal.entity;
 
+import com.ym.mec.web.dal.enums.DealStatusEnum;
+import com.ym.mec.web.dal.enums.PlatformCashAccountDetailTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(sys_user_cash_account_detail):
  */
 public class SysUserCashAccountDetail {
 
 	/** 序号 */
+	@ApiModelProperty(value = "序号",required = false)
 	private Long id;
 	
 	/** 用户编号 */
+	@ApiModelProperty(value = "用户编号",required = false)
 	private Integer userId;
 	
 	/** 交易流水号 */
+	@ApiModelProperty(value = "交易流水号",required = false)
 	private String transNo;
 	
 	/** 交易类型 (RECHARGE 充值,WITHDRAW 提现,PAY_FEE 缴费,REFUNDS 退费,FILL_ACCOUNT 人工补账) */
-	private String type;
+	@ApiModelProperty(value = "交易类型",required = false)
+	private PlatformCashAccountDetailTypeEnum type;
 	
 	/** 交易状态(1,交易中;2,成功交易;-1,交易失败;) */
-	private Integer status;
+	@ApiModelProperty(value = "交易状态",required = false)
+	private DealStatusEnum status;
 	
 	/** 交易金额 */
-	private long amount;
+	@ApiModelProperty(value = "交易金额",required = false)
+	private BigDecimal amount;
 	
 	/** 账户可用余额 */
-	private long balance;
+	@ApiModelProperty(value = "账户可用余额",required = false)
+	private BigDecimal balance;
 	
 	/** 描述 */
+	@ApiModelProperty(value = "描述",required = false)
 	private String description;
 	
 	/** 后台备注 */
+	@ApiModelProperty(value = "后台备注",required = false)
 	private String comment;
 	
 	/** 创建时间 */
@@ -63,39 +77,39 @@ public class SysUserCashAccountDetail {
 	public String getTransNo(){
 		return this.transNo;
 	}
-			
-	public void setType(String type){
+
+	public PlatformCashAccountDetailTypeEnum getType() {
+		return type;
+	}
+
+	public void setType(PlatformCashAccountDetailTypeEnum type) {
 		this.type = type;
 	}
-	
-	public String getType(){
-		return this.type;
+
+	public DealStatusEnum getStatus() {
+		return status;
 	}
-			
-	public void setStatus(Integer status){
+
+	public void setStatus(DealStatusEnum status) {
 		this.status = status;
 	}
-	
-	public Integer getStatus(){
-		return this.status;
+
+	public BigDecimal getAmount() {
+		return amount;
 	}
-			
-	public void setAmount(long amount){
+
+	public void setAmount(BigDecimal amount) {
 		this.amount = amount;
 	}
-	
-	public long getAmount(){
-		return this.amount;
+
+	public BigDecimal getBalance() {
+		return balance;
 	}
-			
-	public void setBalance(long balance){
+
+	public void setBalance(BigDecimal balance) {
 		this.balance = balance;
 	}
-	
-	public long getBalance(){
-		return this.balance;
-	}
-			
+
 	public void setDescription(String description){
 		this.description = description;
 	}

mec-web/src/main/java/com/ym/mec/web/dal/entity/TeacherSalary.java

@@ -3,6 +3,8 @@ package com.ym.mec.web.dal.entity;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(teacher_salary):
  */
@@ -21,7 +23,7 @@ public class TeacherSalary {
 	
 	/** 课酬 */
 	@ApiModelProperty(value = "课酬",required = false)
-	private long salary;
+	private BigDecimal salary;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -49,15 +51,15 @@ public class TeacherSalary {
 	public Integer getSubjectId(){
 		return this.subjectId;
 	}
-			
-	public void setSalary(long salary){
-		this.salary = salary;
+
+	public BigDecimal getSalary() {
+		return salary;
 	}
-	
-	public long getSalary(){
-		return this.salary;
+
+	public void setSalary(BigDecimal salary) {
+		this.salary = salary;
 	}
-			
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

mec-web/src/main/java/com/ym/mec/web/dal/enums/KitPurchaseMethodEnum.java

@@ -0,0 +1,36 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 器材购买方式（团购、自备）
+ */
+public enum KitPurchaseMethodEnum implements BaseEnum<String, KitPurchaseMethodEnum> {
+	GROUP("GROUP", "团购"), OWNED("OWNED", "自备");
+
+	private String code;
+
+	private String msg;
+
+	KitPurchaseMethodEnum(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public String getCode() {
+		return this.code;
+	}
+}

mec-web/src/main/java/com/ym/mec/web/dal/enums/OrderDetailTypeEnum.java

@@ -0,0 +1,39 @@
+package com.ym.mec.web.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 类型(乐器、教辅、课程)'
+ */
+public enum OrderDetailTypeEnum implements BaseEnum<String, OrderDetailTypeEnum> {
+	MUSICAL("MUSICAL", "乐器"),
+	TEACHING("TEACHING", "教辅"),
+	ELSE("ELSE", "其他"),
+	COURSE("COURSE", "课程");
+
+	private String code;
+
+	private String msg;
+
+	OrderDetailTypeEnum(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public String getCode() {
+		return this.code;
+	}
+}

mec-web/src/main/java/com/ym/mec/web/service/PlatformCashAccountDetailService.java

@@ -1,8 +0,0 @@
-package com.ym.mec.web.service;
-
-import com.ym.mec.common.service.BaseService;
-import com.ym.mec.web.dal.entity.PlatformCashAccountDetail;
-
-public interface PlatformCashAccountDetailService extends BaseService<Long, PlatformCashAccountDetail> {
-
-}

mec-web/src/main/java/com/ym/mec/web/service/PlatformCashAccountService.java

@@ -1,8 +0,0 @@
-package com.ym.mec.web.service;
-
-import com.ym.mec.common.service.BaseService;
-import com.ym.mec.web.dal.entity.PlatformCashAccount;
-
-public interface PlatformCashAccountService extends BaseService<String, PlatformCashAccount> {
-
-}

mec-web/src/main/java/com/ym/mec/web/service/impl/PlatformCashAccountDetailServiceImpl.java

@@ -1,23 +0,0 @@
-package com.ym.mec.web.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.web.dal.dao.PlatformCashAccountDetailDao;
-import com.ym.mec.web.dal.entity.PlatformCashAccountDetail;
-import com.ym.mec.web.service.PlatformCashAccountDetailService;
-
-@Service
-public class PlatformCashAccountDetailServiceImpl extends BaseServiceImpl<Long, PlatformCashAccountDetail>  implements PlatformCashAccountDetailService {
-	
-	@Autowired
-	private PlatformCashAccountDetailDao platformCashAccountDetailDao;
-
-	@Override
-	public BaseDAO<Long, PlatformCashAccountDetail> getDAO() {
-		return platformCashAccountDetailDao;
-	}
-	
-}

mec-web/src/main/java/com/ym/mec/web/service/impl/PlatformCashAccountServiceImpl.java

@@ -1,23 +0,0 @@
-package com.ym.mec.web.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.web.dal.dao.PlatformCashAccountDao;
-import com.ym.mec.web.dal.entity.PlatformCashAccount;
-import com.ym.mec.web.service.PlatformCashAccountService;
-
-@Service
-public class PlatformCashAccountServiceImpl extends BaseServiceImpl<String, PlatformCashAccount>  implements PlatformCashAccountService {
-	
-	@Autowired
-	private PlatformCashAccountDao platformCashAccountDao;
-
-	@Override
-	public BaseDAO<String, PlatformCashAccount> getDAO() {
-		return platformCashAccountDao;
-	}
-	
-}

mec-web/src/main/resources/config/mybatis/ClassGroupRelationMapper.xml

@@ -32,7 +32,7 @@
         </selectKey>
         -->
         INSERT INTO class_group_relation (id_,class_group_id_,sub_class_group_id_,create_time_)
-        VALUES(#{id},#{classGroupId},#{subClassGroupId},#{createTime})
+        VALUES(#{id},#{classGroupId},#{subClassGroupId},now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->

mec-web/src/main/resources/config/mybatis/MusicGroupSubjectGoodsGroupMapper.xml

@@ -7,7 +7,7 @@
 		id="MusicGroupSubjectGoodsGroup">
 		<result column="id_" property="id" />
 		<result column="name_" property="name" />
-		<result column="type_" property="type" />
+		<result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="music_group_id_" property="musicGroupId" />
 		<result column="subject_id_" property="subjectId" />
 		<result column="goods_id_list_" property="goodsIdList" />
@@ -34,13 +34,13 @@
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_subject_goods_group
 		(id_,name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_)
-		VALUES(#{id},#{name},#{type},#{musicGroupId},#{subjectId},#{goodsIdList},NOW(),NOW(),#{price})
+		VALUES(#{id},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{subjectId},#{goodsIdList},NOW(),NOW(),#{price})
 	</insert>
 
     <insert id="batchInsert" parameterType="java.util.List">
 		INSERT INTO music_group_subject_goods_group (id_,name_,type_,music_group_id_,subject_id_,goods_id_list_,create_time_,update_time_,price_) VALUES
 		<foreach collection="mappers" item="item" index="index" separator=",">
-			VALUES(#{item.id},#{item.name},#{item.type},#{item.musicGroupId},#{item.subjectId},#{item.goodsIdList},NOW(),NOW(),#{item.price})
+			VALUES(#{item.id},#{item.name},#{item.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.musicGroupId},#{item.subjectId},#{item.goodsIdList},NOW(),NOW(),#{item.price})
 		</foreach>
 	</insert>
 
@@ -62,7 +62,7 @@
 				update_time_ = #{updateTime},
 			</if>
 			<if test="type != null">
-				type_ = #{type},
+				type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="musicGroupId != null">
 				music_group_id_ = #{musicGroupId},

mec-web/src/main/resources/config/mybatis/PlatformCashAccountDetailMapper.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.web.dal.dao.PlatformCashAccountDetailDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.PlatformCashAccountDetail" id="PlatformCashAccountDetail">
-        <result column="id_" property="id"/>
-        <result column="platform_cash_account_id_" property="platformCashAccountId"/>
-        <result column="trans_no_" property="transNo"/>
-        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="amount_" property="amount"/>
-        <result column="balance_" property="balance"/>
-        <result column="description_" property="description"/>
-        <result column="comment_" property="comment"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time_" property="updateTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="PlatformCashAccountDetail">
-		SELECT * FROM platform_cash_account_detail WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="PlatformCashAccountDetail">
-		SELECT * FROM platform_cash_account_detail ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccountDetail" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO platform_cash_account_detail
-        (id_,platform_cash_account_id_,trans_no_,type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_)
-        VALUES(#{id},#{platformCashAccountId},#{transNo},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{balance},#{description},#{comment},now(),now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccountDetail">
-        UPDATE platform_cash_account_detail
-        <set>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="balance != null">
-                balance_ = #{balance},
-            </if>
-            <if test="comment != null">
-                comment_ = #{comment},
-            </if>
-            <if test="updateTime != null">
-                update_time_ = #{updateTime},
-            </if>
-            <if test="amount != null">
-                amount_ = #{amount},
-            </if>
-            <if test="platformCashAccountId != null">
-                platform_cash_account_id_ = #{platformCashAccountId},
-            </if>
-            <if test="description != null">
-                description_ = #{description},
-            </if>
-            <if test="transNo != null">
-                trans_no_ = #{transNo},
-            </if>
-            <if test="type != null">
-                type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM platform_cash_account_detail WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="PlatformCashAccountDetail" parameterType="map">
-        SELECT * FROM platform_cash_account_detail ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM platform_cash_account_detail
-	</select>
-</mapper>

mec-web/src/main/resources/config/mybatis/PlatformCashAccountMapper.xml

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.web.dal.dao.PlatformCashAccountDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.PlatformCashAccount" id="PlatformCashAccount">
-        <result column="id_" property="id"/>
-        <result column="currency_" property="currency"/>
-        <result column="balance_" property="balance"/>
-        <result column="frozen_amount_" property="frozenAmount"/>
-        <result column="margin_balance_" property="marginBalance"/>
-        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="create_time_" property="createTime"/>
-        <result column="update_time" property="updateTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="PlatformCashAccount">
-		SELECT * FROM platform_cash_account WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="PlatformCashAccount">
-		SELECT * FROM platform_cash_account ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccount" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO platform_cash_account
-        (id_,currency_,balance_,frozen_amount_,margin_balance_,status_,create_time_,update_time)
-        VALUES(#{id},#{currency},#{balance},#{frozenAmount},#{marginBalance},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now())
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.PlatformCashAccount">
-        UPDATE platform_cash_account
-        <set>
-            <if test="status != null">
-                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
-            <if test="updateTime != null">
-                update_time = #{updateTime},
-            </if>
-            <if test="frozenAmount != null">
-                frozen_amount_ = #{frozenAmount},
-            </if>
-            <if test="balance != null">
-                balance_ = #{balance},
-            </if>
-            <if test="marginBalance != null">
-                margin_balance_ = #{marginBalance},
-            </if>
-            <if test="currency != null">
-                currency_ = #{currency},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM platform_cash_account WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="PlatformCashAccount" parameterType="map">
-        SELECT * FROM platform_cash_account ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM platform_cash_account
-	</select>
-</mapper>

mec-web/src/main/resources/config/mybatis/StudentPaymentOrderDetailMapper.xml

@@ -5,76 +5,76 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.StudentPaymentOrderDetailDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.StudentPaymentOrderDetail" id="StudentPaymentOrderDetail">
-		<result column="id_" property="id" />
-		<result column="type_" property="type" />
-		<result column="goods_id_list_" property="goodsIdList" />
-		<result column="price_" property="price" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="payment_order_id_" property="paymentOrderId" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="StudentPaymentOrderDetail" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.StudentPaymentOrderDetail" id="StudentPaymentOrderDetail">
+        <result column="id_" property="id"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="goods_id_list_" property="goodsIdList"/>
+        <result column="price_" property="price"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="payment_order_id_" property="paymentOrderId"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="StudentPaymentOrderDetail">
 		SELECT * FROM student_payment_order_detail WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="StudentPaymentOrderDetail">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="StudentPaymentOrderDetail">
 		SELECT * FROM student_payment_order_detail ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrderDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO student_payment_order_detail (id_,type_,goods_id_list_,price_,create_time_,update_time_,payment_order_id_) VALUES(#{id},#{type},#{goodsIdList},#{price},#{createTime},#{updateTime},#{paymentOrderId})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrderDetail">
-		UPDATE student_payment_order_detail <set>
-<if test="price != null">
-price_ = #{price},
-</if>
-<if test="goodsIdList != null">
-goods_id_list_ = #{goodsIdList},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="paymentOrderId != null">
-payment_order_id_ = #{paymentOrderId},
-</if>
-<if test="type != null">
-type_ = #{type},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrderDetail" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO student_payment_order_detail
+        (id_,type_,goods_id_list_,price_,create_time_,update_time_,payment_order_id_)
+        VALUES(#{id},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{goodsIdList},#{price},now(),now(),#{paymentOrderId})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrderDetail">
+        UPDATE student_payment_order_detail
+        <set>
+            <if test="price != null">
+                price_ = #{price},
+            </if>
+            <if test="goodsIdList != null">
+                goods_id_list_ = #{goodsIdList},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="paymentOrderId != null">
+                payment_order_id_ = #{paymentOrderId},
+            </if>
+            <if test="type != null">
+                type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM student_payment_order_detail WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="StudentPaymentOrderDetail" parameterType="map">
-		SELECT * FROM student_payment_order_detail ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="StudentPaymentOrderDetail" parameterType="map">
+        SELECT * FROM student_payment_order_detail ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM student_payment_order_detail
 	</select>
 </mapper>

mec-web/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -5,112 +5,112 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.StudentPaymentOrderDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.StudentPaymentOrder" id="StudentPaymentOrder">
-		<result column="id_" property="id" />
-		<result column="user_id_" property="userId" />
-		<result column="type_" property="type" />
-		<result column="expect_amount_" property="expectAmount" />
-		<result column="actual_amount_" property="actualAmount" />
-		<result column="trans_no_" property="transNo" />
-		<result column="status_" property="status" />
-		<result column="memo_" property="memo" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="payment_channel_" property="paymentChannel" />
-		<result column="payment_business_channel_" property="paymentBusinessChannel" />
-		<result column="payment_account_no_" property="paymentAccountNo" />
-		<result column="order_no_" property="orderNo" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="class_group_id_" property="classGroupId" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="StudentPaymentOrder" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.StudentPaymentOrder" id="StudentPaymentOrder">
+        <result column="id_" property="id"/>
+        <result column="user_id_" property="userId"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="expect_amount_" property="expectAmount"/>
+        <result column="actual_amount_" property="actualAmount"/>
+        <result column="trans_no_" property="transNo"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="memo_" property="memo"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="payment_channel_" property="paymentChannel"/>
+        <result column="payment_business_channel_" property="paymentBusinessChannel"/>
+        <result column="payment_account_no_" property="paymentAccountNo"/>
+        <result column="order_no_" property="orderNo"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="class_group_id_" property="classGroupId"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="StudentPaymentOrder">
 		SELECT * FROM student_payment_order WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="StudentPaymentOrder">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="StudentPaymentOrder">
 		SELECT * FROM student_payment_order ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrder" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO student_payment_order (id_,user_id_,type_,expect_amount_,actual_amount_,trans_no_,status_,memo_,create_time_,update_time_,payment_channel_,payment_business_channel_,payment_account_no_,order_no_,music_group_id_,class_group_id_) VALUES(#{id},#{userId},#{type},#{expectAmount},#{actualAmount},#{transNo},#{status},#{memo},#{createTime},#{updateTime},#{paymentChannel},#{paymentBusinessChannel},#{paymentAccountNo},#{orderNo},#{musicGroupId},#{classGroupId})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrder">
-		UPDATE student_payment_order <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="orderNo != null">
-order_no_ = #{orderNo},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="classGroupId != null">
-class_group_id_ = #{classGroupId},
-</if>
-<if test="expectAmount != null">
-expect_amount_ = #{expectAmount},
-</if>
-<if test="memo != null">
-memo_ = #{memo},
-</if>
-<if test="paymentChannel != null">
-payment_channel_ = #{paymentChannel},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="paymentAccountNo != null">
-payment_account_no_ = #{paymentAccountNo},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="paymentBusinessChannel != null">
-payment_business_channel_ = #{paymentBusinessChannel},
-</if>
-<if test="transNo != null">
-trans_no_ = #{transNo},
-</if>
-<if test="actualAmount != null">
-actual_amount_ = #{actualAmount},
-</if>
-<if test="type != null">
-type_ = #{type},
-</if>
-<if test="musicGroupId != null">
-music_group_id_ = #{musicGroupId},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrder" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO student_payment_order
+        (id_,user_id_,type_,expect_amount_,actual_amount_,trans_no_,status_,memo_,create_time_,update_time_,payment_channel_,payment_business_channel_,payment_account_no_,order_no_,music_group_id_,class_group_id_)
+        VALUES(#{id},#{userId},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{expectAmount},#{actualAmount},#{transNo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{memo},now(),now(),#{paymentChannel},#{paymentBusinessChannel},#{paymentAccountNo},#{orderNo},#{musicGroupId},#{classGroupId})
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.StudentPaymentOrder">
+        UPDATE student_payment_order
+        <set>
+            <if test="status != null">
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="orderNo != null">
+                order_no_ = #{orderNo},
+            </if>
+            <if test="classGroupId != null">
+                class_group_id_ = #{classGroupId},
+            </if>
+            <if test="expectAmount != null">
+                expect_amount_ = #{expectAmount},
+            </if>
+            <if test="memo != null">
+                memo_ = #{memo},
+            </if>
+            <if test="paymentChannel != null">
+                payment_channel_ = #{paymentChannel},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="paymentAccountNo != null">
+                payment_account_no_ = #{paymentAccountNo},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="paymentBusinessChannel != null">
+                payment_business_channel_ = #{paymentBusinessChannel},
+            </if>
+            <if test="transNo != null">
+                trans_no_ = #{transNo},
+            </if>
+            <if test="actualAmount != null">
+                actual_amount_ = #{actualAmount},
+            </if>
+            <if test="type != null">
+                type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="musicGroupId != null">
+                music_group_id_ = #{musicGroupId},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM student_payment_order WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="StudentPaymentOrder" parameterType="map">
-		SELECT * FROM student_payment_order ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="StudentPaymentOrder" parameterType="map">
+        SELECT * FROM student_payment_order ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM student_payment_order
 	</select>
 </mapper>

mec-web/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -14,7 +14,7 @@
         <result column="current_class_" property="currentClass"/>
         <result column="subject_id_" property="subjectId"/>
         <result column="is_allow_adjust_" property="isAllowAdjust" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="kit_purchase_method_" property="kitPurchaseMethod"/>
+        <result column="kit_purchase_method_" property="kitPurchaseMethod" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="remark_" property="remark"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -46,7 +46,8 @@
         -->
         INSERT INTO student_registration
         (parents_phone_,id_,user_id_,music_group_id_,current_grade_,current_class_,subject_id_,is_allow_adjust_,kit_purchase_method_,remark_,create_time_,update_time_,parents_name_,parents_company_,payment_status_,last_payment_date_,next_payment_date_)
-        VALUES(#{parentsPhone},#{id},#{userId},#{musicGroupId},#{currentGrade},#{currentClass},#{subjectId},#{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{kitPurchaseMethod},#{remark},#{createTime},#{updateTime},#{parentsName},#{parentsCompany},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{lastPaymentDate},#{nextPaymentDate})
+        VALUES(#{parentsPhone},#{id},#{userId},#{musicGroupId},#{currentGrade},#{currentClass},#{subjectId},#{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{kitPurchaseMethod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        #{remark},now(),now(),#{parentsName},#{parentsCompany},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{lastPaymentDate},#{nextPaymentDate})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -75,7 +76,7 @@
                 is_allow_adjust_ = #{isAllowAdjust,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="kitPurchaseMethod != null">
-                kit_purchase_method_ = #{kitPurchaseMethod},
+                kit_purchase_method_ = #{kitPurchaseMethod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="userId != null">
                 user_id_ = #{userId},

mec-web/src/main/resources/config/mybatis/SubjectGoodsMapperMapper.xml

@@ -35,7 +35,7 @@
         </selectKey>
         -->
         INSERT INTO subject_plan_goods_mapper (id_,organ_id_,subject_id_,goods_id_,type_,create_time_,update_time_)
-        VALUES(#{id},#{organId},#{subjectId},#{goodsId},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{createTime},#{updateTime})
+        VALUES(#{id},#{organId},#{subjectId},#{goodsId},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->

mec-web/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -35,7 +35,7 @@
         </selectKey>
         -->
         INSERT INTO subject (id_,name_,code_,parent_subject_id_,create_time_,update_time_,del_flag_)
-        VALUES(#{id},#{name},#{code},#{parentSubjectId},#{createTime},#{updateTime},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+        VALUES(#{id},#{name},#{code},#{parentSubjectId},now(),now(),#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
 
     <!-- 根据主键查询一条记录 -->

mec-web/src/main/resources/config/mybatis/SysUserCashAccountDetailMapper.xml

@@ -5,92 +5,92 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.SysUserCashAccountDetailDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.SysUserCashAccountDetail" id="SysUserCashAccountDetail">
-		<result column="id_" property="id" />
-		<result column="user_id_" property="userId" />
-		<result column="trans_no_" property="transNo" />
-		<result column="type_" property="type" />
-		<result column="status_" property="status" />
-		<result column="amount_" property="amount" />
-		<result column="balance_" property="balance" />
-		<result column="description_" property="description" />
-		<result column="comment_" property="comment" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="SysUserCashAccountDetail" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.SysUserCashAccountDetail" id="SysUserCashAccountDetail">
+        <result column="id_" property="id"/>
+        <result column="user_id_" property="userId"/>
+        <result column="trans_no_" property="transNo"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="amount_" property="amount"/>
+        <result column="balance_" property="balance"/>
+        <result column="description_" property="description"/>
+        <result column="comment_" property="comment"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="SysUserCashAccountDetail">
 		SELECT * FROM sys_user_cash_account_detail WHERE id_ = #{id} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SysUserCashAccountDetail">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="SysUserCashAccountDetail">
 		SELECT * FROM sys_user_cash_account_detail ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccountDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO sys_user_cash_account_detail (id_,user_id_,trans_no_,type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_) VALUES(#{id},#{userId},#{transNo},#{type},#{status},#{amount},#{balance},#{description},#{comment},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccountDetail">
-		UPDATE sys_user_cash_account_detail <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="balance != null">
-balance_ = #{balance},
-</if>
-<if test="comment != null">
-comment_ = #{comment},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="amount != null">
-amount_ = #{amount},
-</if>
-<if test="description != null">
-description_ = #{description},
-</if>
-<if test="transNo != null">
-trans_no_ = #{transNo},
-</if>
-<if test="type != null">
-type_ = #{type},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccountDetail" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO sys_user_cash_account_detail
+        (id_,user_id_,trans_no_,type_,status_,amount_,balance_,description_,comment_,create_time_,update_time_)
+        VALUES(#{id},#{userId},#{transNo},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{amount},#{balance},#{description},#{comment},now(),now())
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccountDetail">
+        UPDATE sys_user_cash_account_detail
+        <set>
+            <if test="status != null">
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="balance != null">
+                balance_ = #{balance},
+            </if>
+            <if test="comment != null">
+                comment_ = #{comment},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+            <if test="amount != null">
+                amount_ = #{amount},
+            </if>
+            <if test="description != null">
+                description_ = #{description},
+            </if>
+            <if test="transNo != null">
+                trans_no_ = #{transNo},
+            </if>
+            <if test="type != null">
+                type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM sys_user_cash_account_detail WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="SysUserCashAccountDetail" parameterType="map">
-		SELECT * FROM sys_user_cash_account_detail ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="SysUserCashAccountDetail" parameterType="map">
+        SELECT * FROM sys_user_cash_account_detail ORDER BY id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_user_cash_account_detail
 	</select>
 </mapper>

mec-web/src/main/resources/config/mybatis/SysUserCashAccountMapper.xml

@@ -5,80 +5,83 @@
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
 <mapper namespace="com.ym.mec.web.dal.dao.SysUserCashAccountDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.SysUserCashAccount" id="SysUserCashAccount">
-		<result column="user_id_" property="userId" />
-		<result column="currency_" property="currency" />
-		<result column="balance_" property="balance" />
-		<result column="frozen_amount_" property="frozenAmount" />
-		<result column="margin_balance_" property="marginBalance" />
-		<result column="status_" property="status" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="SysUserCashAccount" >
+
+    <resultMap type="com.ym.mec.web.dal.entity.SysUserCashAccount" id="SysUserCashAccount">
+        <result column="user_id_" property="userId"/>
+        <result column="currency_" property="currency"/>
+        <result column="balance_" property="balance"/>
+        <result column="frozen_amount_" property="frozenAmount"/>
+        <result column="margin_balance_" property="marginBalance"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="SysUserCashAccount">
 		SELECT * FROM sys_user_cash_account WHERE user_id_ = #{userId} 
 	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SysUserCashAccount">
+
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="SysUserCashAccount">
 		SELECT * FROM sys_user_cash_account ORDER BY user_id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccount" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO sys_user_cash_account (user_id_,currency_,balance_,frozen_amount_,margin_balance_,status_,create_time_,update_time) VALUES(#{userId},#{currency},#{balance},#{frozenAmount},#{marginBalance},#{status},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccount">
-		UPDATE sys_user_cash_account <set>
-<if test="status != null">
-status_ = #{status},
-</if>
-<if test="userId != null">
-user_id_ = #{userId},
-</if>
-<if test="updateTime != null">
-update_time = #{updateTime},
-</if>
-<if test="frozenAmount != null">
-frozen_amount_ = #{frozenAmount},
-</if>
-<if test="balance != null">
-balance_ = #{balance},
-</if>
-<if test="marginBalance != null">
-margin_balance_ = #{marginBalance},
-</if>
-<if test="currency != null">
-currency_ = #{currency},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE user_id_ = #{userId} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
+
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccount" useGeneratedKeys="true"
+            keyColumn="id" keyProperty="id">
+        <!--
+        <selectKey resultClass="int" keyProperty="id" >
+        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
+        </selectKey>
+        -->
+        INSERT INTO sys_user_cash_account
+        (user_id_,currency_,balance_,frozen_amount_,margin_balance_,status_,create_time_,update_time)
+        VALUES(#{userId},#{currency},#{balance},#{frozenAmount},#{marginBalance},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now())
+    </insert>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.web.dal.entity.SysUserCashAccount">
+        UPDATE sys_user_cash_account
+        <set>
+            <if test="status != null">
+                status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime},
+            </if>
+            <if test="frozenAmount != null">
+                frozen_amount_ = #{frozenAmount},
+            </if>
+            <if test="balance != null">
+                balance_ = #{balance},
+            </if>
+            <if test="marginBalance != null">
+                margin_balance_ = #{marginBalance},
+            </if>
+            <if test="currency != null">
+                currency_ = #{currency},
+            </if>
+        </set>
+        WHERE user_id_ = #{userId}
+    </update>
+
+    <!-- 根据主键删除一条记录 -->
+    <delete id="delete">
 		DELETE FROM sys_user_cash_account WHERE user_id_ = #{userId} 
 	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="SysUserCashAccount" parameterType="map">
-		SELECT * FROM sys_user_cash_account ORDER BY user_id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
+
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="SysUserCashAccount" parameterType="map">
+        SELECT * FROM sys_user_cash_account ORDER BY user_id_
+        <include refid="global.limit"/>
+    </select>
+
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM sys_user_cash_account
 	</select>
 </mapper>

mec-web/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -39,7 +39,7 @@
         -->
         INSERT INTO teacher_attendance
         (id_,teacher_id_,music_group_id_,subject_id_,class_group_id_,course_schedule_id_,sign_in_time_,status_,remark_,create_time_)
-        VALUES(#{id},#{teacherId},#{musicGroupId},#{subjectId},#{classGroupId},#{courseScheduleId},#{signInTime},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},#{createTime})
+        VALUES(#{id},#{teacherId},#{musicGroupId},#{subjectId},#{classGroupId},#{courseScheduleId},#{signInTime},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->

mec-web/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -46,7 +46,7 @@
         -->
         INSERT INTO teacher
         (user_id_,organ_id_,job_type_,job_nature_,is_probation_period_,education_background_,graduate_school_,technical_titles_,work_unit_,subject_id_,entry_date_,certificate_type_,certificate_num_,flow_organ_range_,introduction_,update_time_,create_time_)
-        VALUES(#{userId},#{organId},#{jobType},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},#{updateTime},#{createTime})
+        VALUES(#{userId},#{organId},#{jobType},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->