优惠券支付

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

@@ -23,13 +23,23 @@ public class MemberPayParamDto{
 
     private BigDecimal amount;
 
-    private boolean isUseBalance;
+    private boolean isUseBalance = false;
+
+    private boolean repay = false;
 
     private Integer userId;
 
     @ApiModelProperty(value = "优惠券列表", required = false)
     private List<Integer> couponIdList;
 
+    public boolean isRepay() {
+        return repay;
+    }
+
+    public void setRepay(boolean repay) {
+        this.repay = repay;
+    }
+
     public List<Integer> getCouponIdList() {
         return couponIdList;
     }

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

@@ -658,10 +658,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         String orderNo = idGeneratorService.generatorId("payment") + "";
         String channelType = "";
         StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(sporadicPayDto.getCouponIdList(),amount,true);
+        amount = studentPaymentOrder.getActualAmount();
         if (!(amount.compareTo(sporadicPayDto.getAmount()) == 0)) {
             throw new BizException("订单金额异常");
         }
-        amount = studentPaymentOrder.getActualAmount();
         studentPaymentOrder.setUserId(userId);
         studentPaymentOrder.setGroupType(GroupType.SPORADIC);
         studentPaymentOrder.setOrderNo(orderNo);

mec-student/src/main/java/com/ym/mec/student/controller/MemberRankController.java

@@ -75,7 +75,7 @@ public class MemberRankController extends BaseController {
 
 	@ApiOperation(value = "2021-09活动购买会员")
 	@PostMapping("/activeBuy")
-	public HttpResponseResult ActiveBuy(Integer memberRankId, Integer buyNum, BigDecimal amount, boolean isUseBalance, boolean repay) throws Exception {
+	public HttpResponseResult ActiveBuy(@RequestBody MemberPayParamDto memberPayParamDto) throws Exception {
 		Date nowTime = new Date();
 		String startTimeStr = sysConfigDao.findConfigValue("cloud_teacher_active_start_time");
 		Date startTime = DateUtil.stringToDate(startTimeStr);
@@ -92,16 +92,17 @@ public class MemberRankController extends BaseController {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 		//买2赠1、买3赠2
+		Integer buyNum = memberPayParamDto.getBuyNum();
 		int giveNum = buyNum == 2?1:buyNum == 3?2:0;
 		String remark = buyNum == 2?"2赠1":buyNum == 3?"3赠2":buyNum == 1?"单月":"其他";
 		return memberRankSettingService.ActiveBuy(sysUser.getId(),
-				memberRankId,
+				memberPayParamDto.getMemberRankId(),
 				PeriodEnum.MONTH,
-				amount,
-				isUseBalance,
+				memberPayParamDto.getAmount(),
+				memberPayParamDto.isUseBalance(),
 				buyNum,
 				giveNum,
-				202109,remark,repay);
+				202109,remark,memberPayParamDto.isRepay());
 	}
 	
     @ApiOperation(value = "查询订单列表")