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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupCalenderRefundPeriodDao.java

@@ -27,4 +27,6 @@ public interface MusicGroupCalenderRefundPeriodDao extends BaseDAO<Integer, Musi
     List<CooperationCalenderRefundDto> queryCoopCalender(Map<String, Object> params);
 
     void deleteByCalenderId(@Param("calenderId") Long calenderId);
+
+    void batchUpdate(@Param("refundPeriods") List<MusicGroupCalenderRefundPeriod> refundPeriods);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CooperationCalenderRefundDto.java

@@ -40,6 +40,17 @@ public class CooperationCalenderRefundDto {
     @ApiModelProperty(value = "回款状态",required = false)
     private String refundStatus;
 
+    @ApiModelProperty(value = "合同",required = false)
+    private String contractUrl;
+
+    public String getContractUrl() {
+        return contractUrl;
+    }
+
+    public void setContractUrl(String contractUrl) {
+        this.contractUrl = contractUrl;
+    }
+
     public Long getCalenderId() {
         return calenderId;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupPaymentBaseCalender.java

@@ -76,6 +76,17 @@ public class MusicGroupPaymentBaseCalender {
 	@ApiModelProperty(value = "合同url", required = false)
 	private String contractUrl;
 
+	@ApiModelProperty(value = "缴费项目名称", required = false)
+	private String name;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
 	public String getContractUrl() {
 		return contractUrl;
 	}

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

@@ -1,7 +1,10 @@
 package com.ym.mec.biz.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(music_group_calender_refund_period):
  */
@@ -10,30 +13,63 @@ public class MusicGroupCalenderRefundPeriod {
 	/**  */
 	private Integer id;
 	
-	/** 分部 */
+	@ApiModelProperty(value = "分部",required = false)
 	private Integer organId;
 	
-	/** 合作单位编号 */
+	@ApiModelProperty(value = "合作单位编号",required = false)
 	private Integer cooperationOrganId;
 	
-	/** 缴费项目编号 */
+	@ApiModelProperty(value = "缴费项目编号",required = false)
 	private Long calenderId;
 	
-	/** 回款时间 */
+	@ApiModelProperty(value = "回款时间",required = false)
 	private java.util.Date refundDate;
 	
-	/** 回款金额 */
+	@ApiModelProperty(value = "回款金额",required = false)
 	private java.math.BigDecimal refundAmount;
+
+	@ApiModelProperty(value = "已回款金额",required = false)
+	private java.math.BigDecimal income = BigDecimal.ZERO;
 	
-	/** 剩余待回款金额 */
+	@ApiModelProperty(value = "剩余待回款金额",required = false)
 	private java.math.BigDecimal subRefundAmount;
+
+	@ApiModelProperty(value = "是否完成回款",required = false)
+	private Boolean refundFlag = false;
+
+	@ApiModelProperty(value = "订单编号",required = false)
+	private String orderNos;
 	
 	/**  */
 	private java.util.Date createTime;
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	public String getOrderNos() {
+		return orderNos;
+	}
+
+	public void setOrderNos(String orderNos) {
+		this.orderNos = orderNos;
+	}
+
+	public BigDecimal getIncome() {
+		return income;
+	}
+
+	public void setIncome(BigDecimal income) {
+		this.income = income;
+	}
+
+	public Boolean getRefundFlag() {
+		return refundFlag;
+	}
+
+	public void setRefundFlag(Boolean refundFlag) {
+		this.refundFlag = refundFlag;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

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

@@ -218,6 +218,17 @@ public class MusicGroupPaymentCalender extends BaseEntity {
 	@ApiModelProperty(value = "合同", required = false)
 	private String contractUrl;
 
+	@ApiModelProperty(value = "缴费项目名称", required = false)
+	private String name;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
 	public String getContractUrl() {
 		return contractUrl;
 	}

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

@@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 
 public class CooperationRefundQueryInfo extends QueryInfo {
 
+    @ApiModelProperty(value = "合作单位编号",required = false)
+    private Integer cooperationId;
+
     @ApiModelProperty(value = "分部",required = false)
     private String organId;
 
@@ -17,6 +20,14 @@ public class CooperationRefundQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "缴费结束时间",required = false)
     private String refundEndDate;
 
+    public Integer getCooperationId() {
+        return cooperationId;
+    }
+
+    public void setCooperationId(Integer cooperationId) {
+        this.cooperationId = cooperationId;
+    }
+
     public Integer getRefundStatus() {
         return refundStatus;
     }

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

@@ -25,4 +25,14 @@ public interface MusicGroupCalenderRefundPeriodService extends BaseService<Integ
     PageInfo<CooperationCalenderRefundDto> queryCoopCalender(CooperationRefundQueryInfo queryInfo);
 
     void deleteByCalenderId(Long id);
+
+    /**
+    * @description: 学校缴费回款
+     * @param calenderId
+     * @param amount
+    * @return void
+    * @author zx
+    * @date 2022/10/19 11:20
+    */
+    Boolean calcRefundAmount(Long calenderId, BigDecimal amount);
 }

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

@@ -495,13 +495,13 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 					result = false;
 				}
 				if(courseMinutes >= detail.getSubCourseMinutes()){
+					courseMinutes = courseMinutes - detail.getSubCourseMinutes();
 					detail.setUsedCourseMinutes(detail.getUsedCourseMinutes() + detail.getSubCourseMinutes());
 					detail.setSubCourseMinutes(0);
 					studentPayment.setOriginalPrice(studentPayment.getOriginalPrice().add(detail.getSubCourseOriginalPrice()));
 					studentPayment.setExpectPrice(studentPayment.getExpectPrice().add(detail.getSubCourseCurrentPrice()));
 					detail.setSubCourseCurrentPrice(BigDecimal.ZERO);
 					detail.setSubCourseOriginalPrice(BigDecimal.ZERO);
-					courseMinutes = courseMinutes - detail.getSubCourseMinutes();
 				}else{
 					detail.setUsedCourseMinutes(detail.getUsedCourseMinutes() + courseDuration);
 					detail.setSubCourseMinutes(detail.getSubCourseMinutes() - courseDuration);
@@ -512,8 +512,8 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 					BigDecimal expectPrice = unitMinuteCurrentPrice.multiply(new BigDecimal(courseMinutes)).setScale(2, BigDecimal.ROUND_DOWN);
 					studentPayment.setOriginalPrice(studentPayment.getOriginalPrice().add(originalPrice));
 					studentPayment.setExpectPrice(studentPayment.getExpectPrice().add(expectPrice));
-					detail.setSubCourseCurrentPrice(detail.getSubCourseOriginalPrice().subtract(originalPrice));
-					detail.setSubCourseOriginalPrice(detail.getSubCourseCurrentPrice().subtract(expectPrice));
+					detail.setSubCourseCurrentPrice(detail.getSubCourseCurrentPrice().subtract(expectPrice));
+					detail.setSubCourseOriginalPrice(detail.getSubCourseOriginalPrice().subtract(originalPrice));
 					courseMinutes = 0;
 				}
 				MusicGroupPaymentCalender calender = calenderMap.get(detail.getMusicGroupPaymentCalenderId()).get(0);

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

@@ -135,4 +135,42 @@ public class MusicGroupCalenderRefundPeriodServiceImpl extends BaseServiceImpl<I
     public void deleteByCalenderId(Long id) {
         musicGroupCalenderRefundPeriodDao.deleteByCalenderId(id);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean calcRefundAmount(Long calenderId, BigDecimal amount) {
+        //获取回款周期
+        List<MusicGroupCalenderRefundPeriod> refundPeriods = musicGroupCalenderRefundPeriodDao.findByCalenderId(calenderId);
+        Date date = new Date();
+        BigDecimal subAmount = amount;
+        for (int i = 0; i < refundPeriods.size(); i++) {
+            MusicGroupCalenderRefundPeriod refundPeriod = refundPeriods.get(i);
+            if(i == refundPeriods.size() - 1 && refundPeriod.getRefundFlag()){
+                refundPeriod.setIncome(refundPeriod.getIncome().add(subAmount));
+                refundPeriod.setUpdateTime(date);
+                break;
+            }
+            if(refundPeriod.getRefundFlag()){
+                continue;
+            }
+            if(subAmount.compareTo(refundPeriod.getSubRefundAmount()) >= 0){
+                if(i == refundPeriods.size() - 1){
+                    refundPeriod.setIncome(refundPeriod.getIncome().add(subAmount));
+                    subAmount = BigDecimal.ZERO;
+                }else {
+                    refundPeriod.setIncome(refundPeriod.getIncome().add(refundPeriod.getSubRefundAmount()));
+                    subAmount = subAmount.subtract(refundPeriod.getSubRefundAmount());
+                }
+                refundPeriod.setSubRefundAmount(BigDecimal.ZERO);
+                refundPeriod.setRefundFlag(true);
+            }else {
+                refundPeriod.setIncome(refundPeriod.getIncome().add(subAmount));
+                refundPeriod.setSubRefundAmount(refundPeriod.getSubRefundAmount().subtract(subAmount));
+                subAmount = BigDecimal.ZERO;
+            }
+            refundPeriod.setUpdateTime(date);
+        }
+        musicGroupCalenderRefundPeriodDao.batchUpdate(refundPeriods);
+        return refundPeriods.get(refundPeriods.size()-1).getRefundFlag();
+    }
 }

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

@@ -351,7 +351,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         musicGroupPaymentCalender.setStatus(status);
         musicGroupPaymentCalender.setOrganId(musicGroup.getOrganId());
 
-        if (musicGroupPaymentCalender.getStatus() != AUDITING && musicGroupPaymentBaseCalender.getPaymentType() != MUSIC_APPLY) {
+        if (musicGroupPaymentCalender.getStatus() != AUDITING && musicGroupPaymentCalender.getPaymentType() != MUSIC_APPLY) {
             if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
                 musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
             } else if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {

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

@@ -13,6 +13,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
+import com.ym.mec.biz.service.MusicGroupCalenderRefundPeriodService;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.util.date.DateUtil;
@@ -71,6 +72,8 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
     private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
     @Autowired
     private MusicGroupPaymentCalenderDetailDao musicGroupPaymentCalenderDetailDao;
+    @Autowired
+    private MusicGroupCalenderRefundPeriodService musicGroupCalenderRefundPeriodService;
 
     @Override
     public BaseDAO<Long, StudentPaymentRouteOrder> getDAO() {
@@ -133,11 +136,6 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
     @Override
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public StudentPaymentRouteOrder addOutOrder(StudentPaymentRouteOrder studentPaymentRouteOrder) {
-//        Map<String, Object> params = new HashMap<>();
-//        params.put("transNo", studentPaymentRouteOrder.getTransNo());
-//        if (studentPaymentRouteOrderDao.queryAuditCount(params) > 0) {
-//            throw new BizException("流水号不能重复");
-//        }
         if (studentPaymentRouteOrder.getCalenderId() != null) {
             MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderDao.getSchoolCalender(studentPaymentRouteOrder.getCalenderId());
             if (musicGroupPaymentCalender == null) {
@@ -307,25 +305,29 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
 
             //根据学校缴费项id，确定缴费状态
             BigDecimal amount = studentPaymentRouteOrderDao.sumAmountByCalenderId(studentPaymentRouteOrder.getCalenderId());
-            List<MusicGroupPaymentCalenderDetail> calenderDetails = musicGroupPaymentCalenderDetailDao.getCalenderDetailWithCalender(studentPaymentRouteOrder.getCalenderId());
-            MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderDao.get(studentPaymentRouteOrder.getCalenderId());
-
-            if (amount.compareTo(musicGroupPaymentCalender.getCurrentTotalAmount()) >= 0) {
-                musicGroupPaymentCalender.setActualNum(musicGroupPaymentCalender.getExpectNum());
-                musicGroupPaymentCalender.setStatus(MusicGroupPaymentCalender.PaymentCalenderStatusEnum.PAID);
-                musicGroupPaymentCalenderDao.update(musicGroupPaymentCalender);
-
-                for (MusicGroupPaymentCalenderDetail calenderDetail : calenderDetails) {
-//                    calenderDetail.setActualAmount(calenderDetail.getExpectAmount().add(calenderDetail.getExpectMemberAmount()));
-                    calenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
-                    calenderDetail.setPayTime(nowDate);
-                    calenderDetail.setUpdateTime(nowDate);
-                }
-                if (calenderDetails.size() > 0) {
-                    musicGroupPaymentCalenderDetailDao.batchUpdate(calenderDetails);
+            //修改学员缴费回款周期
+            Boolean aBoolean = musicGroupCalenderRefundPeriodService.calcRefundAmount(studentPaymentRouteOrder.getCalenderId(), amount);
+
+            //是否已完成回款
+            if(aBoolean){
+                List<MusicGroupPaymentCalenderDetail> calenderDetails = musicGroupPaymentCalenderDetailDao.getCalenderDetailWithCalender(studentPaymentRouteOrder.getCalenderId());
+                MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderDao.get(studentPaymentRouteOrder.getCalenderId());
+
+                if (amount.compareTo(musicGroupPaymentCalender.getCurrentTotalAmount()) >= 0) {
+                    musicGroupPaymentCalender.setActualNum(musicGroupPaymentCalender.getExpectNum());
+                    musicGroupPaymentCalender.setStatus(MusicGroupPaymentCalender.PaymentCalenderStatusEnum.PAID);
+                    musicGroupPaymentCalenderDao.update(musicGroupPaymentCalender);
+
+                    for (MusicGroupPaymentCalenderDetail calenderDetail : calenderDetails) {
+                        calenderDetail.setPaymentStatus(MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED);
+                        calenderDetail.setPayTime(nowDate);
+                        calenderDetail.setUpdateTime(nowDate);
+                    }
+                    if (calenderDetails.size() > 0) {
+                        musicGroupPaymentCalenderDetailDao.batchUpdate(calenderDetails);
+                    }
                 }
             }
-
         }
         return true;
     }

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

@@ -9,14 +9,37 @@
 	<resultMap type="com.ym.mec.biz.dal.entity.MusicGroupCalenderRefundPeriod" id="MusicGroupCalenderRefundPeriod">
 		<result column="id_" property="id" />
 		<result column="organ_id_" property="organId" />
+		<result column="order_nos_" property="orderNos" />
 		<result column="cooperation_organ_id_" property="cooperationOrganId" />
 		<result column="calender_id_" property="calenderId" />
 		<result column="refund_date_" property="refundDate" />
 		<result column="refund_amount_" property="refundAmount" />
+		<result column="income_" property="income" />
 		<result column="sub_refund_amount_" property="subRefundAmount" />
+		<result column="refund_flag_" property="refundFlag" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
+
+	<update id="batchUpdate">
+		<foreach collection="refundPeriods" item="bean" index="index" open="" close="" separator=";">
+			UPDATE music_group_calender_refund_period <set>
+			<if test="bean.orderNos != null and bean.orderNos != ''">
+				order_nos_ = #{bean.orderNos},
+			</if>
+			<if test="bean.subRefundAmount != null">
+				sub_refund_amount_ = #{bean.subRefundAmount},
+			</if>
+			<if test="bean.income != null">
+				income_ = #{bean.income},
+			</if>
+			<if test="bean.refundFlag != null">
+				refund_flag_ = #{bean.refundFlag},
+			</if>
+			update_time_ = #{bean.updateTime}
+		</set> WHERE id_ = #{bean.id}
+		</foreach>
+	</update>
 	<delete id="deleteByCalenderId">
 		DELETE FROM music_group_calender_refund_period WHERE calender_id_ = #{calenderId}
 	</delete>
@@ -29,19 +52,36 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupCalenderRefundPeriod" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_calender_refund_period (organ_id_,cooperation_organ_id_,calender_id_,
-		                                                refund_date_,refund_amount_,sub_refund_amount_,create_time_,update_time_)
-		VALUES(#{organId},#{cooperationOrganId},#{calenderId},#{refundDate},#{refundAmount},#{subRefundAmount},NOW(),NOW())
+		                                                refund_date_,refund_amount_,sub_refund_amount_,income_,refund_flag_,order_nos_,create_time_,update_time_)
+		VALUES(#{organId},#{cooperationOrganId},#{calenderId},#{refundDate},#{refundAmount},#{subRefundAmount},#{income},#{refundFlag},#{orderNos},NOW(),NOW())
 	</insert>
 	<insert id="batchInsert">
 		INSERT INTO music_group_calender_refund_period (organ_id_,cooperation_organ_id_,calender_id_,
-														refund_date_,refund_amount_,sub_refund_amount_,create_time_,update_time_)
+														refund_date_,refund_amount_,sub_refund_amount_,income_,refund_flag_,order_nos_,create_time_,update_time_)
 		VALUES
 		<foreach collection="refundPeriods" separator="," item="bean">
 			(#{bean.organId},#{bean.cooperationOrganId},#{bean.calenderId},#{bean.refundDate},
-			 #{bean.refundAmount},#{bean.subRefundAmount},#{bean.createTime},#{bean.updateTime})
+			 #{bean.refundAmount},#{bean.subRefundAmount},#{bean.income},{bean.refundFlag},{bean.orderNos},#{bean.createTime},#{bean.updateTime})
 		</foreach>
 	</insert>
 
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupCalenderRefundPeriod">
+		UPDATE music_group_calender_refund_period <set>
+		<if test="orderNos != null and orderNos != ''">
+			order_nos_ = #{orderNos},
+		</if>
+		<if test="subRefundAmount != null">
+			sub_refund_amount_ = #{subRefundAmount},
+		</if>
+		<if test="income != null">
+			income_ = #{income},
+		</if>
+		<if test="refundFlag != null">
+			refund_flag_ = #{refundFlag},
+		</if>
+		update_time_ = NOW()
+	</set> WHERE id_ = #{id}
+	</update>
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupCalenderRefundPeriod" parameterType="map">
@@ -99,10 +139,14 @@
 		<result property="prepaidFee" column="prepaidFee"/>
 		<result property="nextRefundDate" column="nextRefundDate"/>
 		<result property="refundStatus" column="refundStatus"/>
+		<result property="contractUrl" column="contract_url_"/>
 	</resultMap>
 	<sql id="queryCoopCalenderSql">
+		<if test="cooperationId != null">
+			AND crp.cooperation_organ_id_ = #{cooperationId}
+		</if>
 		<if test="calenderId != null">
-			AND crp.calender_id_
+			AND crp.calender_id_ = #{calenderId}
 		</if>
 		<if test="refundStartDate != null and refundStartDate != ''">
 			AND crp.refund_date_ BETWEEN #{refundStartDate} AND #{refundEndDate}
@@ -124,7 +168,7 @@
 	<select id="queryCoopCalender" resultMap="CooperationCalenderRefundDto">
 		select crp.calender_id_,mgpc.music_group_id_,mg.name_ music_group_name_,mgpc.batch_no_,mgpc.payment_type_,mgpc.calender_fee_type_,
 			   SUM(crp.refund_amount_) receivable_,SUM(crp.sub_refund_amount_) prepaidFee,
-			   MIN(CASE WHEN crp.refund_flag_ = 0 THEN crp.refund_date_ ELSE NULL END) nextRefundDate
+			   MIN(CASE WHEN crp.refund_flag_ = 0 THEN crp.refund_date_ ELSE NULL END) nextRefundDate,crp.organ_id_,mgpc.contract_url_
 		from music_group_calender_refund_period crp
 				 left join music_group_payment_calender mgpc ON mgpc.id_ = crp.calender_id_
 				 left join music_group mg ON mg.id_ = mgpc.music_group_id_

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

@@ -11,6 +11,7 @@
         <result column="music_group_id_" property="musicGroupId"/>
         <result column="tenant_id_" property="tenantId"/>
         <result column="organ_id_" property="organId"/>
+        <result column="name_" property="name"/>
         <result column="music_group_organization_course_settings_id_" property="musicGroupOrganizationCourseSettingId"/>
         <result column="pay_user_type_" property="payUserType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="start_payment_date_" property="startPaymentDate"/>
@@ -60,13 +61,13 @@
     <insert id="insert" 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_,
+        (name_,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_,payment_amount_,batch_no_,audit_memo_,operator_,attribute1_,
          attribute2_,student_ids_,member_payment_amount_,member_rank_setting_id_,member_valid_date_
          ,original_member_payment_amount_,current_total_amount_,original_total_amount_,tenant_id_,organ_id_,
          cloud_teacher_payment_flag_,payment_item_show_state_,is_show_sale_price_,calender_fee_type_,calender_fee_json_,contract_url_)
-        VALUES(#{musicGroupId},#{musicGroupOrganizationCourseSettingId},#{payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        VALUES(#{name},#{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},
@@ -81,6 +82,9 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender">
         UPDATE music_group_payment_calender
         <set>
+            <if test="name != null and name != ''">
+                name_ = #{name},
+            </if>
             <if test="currentTotalAmount != null">
                 current_total_amount_ = #{currentTotalAmount},
             </if>
@@ -177,6 +181,9 @@
 	    <foreach collection="list" item="item" index="index" open="" close="" separator=";">
 	        UPDATE music_group_payment_calender
 	        <set>
+                <if test="item.name != null">
+                    name_ = #{item.name},
+                </if>
                 <if test="item.currentTotalAmount != null">
                     current_total_amount_ = #{item.currentTotalAmount},
                 </if>

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

@@ -1,44 +1,34 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.biz.dal.dao.StudentPaymentRouteOrderDao;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.service.OrganizationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-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.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dao.SellOrderDao;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
+import com.ym.mec.biz.dal.dao.StudentPaymentRouteOrderDao;
 import com.ym.mec.biz.dal.dto.BasicUserDto;
 import com.ym.mec.biz.dal.dto.OutOrderInfoDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentRouteOrderDto;
-import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.SellOrder;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
 import com.ym.mec.biz.dal.page.StudentPaymentOrderQueryInfo;
 import com.ym.mec.biz.dal.page.StudentPaymentRouteOrderQueryInfo;
+import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.biz.service.StudentPaymentRouteOrderService;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @RequestMapping("routeOrder")
 @Api(tags = "分润订单服务")
@@ -48,7 +38,7 @@ public class StudentPaymentRouteOrderController extends BaseController {
     @Autowired
     private StudentPaymentRouteOrderService studentPaymentRouteOrderService;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
     @Autowired
     private OrganizationService organizationService;
     @Autowired
@@ -98,15 +88,15 @@ public class StudentPaymentRouteOrderController extends BaseController {
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('routeOrder/add')")
     public HttpResponseResult<StudentPaymentRouteOrder> add(@RequestBody StudentPaymentRouteOrder studentPaymentRouteOrder) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        Integer userId = sysUserService.getUserId();
         if (studentPaymentRouteOrder.getServiceAmount() == null) {
         	studentPaymentRouteOrder.setServiceAmount(BigDecimal.ZERO);
         }
         if (studentPaymentRouteOrder.getSaleAmount() == null) {
         	studentPaymentRouteOrder.setSaleAmount(BigDecimal.ZERO);
         }
-        studentPaymentRouteOrder.setCreateBy(sysUser.getId());
-        studentPaymentRouteOrder.setUpdateBy(sysUser.getId());
+        studentPaymentRouteOrder.setCreateBy(userId);
+        studentPaymentRouteOrder.setUpdateBy(userId);
         if(studentPaymentRouteOrder.getPayTime().after(new Date())){
             failed("交易日期不能大于当前时间");
         }
@@ -119,8 +109,7 @@ public class StudentPaymentRouteOrderController extends BaseController {
 	@PostMapping("/auditOutOrder")
 	@PreAuthorize("@pcs.hasPermissions('routeOrder/auditOutOrder')")
 	public HttpResponseResult<String> auditOutOrder(Long studentPaymentRouteOrderId, AuditStatusEnum auditStatus, String memo) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		studentPaymentRouteOrderService.auditOutOrder(studentPaymentRouteOrderId, auditStatus, memo, sysUser.getId());
+		studentPaymentRouteOrderService.auditOutOrder(studentPaymentRouteOrderId, auditStatus, memo,sysUserService.getUserId());
 		return succeed();
 	}
 
@@ -136,14 +125,13 @@ public class StudentPaymentRouteOrderController extends BaseController {
     	if(originOrder.getAuditStatus() != AuditStatusEnum.REJECT ){
     		return failed("只有“拒绝”状态才能修改订单");
     	}
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (studentPaymentRouteOrder.getServiceAmount() == null) {
         	studentPaymentRouteOrder.setServiceAmount(BigDecimal.ZERO);
         }
         if (studentPaymentRouteOrder.getSaleAmount() == null) {
         	studentPaymentRouteOrder.setSaleAmount(BigDecimal.ZERO);
         }
-        studentPaymentRouteOrder.setUpdateBy(sysUser.getId());
+        studentPaymentRouteOrder.setUpdateBy(sysUserService.getUserId());
         if(studentPaymentRouteOrder.getSchoolId() == null){
             studentPaymentRouteOrder.setSchoolId(999999999);
         }