update

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

@@ -1,15 +1,13 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.common.enums.BaseEnum;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import com.ym.mec.common.enums.BaseEnum;
-
 /**
  * 对应数据库表(music_group_payment_calender):
  */
@@ -102,14 +100,22 @@ public class MusicGroupPaymentCalender {
 	@ApiModelProperty(value = "缴费类型0续费,1报名", required = false)
 	private PaymentType paymentType;
 
+	@ApiModelProperty(value = "状态", required = false)
 	private PaymentCalenderStatusEnum status;
 
 	private Integer expectNum;
 
 	private Integer actualNum;
 
+	@ApiModelProperty(value = "创建人", required = false)
+	private Integer operator;
+
+	@ApiModelProperty(value = "备注", required = false)
 	private String memo;
 
+	@ApiModelProperty(value = "审核意见", required = false)
+	private String auditMemo;
+
 	private Boolean isGiveMusicNetwork;
 	
 	private String rejectReason;
@@ -122,10 +128,26 @@ public class MusicGroupPaymentCalender {
 
 	private List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList = new ArrayList<MusicGroupPaymentCalenderCourseSettings>();
 
+	@ApiModelProperty(value = "批次号", required = false)
 	private String batchNo;
 
 	private List<MusicGroupPaymentCalenderCourseSettings> MusicGroupPaymentCalenderCourseSettingsList = new ArrayList<MusicGroupPaymentCalenderCourseSettings>();
 
+	public String getAuditMemo() {
+		return auditMemo;
+	}
+
+	public void setAuditMemo(String auditMemo) {
+		this.auditMemo = auditMemo;
+	}
+
+	public Integer getOperator() {
+		return operator;
+	}
+
+	public void setOperator(Integer operator) {
+		this.operator = operator;
+	}
 
 	public PaymentType getPaymentType() {
 		return paymentType;

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupPaymentCalenderService.java

@@ -88,4 +88,26 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	 * @return com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDetailDto
 	 */
 	MusicGroupPaymentCalenderAuditDetailDto auditListDetail(Integer calenderId,String musicGroupId);
+
+	/**
+	 * @describe 审核通过
+	 * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+	 * @author zouxuan
+	 * @date 2020/10/30
+	 * @time 17:39
+	 * @param calenderId:
+	 * @return void
+	 */
+	void auditPass(Long calenderId,String auditMemo);
+
+	/**
+	 * @describe 审核拒绝
+	 * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+	 * @author zouxuan
+	 * @date 2020/10/30
+	 * @time 17:39
+	 * @param calenderId:
+	 * @return void
+	 */
+	void auditRefuse(Long calenderId,String auditMemo);
 }

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

@@ -5,6 +5,8 @@ import java.util.*;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDetailDto;
 import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderAuditDto;
 import com.ym.mec.biz.dal.dto.SimpleUserDto;
@@ -72,6 +74,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	private SysConfigDao sysConfigDao;
 	@Autowired
 	private SysMessageService sysMessageService;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	@Override
 	public BaseDAO<Long, MusicGroupPaymentCalender> getDAO() {
@@ -89,13 +93,15 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		if(musicGroup == null){
 			throw new BizException("乐团查询失败，请检查参数");
 		}
-
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if(sysUser == null){
+			throw new BizException("请登录");
+		}
 		Date date = new Date();
-		Map<Integer, String> pushUserMap = new HashMap<Integer, String>();
+		Map<Integer, String> pushUserMap = new HashMap<>();
 		MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = null;
-		List<MusicGroupPaymentCalenderDetail> musicGroupPaymentCalenderDetailList = new ArrayList<MusicGroupPaymentCalenderDetail>();
-		
-
+		List<MusicGroupPaymentCalenderDetail> musicGroupPaymentCalenderDetailList = new ArrayList<>();
+		musicGroupPaymentCalender.setOperator(sysUser.getId());
 		musicGroupPaymentCalender.setCreateTime(date);
 		musicGroupPaymentCalender.setUpdateTime(date);
 		
@@ -111,7 +117,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		//获取设置的课程
 		List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList = musicGroupPaymentCalender.getMusicGroupPaymentCalenderCourseSettingsList();
 		if(musicGroupPaymentCalenderCourseSettingsList == null){
-			musicGroupPaymentCalenderCourseSettingsList = new ArrayList<MusicGroupPaymentCalenderCourseSettings>();
+			musicGroupPaymentCalenderCourseSettingsList = new ArrayList<>();
 		}
 		
 		//查询默认课程费用
@@ -422,6 +428,42 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
+	public void auditPass(Long calenderId,String auditMemo) {
+		MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderDao.get(calenderId);
+		Date date = new Date();
+		//如果是报名项目，将乐团改为审核中，缴费项目修改状态，审核状态改为审核通过
+		if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {
+			musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OVER);
+		} else if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
+			musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
+		} else {
+			musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.NO);
+		}
+		//如果是报名，需要修改乐团状态
+		if (musicGroupPaymentCalender.getPaymentType() == MusicGroupPaymentCalender.PaymentType.MUSIC_COURSE) {
+			MusicGroup musicGroup = musicGroupDao.get(musicGroupPaymentCalender.getMusicGroupId());
+			musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
+			musicGroup.setUpdateTime(date);
+			musicGroupDao.update(musicGroup);
+		}
+		musicGroupPaymentCalender.setAuditMemo(auditMemo);
+		musicGroupPaymentCalender.setUpdateTime(date);
+		musicGroupPaymentCalenderDao.update(musicGroupPaymentCalender);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void auditRefuse(Long calenderId,String auditMemo) {
+		MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderDao.get(calenderId);
+		Date date = new Date();
+		musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.AUDITING);
+		musicGroupPaymentCalender.setUpdateTime(date);
+		musicGroupPaymentCalender.setAuditMemo(auditMemo);
+		musicGroupPaymentCalenderDao.update(musicGroupPaymentCalender);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public boolean autoUpdateMusicGroupPaymentCalenderStatus() {
 		// 获取当天创建且未缴费的数据，并推送
 		List<MusicGroupPaymentCalenderDetail> details = musicGroupPaymentCalenderDetailDao.queryNoPaymentCanPushList();

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

@@ -17,6 +17,7 @@
         <result column="expect_num_" property="expectNum"/>
         <result column="actual_num_" property="actualNum"/>
         <result column="memo_" property="memo"/>
+        <result column="audit_memo_" property="auditMemo"/>
         <result column="reject_reason_" property="rejectReason"/>
         <result column="is_give_music_network_" property="isGiveMusicNetwork"/>
         <result column="create_time_" property="createTime"/>
@@ -43,22 +44,25 @@
             keyColumn="id_" keyProperty="id">
         INSERT INTO music_group_payment_calender
         (music_group_id_,music_group_organization_course_settings_id_,pay_user_type_,reject_reason_,start_payment_date_,deadline_payment_date_,status_,expect_num_,
-        actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_,payment_type_,batch_no_)
-        VALUES(#{musicGroupId},#{musicGroupOrganizationCourseSettingId},#{payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{rejectReason},#{startPaymentDate},#{deadlinePaymentDate},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_,payment_type_,batch_no_,audit_memo_)
+        VALUES(#{musicGroupId},#{musicGroupOrganizationCourseSettingId},#{payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        #{rejectReason},#{startPaymentDate},#{deadlinePaymentDate},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{expectNum},#{actualNum},#{memo},#{isGiveMusicNetwork},now(),now(),
-        #{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{batchNo})
+        #{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{batchNo},#{auditMemo})
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender" useGeneratedKeys="true"
             keyColumn="id_" keyProperty="id">
         INSERT INTO music_group_payment_calender
         (music_group_id_,music_group_organization_course_settings_id_,pay_user_type_,reject_reason_,start_payment_date_,deadline_payment_date_,status_,expect_num_,
-        actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_,payment_type_,batch_no_)
+        actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_,
+        payment_type_,batch_no_,audit_memo_)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
         (#{item.musicGroupId},#{item.musicGroupOrganizationCourseSettingId},#{item.payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.rejectReason},#{item.startPaymentDate},#{item.deadlinePaymentDate},#{item.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{item.expectNum},#{item.actualNum},#{item.memo},#{item.isGiveMusicNetwork},now(),now(),
-        #{item.paymentValidStartDate},#{item.paymentValidEndDate},#{item.paymentPattern},#{item.paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.batchNo})
+        #{item.paymentValidStartDate},#{item.paymentValidEndDate},#{item.paymentPattern},#{item.paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        #{item.batchNo},#{item.auditMemo})
         </foreach>
     </insert>
 
@@ -66,6 +70,9 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender">
         UPDATE music_group_payment_calender
         <set>
+            <if test="auditMemo != null and auditMemo != ''">
+                audit_memo_ = #{auditMemo},
+            </if>
             <if test="paymentType != null">
                 payment_type_ = #{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
@@ -123,6 +130,9 @@
 	    <foreach collection="list" item="item" index="index" open="" close="" separator=";">
 	        UPDATE music_group_payment_calender
 	        <set>
+                <if test="item.auditMemo != null and item.auditMemo != ''">
+                    audit_memo_ = #{auditMemo},
+                </if>
                 <if test="item.paymentPattern != null">
                     payment_pattern_ = #{item.paymentPattern},
                 </if>

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

@@ -1,23 +1,15 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.common.page.PageInfo;
-import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.biz.dal.page.MusicGroupPaymentCalenderQueryInfo;
+import com.ym.mec.biz.service.MusicGroupPaymentCalenderService;
+import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
-import com.ym.mec.biz.dal.page.MusicGroupPaymentCalenderQueryInfo;
-import com.ym.mec.biz.service.MusicGroupPaymentCalenderService;
-import com.ym.mec.common.controller.BaseController;
+import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("musicGroupPaymentCalender")
 @Api(tags = "乐团缴费日历服务")
@@ -79,4 +71,20 @@ public class MusicGroupPaymentCalenderController extends BaseController {
     public Object auditListDetail(Integer calenderId,String musicGroupId) {
         return succeed(musicGroupPaymentCalenderService.auditListDetail(calenderId,musicGroupId));
     }
+
+    @ApiOperation(value = "乐团缴费日历审核通过")
+    @PostMapping("/auditPass")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/auditPass')")
+    public Object auditPass(Long calenderId,String auditMemo) {
+        musicGroupPaymentCalenderService.auditPass(calenderId,auditMemo);
+        return succeed();
+    }
+
+    @ApiOperation(value = "乐团缴费日历审核拒绝")
+    @PostMapping("/auditRefuse")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/auditPass')")
+    public Object auditRefuse(Long calenderId,String auditMemo) {
+        musicGroupPaymentCalenderService.auditRefuse(calenderId,auditMemo);
+        return succeed();
+    }
 }