优惠券支付

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

@@ -462,13 +462,22 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 		if(activeRemark == null || StringUtils.isEmpty(remark)){
 			return;
 		}
+		Integer studentId = cloudTeacherOrder.getStudentId();
+		SysUser sysUser = sysUserFeignService.queryUserById(studentId);
+		if(sysUser == null){
+			throw new BizException("用户信息获取失败");
+		}
+		Integer couponId = 1;
+		if(sysUser.getOrganId() != null && sysUser.getOrganId() == 4){
+			couponId = 2;
+		}
 		if(activeRemark.equals(202109)){
 			switch (remark){
 				case "2赠1":
-					sysCouponCodeService.exchangeCoupon(cloudTeacherOrder.getStudentId(),1,cloudTeacherOrder.getOrderId(),3);
+					sysCouponCodeService.exchangeCoupon(cloudTeacherOrder.getStudentId(),couponId,cloudTeacherOrder.getOrderId(),3);
 					break;
 				case "3赠2":
-					sysCouponCodeService.exchangeCoupon(cloudTeacherOrder.getStudentId(),1,cloudTeacherOrder.getOrderId(),6);
+					sysCouponCodeService.exchangeCoupon(cloudTeacherOrder.getStudentId(),couponId,cloudTeacherOrder.getOrderId(),6);
 					break;
 			}
 		}

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

@@ -139,7 +139,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
 
         StudentPaymentOrderDetail maintenanceOrderDetail = new StudentPaymentOrderDetail();
         maintenanceOrderDetail.setType(OrderDetailTypeEnum.MAINTENANCE);
-        maintenanceOrderDetail.setPrice(orderAmount);
+        maintenanceOrderDetail.setPrice(studentPaymentOrder.getActualAmount());
         maintenanceOrderDetail.setRemitFee(BigDecimal.ZERO);
         maintenanceOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());
         maintenanceOrderDetail.setStudentInstrumentId(maintenancePayDto.getId());