团练宝审核

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -71,6 +72,15 @@ public class CloudCoachPaymentProgram extends BaseEntity {
 	@ApiModelProperty(value = "状态", required = false)
 	private CloudCoachPaymentProgram.StatusEnum status;
 
+	@ApiModelProperty(value = "审核人", required = false)
+	private Integer audit;
+
+	@ApiModelProperty(value = "审核人", required = false)
+	private String auditName;
+
+	@ApiModelProperty(value = "审核时间", required = false)
+	private Date auditTime;
+
 	public enum StatusEnum implements BaseEnum<String, CloudCoachPaymentProgram.StatusEnum> {
 		AUDITING("审核中"), REJECT("审核拒绝"), OPEN("审核通过");
 
@@ -90,6 +100,30 @@ public class CloudCoachPaymentProgram extends BaseEntity {
 		}
 	}
 
+	public Integer getAudit() {
+		return audit;
+	}
+
+	public void setAudit(Integer audit) {
+		this.audit = audit;
+	}
+
+	public String getAuditName() {
+		return auditName;
+	}
+
+	public void setAuditName(String auditName) {
+		this.auditName = auditName;
+	}
+
+	public Date getAuditTime() {
+		return auditTime;
+	}
+
+	public void setAuditTime(Date auditTime) {
+		this.auditTime = auditTime;
+	}
+
 	public StatusEnum getStatus() {
 		return status;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CloudCoachPaymentProgramServiceImpl.java

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.CloudCoachPaymentProgram;
 import com.ym.mec.biz.dal.entity.CloudTeacherOrder;
@@ -50,6 +52,8 @@ public class CloudCoachPaymentProgramServiceImpl extends BaseServiceImpl<Long, C
 	private SysMessageService sysMessageService;
 	@Autowired
 	private TeacherDao teacherDao;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	@Override
 	public BaseDAO<Long, CloudCoachPaymentProgram> getDAO() {
@@ -164,14 +168,18 @@ public class CloudCoachPaymentProgramServiceImpl extends BaseServiceImpl<Long, C
 		if(status == CloudCoachPaymentProgram.StatusEnum.AUDITING){
 			throw new BizException("审核状态异常");
 		}
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		paymentProgram.setStatus(status);
 		paymentProgram.setMemo(cloudCoachPaymentProgram.getMemo());
-		paymentProgram.setUpdateTime(new Date());
-		cloudCoachPaymentProgramDao.update(cloudCoachPaymentProgram);
+		Date date = new Date();
+		paymentProgram.setUpdateTime(date);
+		paymentProgram.setAuditTime(date);
+		paymentProgram.setAudit(sysUser.getId());
+		cloudCoachPaymentProgramDao.update(paymentProgram);
 		if(status == CloudCoachPaymentProgram.StatusEnum.OPEN){
-			List<Integer> userIds = studentCloudCoachPaymentDetailsDao.findUserByProgramId(cloudCoachPaymentProgram.getId());
-			cloudCoachPaymentProgram.setUserIds(userIds);
-			this.auditPass(cloudCoachPaymentProgram);
+			List<Integer> userIds = studentCloudCoachPaymentDetailsDao.findUserByProgramId(paymentProgram.getId());
+			paymentProgram.setUserIds(userIds);
+			this.auditPass(paymentProgram);
 		}
 	}
 }

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

@@ -22,7 +22,9 @@
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
-		<result column="memo_" property="memo" />
+		<result column="audit_" property="audit" />
+		<result column="audit_name_" property="auditName" />
+		<result column="audit_time_" property="auditTime" />
 		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
 	
@@ -42,7 +44,8 @@
 		payment_user_num_,period_,member_rank_setting_id_,actual_amount_,original_amount_,
 		operator_,create_time_,update_time_,tenant_id_,memo_,status_)
 		VALUES(#{name},#{remark},#{memberNum},#{userNum},#{paymentUserNum},#{period,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{memberRankSettingId},#{actualAmount},#{originalAmount},#{operator},NOW(),NOW(),#{tenantId},#{memo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+		#{memberRankSettingId},#{actualAmount},#{originalAmount},#{operator},
+		NOW(),NOW(),#{tenantId},#{memo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -54,6 +57,12 @@
 		<if test="memo != null">
 			memo_ = #{memo},
 		</if>
+		<if test="audit != null">
+			audit_ = #{audit},
+		</if>
+		<if test="auditTime != null">
+			audit_time_ = #{auditTime},
+		</if>
 		<if test="operator != null">
 			operator_ = #{operator},
 		</if>
@@ -120,8 +129,9 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="CloudCoachPaymentProgram" parameterType="map">
-		SELECT ccpp.*,su.real_name_ operator_name_ FROM cloud_coach_payment_program ccpp
+		SELECT ccpp.*,su.real_name_ operator_name_,su1.real_name_ audit_name_ FROM cloud_coach_payment_program ccpp
 		LEFT JOIN sys_user su ON su.id_ = ccpp.operator_
+		LEFT JOIN sys_user su1 ON su1.id_ = ccpp.audit_
 		<include refid="queryPageSql"/>
 		ORDER BY ccpp.id_ DESC
 		<include refid="global.limit"/>