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

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderAddress;
+
+public interface MusicGroupPaymentCalenderAddressDao extends BaseMapper<MusicGroupPaymentCalenderAddress> {
+
+}
+

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderGoods;
+
+public interface MusicGroupPaymentCalenderGoodsDao extends BaseMapper<MusicGroupPaymentCalenderGoods> {
+
+}
+

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

@@ -4,11 +4,13 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PayUserType;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+@Data
 public class MusicGroupPaymentBaseCalender {
 	@ApiModelProperty(value = "是否继续操作", required = true)
 	private Boolean confirmCreate = false;
@@ -40,6 +42,12 @@ public class MusicGroupPaymentBaseCalender {
 	@ApiModelProperty(value = "批次号", required = false)
 	private String batchNo;
 
+	@ApiModelProperty(value = "商品采购相关信息", required = false)
+	private List<MusicGroupPaymentCalenderGoods> calenderGoodsList;
+
+	@ApiModelProperty(value = "收货地址相关信息", required = false)
+	private MusicGroupPaymentCalenderAddress calenderAddress;
+
 	@ApiModelProperty(value = "会员相关缴费信息", required = false)
 	private MusicGroupPaymentCalenderMember calenderMember;
 
@@ -79,196 +87,4 @@ public class MusicGroupPaymentBaseCalender {
 	@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;
-	}
-
-	public void setContractUrl(String contractUrl) {
-		this.contractUrl = contractUrl;
-	}
-
-	public BigDecimal getCurrentTotalAmount() {
-		return currentTotalAmount;
-	}
-
-	public void setCurrentTotalAmount(BigDecimal currentTotalAmount) {
-		this.currentTotalAmount = currentTotalAmount;
-	}
-
-	public List<MusicGroupCalenderRefundPeriod> getMusicGroupCalenderRefundPeriods() {
-		return musicGroupCalenderRefundPeriods;
-	}
-
-	public void setMusicGroupCalenderRefundPeriods(List<MusicGroupCalenderRefundPeriod> musicGroupCalenderRefundPeriods) {
-		this.musicGroupCalenderRefundPeriods = musicGroupCalenderRefundPeriods;
-	}
-
-	public String getCalenderFeeJson() {
-		return calenderFeeJson;
-	}
-
-	public void setCalenderFeeJson(String calenderFeeJson) {
-		this.calenderFeeJson = calenderFeeJson;
-	}
-
-	public String getCalenderFeeType() {
-		return calenderFeeType;
-	}
-
-	public void setCalenderFeeType(String calenderFeeType) {
-		this.calenderFeeType = calenderFeeType;
-	}
-
-	public Boolean getConfirmCreate() {
-		return confirmCreate;
-	}
-
-	public void setConfirmCreate(Boolean confirmCreate) {
-		this.confirmCreate = confirmCreate;
-	}
-
-	public Long getCalenderId() {
-		return calenderId;
-	}
-
-	public void setCalenderId(Long calenderId) {
-		this.calenderId = calenderId;
-	}
-
-	public CalenderAddStudent getCalenderAddStudent() {
-		return calenderAddStudent;
-	}
-
-	public void setCalenderAddStudent(CalenderAddStudent calenderAddStudent) {
-		this.calenderAddStudent = calenderAddStudent;
-	}
-
-	public List<MusicGroupPaymentCalenderActivity> getCalenderActivityList() {
-		return calenderActivityList;
-	}
-
-	public void setCalenderActivityList(List<MusicGroupPaymentCalenderActivity> calenderActivityList) {
-		this.calenderActivityList = calenderActivityList;
-	}
-
-	public MusicGroupPaymentCalenderRepair getMusicRepair() {
-		return musicRepair;
-	}
-
-	public void setMusicRepair(MusicGroupPaymentCalenderRepair musicRepair) {
-		this.musicRepair = musicRepair;
-	}
-
-	public MusicGroup getMusicGroup() {
-		return musicGroup;
-	}
-
-	public void setMusicGroup(MusicGroup musicGroup) {
-		this.musicGroup = musicGroup;
-	}
-
-	public Date getStartPaymentDate() {
-		return startPaymentDate;
-	}
-
-	public void setStartPaymentDate(Date startPaymentDate) {
-		this.startPaymentDate = startPaymentDate;
-	}
-
-	public Date getDeadlinePaymentDate() {
-		return deadlinePaymentDate;
-	}
-
-	public void setDeadlinePaymentDate(Date deadlinePaymentDate) {
-		this.deadlinePaymentDate = deadlinePaymentDate;
-	}
-
-	public MusicGroupPaymentCalenderMember getCalenderMember() {
-		return calenderMember;
-	}
-
-	public void setCalenderMember(MusicGroupPaymentCalenderMember calenderMember) {
-		this.calenderMember = calenderMember;
-	}
-
-	public String getMusicGroupId() {
-		return musicGroupId;
-	}
-
-	public void setMusicGroupId(String musicGroupId) {
-		this.musicGroupId = musicGroupId;
-	}
-
-	public Integer getMusicGroupOrganizationCourseSettingId() {
-		return musicGroupOrganizationCourseSettingId;
-	}
-
-	public void setMusicGroupOrganizationCourseSettingId(Integer musicGroupOrganizationCourseSettingId) {
-		this.musicGroupOrganizationCourseSettingId = musicGroupOrganizationCourseSettingId;
-	}
-
-	public PayUserType getPayUserType() {
-		return payUserType;
-	}
-
-	public void setPayUserType(PayUserType payUserType) {
-		this.payUserType = payUserType;
-	}
-
-	public PaymentType getPaymentType() {
-		return paymentType;
-	}
-
-	public void setPaymentType(PaymentType paymentType) {
-		this.paymentType = paymentType;
-	}
-
-	public String getMemo() {
-		return memo;
-	}
-
-	public void setMemo(String memo) {
-		this.memo = memo;
-	}
-
-	public List<MusicGroupPaymentCalenderCourseSettings> getMusicGroupPaymentCalenderCourseSettingsList() {
-		return musicGroupPaymentCalenderCourseSettingsList;
-	}
-
-	public void setMusicGroupPaymentCalenderCourseSettingsList(List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList) {
-		this.musicGroupPaymentCalenderCourseSettingsList = musicGroupPaymentCalenderCourseSettingsList;
-	}
-
-	public String getBatchNo() {
-		return batchNo;
-	}
-
-	public void setBatchNo(String batchNo) {
-		this.batchNo = batchNo;
-	}
-
-	public String getPaymentItemShowState() {
-		return paymentItemShowState;
-	}
-
-	public void setPaymentItemShowState(String paymentItemShowState) {
-		this.paymentItemShowState = paymentItemShowState;
-	}
-
-	public Boolean getIsShowSalePrice() {
-		return isShowSalePrice;
-	}
-
-	public void setIsShowSalePrice(Boolean isShowSalePrice) {
-		this.isShowSalePrice = isShowSalePrice;
-	}
-
 }

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

@@ -76,7 +76,7 @@ public class MusicGroupPaymentCalender extends BaseEntity {
 
 	public enum PaymentType implements BaseEnum<String, PaymentType> {
 		ADD_STUDENT("新增学员"), ADD_COURSE("临时加课"), MUSIC_APPLY("乐团报名"),
-		MUSIC_RENEW("乐团续费"),SPAN_GROUP_CLASS_ADJUST("跨团班级调整");
+		MUSIC_RENEW("乐团续费"),SPAN_GROUP_CLASS_ADJUST("跨团班级调整"),GOODS_PURCHASE("商品采购");
 
 		private String desc;
 

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

@@ -0,0 +1,57 @@
+package com.ym.mec.biz.dal.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@ApiModel(value = "music_group_payment_calender_address")
+@Data
+public class MusicGroupPaymentCalenderAddress implements Serializable {
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @TableField("calender_id_")
+    @ApiModelProperty(value = "缴费项目编号")
+    private Long calenderId;
+
+    @TableField("name_")
+    @ApiModelProperty(value = "收货人")
+    private String name;
+
+    @TableField("phone_")
+    @ApiModelProperty(value = "收货人手机号")
+    private String phone;
+
+    @TableField("province_")
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @TableField("city_")
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @TableField("region_")
+    @ApiModelProperty(value = "区")
+    private String region;
+
+    @TableField("address_")
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
+    @TableField("create_time_")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @TableField("update_time_")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}
+

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

@@ -0,0 +1,61 @@
+package com.ym.mec.biz.dal.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@ApiModel(value = "music_group_payment_calender_goods")
+@Data
+public class MusicGroupPaymentCalenderGoods implements Serializable {
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @TableField("calender_id_")
+    @ApiModelProperty(value = "缴费项目编号")
+    private Long calenderId;
+
+    @TableField("goods_id_")
+    @ApiModelProperty(value = "商品编号")
+    private Integer goodsId;
+
+    @TableField("goods_name_")
+    @ApiModelProperty(value = "商品名称")
+    private String goodsName;
+
+    @TableField("goods_sn_")
+    @ApiModelProperty(value = "商品货号")
+    private String goodsSn;
+
+    @TableField("child_goods_json_")
+    @ApiModelProperty(value = "子商品明细")
+    private String childGoodsJson;
+
+    @TableField("num_")
+    @ApiModelProperty(value = "数量")
+    private Integer num;
+
+    @TableField("single_price_")
+    @ApiModelProperty(value = "单价")
+    private java.math.BigDecimal singlePrice;
+
+    @TableField("total_price_")
+    @ApiModelProperty(value = "总价")
+    private java.math.BigDecimal totalPrice;
+
+    @TableField("create_time_")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @TableField("update_time_")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}
+

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

@@ -0,0 +1,13 @@
+package com.ym.mec.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderAddressDao;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderGoodsDao;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderAddress;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderGoods;
+
+public interface MusicGroupPaymentCalenderAddressService extends IService<MusicGroupPaymentCalenderAddress> {
+
+    MusicGroupPaymentCalenderAddressDao getDao();
+}
+

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

@@ -0,0 +1,14 @@
+package com.ym.mec.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderGoodsDao;
+import com.ym.mec.biz.dal.dto.MusicGroupPaymentBaseCalender;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderGoods;
+
+import java.math.BigDecimal;
+
+public interface MusicGroupPaymentCalenderGoodsService extends IService<MusicGroupPaymentCalenderGoods> {
+
+    MusicGroupPaymentCalenderGoodsDao getDao();
+}
+

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

@@ -0,0 +1,22 @@
+package com.ym.mec.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderAddressDao;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderAddress;
+import com.ym.mec.biz.service.MusicGroupPaymentCalenderAddressService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+@Service("musicGroupPaymentCalenderAddressService")
+public class MusicGroupPaymentCalenderAddressServiceImpl extends ServiceImpl<MusicGroupPaymentCalenderAddressDao, MusicGroupPaymentCalenderAddress> implements MusicGroupPaymentCalenderAddressService {
+
+    private final static Logger log = LoggerFactory.getLogger(MusicGroupPaymentCalenderAddressServiceImpl.class);
+
+    @Override
+    public MusicGroupPaymentCalenderAddressDao getDao() {
+        return this.baseMapper;
+    }
+
+}
+

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

@@ -0,0 +1,65 @@
+package com.ym.mec.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderGoodsDao;
+import com.ym.mec.biz.dal.dto.MusicGroupPaymentBaseCalender;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderGoods;
+import com.ym.mec.biz.dal.entity.VipGroupActivity;
+import com.ym.mec.biz.service.MusicGroupPaymentCalenderBaseService;
+import com.ym.mec.biz.service.MusicGroupPaymentCalenderGoodsService;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service("musicGroupPaymentCalenderGoodsService")
+public class MusicGroupPaymentCalenderGoodsServiceImpl extends ServiceImpl<MusicGroupPaymentCalenderGoodsDao, MusicGroupPaymentCalenderGoods>
+        implements MusicGroupPaymentCalenderGoodsService, MusicGroupPaymentCalenderBaseService<MusicGroupPaymentCalenderGoods> {
+
+    private final static Logger log = LoggerFactory.getLogger(MusicGroupPaymentCalenderGoodsServiceImpl.class);
+
+    @Override
+    public MusicGroupPaymentCalenderGoodsDao getDao() {
+        return this.baseMapper;
+    }
+
+    @Override
+    public MusicGroupPaymentCalender.PaymentCalenderStatusEnum checkComponentAmount(MusicGroupPaymentBaseCalender baseCalender) {
+        return null;
+    }
+
+    @Override
+    public BigDecimal getActualAmount(MusicGroupPaymentBaseCalender baseCalender) {
+        return null;
+    }
+
+    @Override
+    public BigDecimal getOriginalAmount(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
+        List<MusicGroupPaymentCalenderGoods> goodsList = musicGroupPaymentBaseCalender.getCalenderGoodsList();
+//        if(CollectionUtils.isNotEmpty(goodsList)){
+//            List<Integer> collect = calenderActivityList.stream().map(e -> e.getActivityId()).collect(Collectors.toList());
+//            List<VipGroupActivity> vipGroupActivities = vipGroupActivityDao.queryByIds(StringUtils.join(collect, ","));
+//            return vipGroupActivities.stream().map(e->fun.apply(e)).reduce(BigDecimal.ZERO,BigDecimal::add);
+//        }
+        return BigDecimal.ZERO;
+    }
+
+    @Override
+    public BigDecimal getCurrentAmount(MusicGroupPaymentBaseCalender baseCalender) {
+        return null;
+    }
+
+    @Override
+    public <E> E initBean(E bean) {
+        return null;
+    }
+
+}
+

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

@@ -112,6 +112,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
     @Autowired
     private CloudTeacherOrderService cloudTeacherOrderService;
     @Autowired
+    private MusicGroupPaymentCalenderGoodsServiceImpl musicGroupPaymentCalenderGoodsService;
+    @Autowired
     private MusicGroupPaymentCalenderActivityServiceImpl musicGroupPaymentCalenderActivityService;
     @Autowired
     private MusicGroupPaymentCalenderMemberServiceImpl musicGroupPaymentCalenderMemberService;
@@ -260,23 +262,28 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         CalenderAddStudent calenderAddStudent = musicGroupPaymentBaseCalender.getCalenderAddStudent();
         MusicGroupPaymentCalender musicGroupPaymentCalender = new MusicGroupPaymentCalender();
         BeanUtils.copyProperties(musicGroupPaymentBaseCalender,musicGroupPaymentCalender);
-        //判断缴费项目类型
-        if (musicGroup.getStatus() == MusicGroupStatusEnum.DRAFT || musicGroup.getStatus() == MusicGroupStatusEnum.AUDIT_FAILED || musicGroup.getStatus() == MusicGroupStatusEnum.FEE_AUDIT_FAILED) {
-            musicGroupPaymentCalender.setPaymentType(MUSIC_APPLY);
-        } else {
-            if (calenderAddStudent != null && calenderAddStudent.getStudentIds() != null) {
-                musicGroupPaymentCalender.setPaymentType(ADD_STUDENT);
-                //预计缴费人数
-                musicGroupPaymentCalender.setAttribute1(calenderAddStudent.getClassGroupIds());
-                musicGroupPaymentCalender.setStudentIds(calenderAddStudent.getStudentIds().toString());
-                musicGroupPaymentCalender.setExpectNum(1);
-                //校验是否可以加学员
-                checkAddStudent(calenderAddStudent, musicGroup);
+        if(musicGroupPaymentBaseCalender.getCalenderGoodsList() != null){
+            musicGroupPaymentCalender.setPaymentType(GOODS_PURCHASE);
+            musicGroupPaymentCalender.setPayUserType(SCHOOL);
+        }else {
+            //判断缴费项目类型
+            if (musicGroup.getStatus() == MusicGroupStatusEnum.DRAFT || musicGroup.getStatus() == MusicGroupStatusEnum.AUDIT_FAILED || musicGroup.getStatus() == MusicGroupStatusEnum.FEE_AUDIT_FAILED) {
+                musicGroupPaymentCalender.setPaymentType(MUSIC_APPLY);
             } else {
-                if (musicGroupPaymentBaseCalender.getMusicGroupOrganizationCourseSettingId() != null) {
-                    musicGroupPaymentCalender.setPaymentType(MUSIC_RENEW);
+                if (calenderAddStudent != null && calenderAddStudent.getStudentIds() != null) {
+                    musicGroupPaymentCalender.setPaymentType(ADD_STUDENT);
+                    //预计缴费人数
+                    musicGroupPaymentCalender.setAttribute1(calenderAddStudent.getClassGroupIds());
+                    musicGroupPaymentCalender.setStudentIds(calenderAddStudent.getStudentIds().toString());
+                    musicGroupPaymentCalender.setExpectNum(1);
+                    //校验是否可以加学员
+                    checkAddStudent(calenderAddStudent, musicGroup);
                 } else {
-                    musicGroupPaymentCalender.setPaymentType(ADD_COURSE);
+                    if (musicGroupPaymentBaseCalender.getMusicGroupOrganizationCourseSettingId() != null) {
+                        musicGroupPaymentCalender.setPaymentType(MUSIC_RENEW);
+                    } else {
+                        musicGroupPaymentCalender.setPaymentType(ADD_COURSE);
+                    }
                 }
             }
         }
@@ -287,6 +294,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         BigDecimal memberOriginalAmount = musicGroupPaymentCalenderMemberService.getOriginalAmount(musicGroupPaymentBaseCalender);
         BigDecimal repairOriginalAmount = musicGroupPaymentCalenderRepairService.getOriginalAmount(musicGroupPaymentBaseCalender);
         BigDecimal activityOriginalAmount = musicGroupPaymentCalenderActivityService.getOriginalAmount(musicGroupPaymentBaseCalender);
+        BigDecimal goodsOriginalAmount = musicGroupPaymentCalenderGoodsService.getOriginalAmount(musicGroupPaymentBaseCalender);
 
         BigDecimal originalTotalAmount = courseOriginalAmount.add(memberOriginalAmount)
                 .add(activityOriginalAmount)
@@ -297,6 +305,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         BigDecimal memberActualAmount = musicGroupPaymentCalenderMemberService.getActualAmount(musicGroupPaymentBaseCalender);
         BigDecimal repairActualAmount = musicGroupPaymentCalenderRepairService.getActualAmount(musicGroupPaymentBaseCalender);
         BigDecimal activityActualAmount = musicGroupPaymentCalenderActivityService.getActualAmount(musicGroupPaymentBaseCalender);
+        BigDecimal goodsActualAmount = musicGroupPaymentCalenderGoodsService.getActualAmount(musicGroupPaymentBaseCalender);
 
         BigDecimal actualTotalAmount = courseActualAmount.add(memberActualAmount)
                 .add(repairActualAmount)

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

@@ -0,0 +1,4 @@
+<?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.biz.dal.dao.MusicGroupPaymentCalenderAddressDao">
+</mapper>

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

@@ -0,0 +1,4 @@
+<?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.biz.dal.dao.MusicGroupPaymentCalenderGoodsDao">
+</mapper>