支持优惠券

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

@@ -637,13 +637,12 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
 
         String channelType = "";
 
-        StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
+        StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(studentRepair.getCouponIdList(),amount,true);
+        amount = studentPaymentOrder.getActualAmount();
         studentPaymentOrder.setUserId(studentRepair.getStudentId());
         studentPaymentOrder.setGroupType(GroupType.REPAIR);
         studentPaymentOrder.setOrderNo(orderNo);
         studentPaymentOrder.setType(OrderTypeEnum.REPAIR);
-        studentPaymentOrder.setExpectAmount(amount);
-        studentPaymentOrder.setActualAmount(amount);
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
         studentPaymentOrder.setMusicGroupId(studentRepair.getId().toString());
         studentPaymentOrder.setPaymentChannel("BALANCE");
@@ -1092,8 +1091,8 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                 BigDecimal divide = repairAmount.divide(repairAmount.add(couponRemitFee), 6, BigDecimal.ROUND_HALF_UP);
                 BigDecimal bigDecimal = couponRemitFee.multiply(divide).setScale(2, BigDecimal.ROUND_HALF_UP);
                 couponRemitFee = couponRemitFee.subtract(bigDecimal);
-                repairInfo.setAmount(repairAmount.subtract(bigDecimal));
-                studentRepairDao.update(repairInfo);
+//                repairInfo.setAmount(repairAmount.subtract(bigDecimal));
+//                studentRepairDao.update(repairInfo);
             }
             //生成销售订单
             if (StringUtils.isNotBlank(repairInfo.getGoodsJson())) {