update

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

@@ -2,10 +2,11 @@ package com.ym.mec.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface MusicGroupPaymentCalenderActivityDao extends BaseMapper<MusicGroupPaymentCalenderActivity> {
 
-    void insertBatch(List<MusicGroupPaymentCalenderActivity> musicGroupPaymentCalenderActivities);
+    void insertBatch(@Param("calenderActivityList") List<MusicGroupPaymentCalenderActivity> musicGroupPaymentCalenderActivities);
 }

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

@@ -36,13 +36,13 @@ public class MusicGroupPaymentCalenderActivity implements Serializable {
     @ApiModelProperty(value = "是否必选")
     private Integer optionalFlag;
 
-    @TableField("actual_price_")
+    @TableField("actual_amount_")
     @ApiModelProperty(value = "现价")
-    private BigDecimal actualPrice;
+    private BigDecimal actualAmount;
 
-    @TableField("original_price_")
+    @TableField("original_amount_")
     @ApiModelProperty(value = "原价")
-    private BigDecimal originalPrice;
+    private BigDecimal originalAmount;
 
     @TableField("create_time_")
     @ApiModelProperty(value = "${column.comment}")
@@ -86,20 +86,20 @@ public class MusicGroupPaymentCalenderActivity implements Serializable {
         this.optionalFlag = optionalFlag;
     }
 
-    public BigDecimal getActualPrice() {
-        return actualPrice;
+    public BigDecimal getActualAmount() {
+        return actualAmount;
     }
 
-    public void setActualPrice(BigDecimal actualPrice) {
-        this.actualPrice = actualPrice;
+    public void setActualAmount(BigDecimal actualAmount) {
+        this.actualAmount = actualAmount;
     }
 
-    public BigDecimal getOriginalPrice() {
-        return originalPrice;
+    public BigDecimal getOriginalAmount() {
+        return originalAmount;
     }
 
-    public void setOriginalPrice(BigDecimal originalPrice) {
-        this.originalPrice = originalPrice;
+    public void setOriginalAmount(BigDecimal originalAmount) {
+        this.originalAmount = originalAmount;
     }
 
     public Date getCreateTime() {

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

@@ -29,7 +29,7 @@ public class MusicGroupPaymentCalenderActivityServiceImpl extends ServiceImpl<Mu
     public BigDecimal getActualAmount(MusicGroupPaymentBaseCalender baseCalender) {
         List<MusicGroupPaymentCalenderActivity> calenderActivityList = baseCalender.getCalenderActivityList();
         if(calenderActivityList != null && calenderActivityList.size() > 0){
-            return calenderActivityList.stream().map(e->e.getActualPrice()).reduce(BigDecimal.ZERO,BigDecimal::add);
+            return calenderActivityList.stream().map(e->e.getActualAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
         }
         return BigDecimal.ZERO;
     }

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

@@ -674,7 +674,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		musicGroupPaymentCalenderCourseSettingsService.batchInsert(musicGroupPaymentCalender);
 		//活动费用列表
 		musicGroupPaymentCalenderActivityService.batchInsert(musicGroupPaymentBaseCalender,musicGroupPaymentCalender.getId());
-		//
 
 		// 如果是报名，需要修改乐团状态
 		if (paymentType == MUSIC_APPLY) {

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

@@ -50,7 +50,7 @@ public class MusicRepairPaymentCalenderServiceImpl implements MusicGroupPaymentC
     public BigDecimal getActualAmount(MusicGroupPaymentBaseCalender baseCalender) {
         MusicRepairDto musicRepair = baseCalender.getMusicRepair();
         if(musicRepair != null){
-            return musicRepair.getActualAmount();
+            return musicRepair.getActualAmount().multiply(musicRepair.getNum());
         }
         return BigDecimal.ZERO;
     }

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

@@ -6,23 +6,22 @@
     <result column="activity_id_" jdbcType="INTEGER" property="activityId" />
     <result column="calender_id_" property="calenderId" />
     <result column="optional_flag_" jdbcType="TINYINT" property="optionalFlag" />
-    <result column="actual_price_" jdbcType="TINYINT" property="actualPrice" />
-    <result column="original_price_" jdbcType="TINYINT" property="originalPrice" />
+    <result column="actual_amount_" jdbcType="TINYINT" property="actualAmount" />
+    <result column="original_amount_" jdbcType="TINYINT" property="originalAmount" />
     <result column="create_time_" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    id_, activity_id_, calender_id_, optional_flag_,actual_price_ ,original_price_, create_time_, update_time_
+    id_, activity_id_, calender_id_, optional_flag_,actual_amount_ ,original_amount_, create_time_, update_time_
   </sql>
 
   <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
           parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity">
-    insert into music_group_payment_calender_activity(activity_id_, calender_id_, optional_flag_, actual_price_,
-    original_price_, create_time_, update_time_)
+    insert into music_group_payment_calender_activity(activity_id_, calender_id_, optional_flag_, actual_amount_ ,original_amount_, create_time_, update_time_)
     values
-    <foreach collection="entities" item="entity" separator=",">
-      (#{entity.activityId}, #{entity.calenderId}, #{entity.optionalFlag}, #{entity.actualPrice},
-      #{entity.originalPrice}, NOW(), NOW())
+    <foreach collection="calenderActivityList" item="entity" separator=",">
+      (#{entity.activityId}, #{entity.calenderId}, #{entity.optionalFlag}, #{entity.actualAmount},
+      #{entity.originalAmount}, NOW(), NOW())
     </foreach>
   </insert>
 </mapper>

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

@@ -61,7 +61,17 @@ public class MusicGroupPaymentCalenderController extends BaseController {
     @ApiOperation(value = "新增乐团缴费日历")
     @PostMapping(value = "/add", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/add')")
-    public Object add(@RequestBody MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
+    public Object add(@RequestBody MusicGroupPaymentCalenderDto musicGroupPaymentCalenderDto) {
+    	String batchNo = musicGroupPaymentCalenderService.create(musicGroupPaymentCalenderDto);
+        ModelMap map = new ModelMap(1);
+        map.put("musicGroupPaymentCalenderBatchNo", batchNo);
+        return succeed(map);
+    }
+
+    @ApiOperation(value = "新增乐团缴费日历")
+    @PostMapping(value = "/createCalender", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/createCalender')")
+    public Object createCalender(@RequestBody MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
     	String batchNo = musicGroupPaymentCalenderService.create1(musicGroupPaymentBaseCalender);
         ModelMap map = new ModelMap(1);
         map.put("musicGroupPaymentCalenderBatchNo", batchNo);