Merge remote-tracking branch 'origin/master'

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

@@ -2,10 +2,34 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.common.enums.BaseEnum;
+
 /**
  * 对应数据库表(sys_tenant_account):
  */
 public class SysTenantAccount {
+	
+	public enum AccountStatus implements BaseEnum<Integer, AccountStatus> {
+		FREEZE(0, "冻结"), NORMAL(1, "正常"), LOGOUT(2, "注销");
+
+		private Integer code;
+
+		private String desc;
+
+		AccountStatus(Integer code, String desc) {
+			this.code = code;
+			this.desc = desc;
+		}
+
+		public String getDesc() {
+			return desc;
+		}
+
+		@Override
+		public Integer getCode() {
+			return this.code;
+		}
+	}
 
 	/**  */
 	private Integer userId;
@@ -17,7 +41,7 @@ public class SysTenantAccount {
 	private Integer frozenMinutes;
 	
 	/** 账户状态(0,冻结,1,正常;-1,注销;) */
-	private Integer status;
+	private AccountStatus status;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -49,11 +73,11 @@ public class SysTenantAccount {
 		return this.frozenMinutes;
 	}
 			
-	public void setStatus(Integer status){
+	public void setStatus(AccountStatus status){
 		this.status = status;
 	}
 	
-	public Integer getStatus(){
+	public AccountStatus getStatus(){
 		return this.status;
 	}
 			

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

@@ -2,132 +2,181 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.common.enums.BaseEnum;
+
 /**
  * 对应数据库表(sys_tenant_account_detail):
  */
 public class SysTenantAccountDetail {
 
+	public enum TransStatus implements BaseEnum<String, DealStatusEnum> {
+		ING("ING", "交易中"), SUCCESS("SUCCESS", "成功交易"), FAILED("FAILED", "交易失败"), CLOSE("CLOSE", "交易关闭");
+
+		private String code;
+
+		private String desc;
+
+		TransStatus(String code, String desc) {
+			this.code = code;
+			this.desc = desc;
+		}
+
+		@Override
+		public String getCode() {
+			return code;
+		}
+
+		public String getDesc() {
+			return desc;
+		}
+
+	}
+	
+	public enum TransType implements BaseEnum<String, TransType> {
+		RECHARGE("RECHARGE", "充值"), CONSUME("CONSUME", "消费");
+
+		private String code;
+
+		private String desc;
+
+		TransType(String code, String desc) {
+			this.code = code;
+			this.desc = desc;
+		}
+
+		@Override
+		public String getCode() {
+			return code;
+		}
+
+		public String getDesc() {
+			return desc;
+		}
+
+	}
+
 	/**  */
 	private Long id;
-	
+
 	/**  */
 	private Integer userId;
-	
+
 	/** 交易类型 */
-	private String transType;
-	
+	private TransType transType;
+
 	/** 交易状态 */
-	private String transStatus;
-	
+	private TransStatus transStatus;
+
 	/** 交易流水 */
 	private String transNo;
-	
+
 	/** 现金数额 */
 	private java.math.BigDecimal transCashAmount;
-	
+
 	/** 账户总可用分钟数 */
 	private Integer totalAvailableMinutes;
-	
+
 	/** 交易的分钟数 */
 	private Integer transMinutes;
-	
+
 	/**  */
 	private String memo;
-	
+
 	/**  */
 	private java.util.Date createTime;
-	
+
 	/**  */
 	private java.util.Date updateTime;
-	
-	public void setId(Long id){
+
+	public void setId(Long id) {
 		this.id = id;
 	}
-	
-	public Long getId(){
+
+	public Long getId() {
 		return this.id;
 	}
-			
-	public void setUserId(Integer userId){
+
+	public void setUserId(Integer userId) {
 		this.userId = userId;
 	}
-	
-	public Integer getUserId(){
+
+	public Integer getUserId() {
 		return this.userId;
 	}
-			
-	public void setTransType(String transType){
+
+	public void setTransType(TransType transType) {
 		this.transType = transType;
 	}
-	
-	public String getTransType(){
+
+	public TransType getTransType() {
 		return this.transType;
 	}
-			
-	public void setTransStatus(String transStatus){
+
+	public void setTransStatus(TransStatus transStatus) {
 		this.transStatus = transStatus;
 	}
-	
-	public String getTransStatus(){
+
+	public TransStatus getTransStatus() {
 		return this.transStatus;
 	}
-			
-	public void setTransNo(String transNo){
+
+	public void setTransNo(String transNo) {
 		this.transNo = transNo;
 	}
-	
-	public String getTransNo(){
+
+	public String getTransNo() {
 		return this.transNo;
 	}
-			
-	public void setTransCashAmount(java.math.BigDecimal transCashAmount){
+
+	public void setTransCashAmount(java.math.BigDecimal transCashAmount) {
 		this.transCashAmount = transCashAmount;
 	}
-	
-	public java.math.BigDecimal getTransCashAmount(){
+
+	public java.math.BigDecimal getTransCashAmount() {
 		return this.transCashAmount;
 	}
-			
-	public void setTotalAvailableMinutes(Integer totalAvailableMinutes){
+
+	public void setTotalAvailableMinutes(Integer totalAvailableMinutes) {
 		this.totalAvailableMinutes = totalAvailableMinutes;
 	}
-	
-	public Integer getTotalAvailableMinutes(){
+
+	public Integer getTotalAvailableMinutes() {
 		return this.totalAvailableMinutes;
 	}
-			
-	public void setTransMinutes(Integer transMinutes){
+
+	public void setTransMinutes(Integer transMinutes) {
 		this.transMinutes = transMinutes;
 	}
-	
-	public Integer getTransMinutes(){
+
+	public Integer getTransMinutes() {
 		return this.transMinutes;
 	}
-			
-	public void setMemo(String memo){
+
+	public void setMemo(String memo) {
 		this.memo = memo;
 	}
-	
-	public String getMemo(){
+
+	public String getMemo() {
 		return this.memo;
 	}
-			
-	public void setCreateTime(java.util.Date createTime){
+
+	public void setCreateTime(java.util.Date createTime) {
 		this.createTime = createTime;
 	}
-	
-	public java.util.Date getCreateTime(){
+
+	public java.util.Date getCreateTime() {
 		return this.createTime;
 	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
+
+	public void setUpdateTime(java.util.Date updateTime) {
 		this.updateTime = updateTime;
 	}
-	
-	public java.util.Date getUpdateTime(){
+
+	public java.util.Date getUpdateTime() {
 		return this.updateTime;
 	}
-			
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TenantAccountDetailQueryInfo.java

@@ -0,0 +1,38 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.biz.dal.entity.SysTenantAccountDetail.TransStatus;
+import com.ym.mec.biz.dal.entity.SysTenantAccountDetail.TransType;
+import com.ym.mec.common.page.QueryInfo;
+
+public class TenantAccountDetailQueryInfo extends QueryInfo {
+
+	private TransType transType;
+
+	private TransStatus transStatus;
+
+	private Integer userId;
+
+	public TransType getTransType() {
+		return transType;
+	}
+
+	public void setTransType(TransType transType) {
+		this.transType = transType;
+	}
+
+	public TransStatus getTransStatus() {
+		return transStatus;
+	}
+
+	public void setTransStatus(TransStatus transStatus) {
+		this.transStatus = transStatus;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+}

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

@@ -7,8 +7,8 @@
 		id="SysTenantAccountDetail">
 		<result column="id_" property="id" />
 		<result column="user_id_" property="userId" />
-		<result column="trans_type_" property="transType" />
-		<result column="trans_status_" property="transStatus" />
+		<result column="trans_type_" property="transType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+		<result column="trans_status_" property="transStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
 		<result column="trans_no_" property="transNo" />
 		<result column="trans_cash_amount_" property="transCashAmount" />
 		<result column="total_available_minutes_" property="totalAvailableMinutes" />
@@ -17,17 +17,29 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
+	
+	<sql id="queryCondition">
+		<where>
+			<if test="transType != null">
+				and trans_type_ = #{transType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			</if>
+			<if test="transStatus != null">
+				and trans_status_ = #{transStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			</if>
+			<if test="userId != null">
+				and user_id_ = #{userId}
+			</if>
+		</where>
+	</sql>
 
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysTenantAccountDetail">
-		SELECT *
-		FROM sys_tenant_account_detail WHERE id_ = #{id}
+		SELECT * FROM sys_tenant_account_detail WHERE id_ = #{id}
 	</select>
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="SysTenantAccountDetail">
-		SELECT * FROM
-		sys_tenant_account_detail ORDER BY id_
+		SELECT * FROM sys_tenant_account_detail ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -37,7 +49,7 @@
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO sys_tenant_account_detail
 		(id_,user_id_,trans_type_,trans_status_,trans_no_,trans_cash_amount_,total_available_minutes_,trans_minutes_,memo_,create_time_,update_time_)
-		VALUES(#{id},#{userId},#{transType},#{transStatus},#{transNo},#{transCashAmount},#{totalAvailableMinutes},#{transMinutes},#{memo},#{createTime},#{updateTime})
+		VALUES(#{id},#{userId},#{transType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{transNo},#{transCashAmount},#{totalAvailableMinutes},#{transMinutes},#{memo},#{createTime},#{updateTime})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -57,7 +69,7 @@
 				total_available_minutes_ = #{totalAvailableMinutes},
 			</if>
 			<if test="transType != null">
-				trans_type_ = #{transType},
+				trans_type_ = #{transType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="updateTime != null">
 				update_time_ = #{updateTime},
@@ -66,7 +78,7 @@
 				memo_ = #{memo},
 			</if>
 			<if test="transStatus != null">
-				trans_status_ = #{transStatus},
+				trans_status_ = #{transStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 			</if>
 			<if test="transNo != null">
 				trans_no_ = #{transNo},
@@ -83,20 +95,20 @@
 
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete">
-		DELETE FROM sys_tenant_account_detail WHERE
-		id_ = #{id}
+		DELETE FROM sys_tenant_account_detail WHERE id_ = #{id}
 	</delete>
 
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="SysTenantAccountDetail"
-		parameterType="map">
-		SELECT * FROM sys_tenant_account_detail ORDER BY id_
+	<select id="queryPage" resultMap="SysTenantAccountDetail" parameterType="map">
+		SELECT * FROM sys_tenant_account_detail
+		<include refid="queryCondition" />
+		order by id_ desc
 		<include refid="global.limit" />
 	</select>
 
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM
-		sys_tenant_account_detail
+		SELECT COUNT(*) FROM sys_tenant_account_detail
+		<include refid="queryCondition" />
 	</select>
 </mapper>

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

@@ -8,7 +8,7 @@
 		<result column="user_id_" property="userId" />
 		<result column="available_minutes_" property="availableMinutes" />
 		<result column="frozen_minutes_" property="frozenMinutes" />
-		<result column="status_" property="status" />
+		<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>
@@ -26,7 +26,7 @@
 			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO sys_tenant_account
 		(user_id_,available_minutes_,frozen_minutes_,status_,create_time_,update_time_)
-		VALUES(#{userId},#{availableMinutes},#{frozenMinutes},#{status},#{createTime},#{updateTime})
+		VALUES(#{userId},#{availableMinutes},#{frozenMinutes},#{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{createTime},#{updateTime})
 	</insert>
 
 

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysTenantAccountController.java

@@ -0,0 +1,56 @@
+package com.ym.mec.teacher.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.page.TenantAccountDetailQueryInfo;
+import com.ym.mec.biz.service.SysTenantAccountDetailService;
+import com.ym.mec.biz.service.SysTenantAccountService;
+import com.ym.mec.common.controller.BaseController;
+
+@RequestMapping("sysTenantAccount")
+@Api(tags = "租客账户管理")
+@RestController
+public class SysTenantAccountController extends BaseController {
+
+	@Autowired
+	private SysTenantAccountService sysTenantAccountService;
+
+	@Autowired
+	private SysTenantAccountDetailService sysTenantAccountDetailService;
+
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@ApiOperation(value = "获取账户信息")
+	@GetMapping("/get")
+	public Object get() {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+
+		return succeed(sysTenantAccountService.get(sysUser.getId()));
+	}
+
+	@ApiOperation(value = "获取账户明细")
+	@GetMapping("/queryTenantAccountDetail")
+	public Object queryTenantAccountDetail(TenantAccountDetailQueryInfo queryInfo) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		queryInfo.setUserId(sysUser.getId());
+
+		return succeed(sysTenantAccountService.queryPage(queryInfo));
+	}
+
+}