update

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

@@ -3,6 +3,15 @@ package com.ym.mec.biz.service;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
 import com.ym.mec.common.service.BaseService;
 
+import java.math.BigDecimal;
+
 public interface MusicGroupPaymentCalenderDetailService extends BaseService<Long, MusicGroupPaymentCalenderDetail> {
 
+    /**
+     * 修改学员预计缴费金额
+     * @param actualAmount
+     * @param id
+     * @return
+     */
+    void updateActualAmount(BigDecimal actualAmount, Long id);
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.common.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -8,6 +9,12 @@ import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
 import com.ym.mec.biz.service.MusicGroupPaymentCalenderDetailService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import static com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus.NON_PAYMENT;
 
 @Service
 public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<Long, MusicGroupPaymentCalenderDetail>  implements MusicGroupPaymentCalenderDetailService {
@@ -19,5 +26,22 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 	public BaseDAO<Long, MusicGroupPaymentCalenderDetail> getDAO() {
 		return musicGroupPaymentCalenderDetailDao;
 	}
-	
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateActualAmount(BigDecimal actualAmount, Long id) {
+		if(actualAmount == null || id == null){
+			throw new BizException("参数校验失败");
+		}
+		MusicGroupPaymentCalenderDetail calenderDetail = musicGroupPaymentCalenderDetailDao.get(id);
+		if(calenderDetail == null){
+			throw new BizException("缴费记录不存在");
+		}
+		if(calenderDetail.getPaymentStatus() == null || calenderDetail.getPaymentStatus() != NON_PAYMENT){
+			throw new BizException("修改失败,缴费状态异常");
+		}
+		calenderDetail.setActualAmount(actualAmount);
+		calenderDetail.setUpdateTime(new Date());
+		musicGroupPaymentCalenderDetailDao.update(calenderDetail);
+	}
 }

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

@@ -6,7 +6,6 @@ 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 io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

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

@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
+
 @RequestMapping("musicGroupPaymentCalenderDetail")
 @Api(tags = "乐团缴费明细")
 @RestController
@@ -20,10 +22,18 @@ public class MusicGroupPaymentCalenderDetailController extends BaseController {
     @Autowired
     private MusicGroupPaymentCalenderDetailService musicGroupPaymentCalenderDetailService;
 
-    @ApiOperation(value = "分页查询乐团缴费日历列表")
+    @ApiOperation(value = "分页查询乐团缴费明细列表")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalenderDetail/queryPage')")
     public Object queryPage(MusicCalenderDetailQueryInfo queryInfo) {
         return succeed(musicGroupPaymentCalenderDetailService.queryPage(queryInfo));
     }
+
+    @ApiOperation(value = "修改学员预计缴费金额")
+    @GetMapping("/updateActualAmount")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalenderDetail/updateActualAmount')")
+    public Object updateActualAmount(BigDecimal actualAmount,Long id) {
+        musicGroupPaymentCalenderDetailService.updateActualAmount(actualAmount,id);
+        return succeed();
+    }
 }