零星支付支持优惠券

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

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 
-public class SporadicPayDto {
+public class SporadicPayDto extends PayParamBasicDto {
     @ApiModelProperty(value = "金额",required = false)
     private BigDecimal amount;
 
@@ -17,19 +17,6 @@ public class SporadicPayDto {
     @ApiModelProperty(value = "购买数量",required = false)
     private Integer num = 1;
 
-    private boolean isRepeatPay;
-
-    @ApiModelProperty(value = "是否余额支付",required = false)
-    Boolean isUseBalancePayment = false;
-
-    public boolean getIsRepeatPay() {
-        return isRepeatPay;
-    }
-
-    public void setIsRepeatPay(boolean repeatPay) {
-        isRepeatPay = repeatPay;
-    }
-
     public BigDecimal getAmount() {
         return amount;
     }
@@ -54,14 +41,6 @@ public class SporadicPayDto {
         this.sporadicId = sporadicId;
     }
 
-    public Boolean getUseBalancePayment() {
-        return isUseBalancePayment;
-    }
-
-    public void setUseBalancePayment(Boolean useBalancePayment) {
-        isUseBalancePayment = useBalancePayment;
-    }
-
     public Integer getNum() {
         return num;
     }

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

@@ -660,13 +660,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Integer userId = sporadicPayDto.getUserId();
         String orderNo = idGeneratorService.generatorId("payment") + "";
         String channelType = "";
-        StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
+        StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(sporadicPayDto.getCouponIdList(),amount);
+        amount = studentPaymentOrder.getActualAmount();
         studentPaymentOrder.setUserId(userId);
         studentPaymentOrder.setGroupType(GroupType.SPORADIC);
         studentPaymentOrder.setOrderNo(orderNo);
         studentPaymentOrder.setType(type);
-        studentPaymentOrder.setExpectAmount(amount);
-        studentPaymentOrder.setActualAmount(amount);
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
         studentPaymentOrder.setMusicGroupId(sporadicPayDto.getSporadicId().toString());
         studentPaymentOrder.setClassGroupId(sporadicPayDto.getNum());

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

@@ -67,12 +67,9 @@ public class SporadicChargeInfoController extends BaseController {
             if (sysUser == null || sysUser.getId() == null) {
                 return failed("用户不存在");
             }
-//            if (!sysUser.getUserType().contains("STUDENT")) {
-//                return failed("用户信息异常");
-//            }
             sporadicPayDto.setUserId(sysUser.getId());
         }
-        if (sporadicPayDto.getIsRepeatPay() == false) {
+        if (sporadicPayDto.getRepeatPay() == false) {
         	List<StudentPaymentOrder> studentPaymentOrderList = studentPaymentOrderDao.findPaymentOrderByGroupType(sporadicPayDto.getUserId(), sporadicPayDto.getSporadicId(), "SPORADIC", DealStatusEnum.ING);
             if (studentPaymentOrderList != null && studentPaymentOrderList.size() > 0) {
             	StudentPaymentOrder applyOrder = studentPaymentOrderList.get(studentPaymentOrderList.size() - 1);