|
@@ -141,6 +141,10 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
|
|
|
@Autowired
|
|
|
private RedisCacheService redisCacheService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private StudentService studentService;
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 查询详情
|
|
|
*
|
|
@@ -339,12 +343,15 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
|
|
|
serviceFeeAmount = actualPrice;
|
|
|
}
|
|
|
|
|
|
- // 消息通知
|
|
|
-// CompletableFuture.runAsync(() -> {
|
|
|
-// musicSheetService.sendBuyMessage(userPaymentOrder.getMerchId(), userPaymentOrder.getUserId(),
|
|
|
-// userPaymentOrder.getBizId(), userPaymentOrder.getOrderClient(), userPaymentOrder.getOrderType());
|
|
|
-// }
|
|
|
-// );
|
|
|
+ // 平台学生 发送推送
|
|
|
+ if(checkSendMessage(userPaymentOrder.getUserId(),userPaymentOrder.getOrderClient())) {
|
|
|
+ // 消息通知
|
|
|
+ CompletableFuture.runAsync(() -> {
|
|
|
+ musicSheetService.sendBuyMessage(userPaymentOrder.getMerchId(), userPaymentOrder.getUserId(),
|
|
|
+ userPaymentOrder.getBizId(), userPaymentOrder.getOrderClient(), userPaymentOrder.getOrderType());
|
|
|
+ }
|
|
|
+ );
|
|
|
+ }
|
|
|
|
|
|
|
|
|
// 计算分润
|
|
@@ -352,6 +359,19 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
|
|
|
saveData(userPaymentOrder, tenantdivMap, teacherMap, bizMap);
|
|
|
}
|
|
|
|
|
|
+ private boolean checkSendMessage(Long userId, ClientEnum orderClient) {
|
|
|
+ if (orderClient == null) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (orderClient.equals(ClientEnum.STUDENT)) {
|
|
|
+ Student student = studentService.getById(userId);
|
|
|
+ if (student == null) {
|
|
|
+ return false;
|
|
|
+ } else return student.getTenantId() == -1;
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void practiceCourse(UserOrderDetailVo userPaymentOrder) {
|
|
@@ -462,7 +482,11 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
|
|
|
|
|
|
//消息推送
|
|
|
try {
|
|
|
-// courseScheduleService.practiceSend(paymentList.get(0).getTeacherId(), userPaymentOrder.getUserId(), paymentList.size() + "", orderNo);
|
|
|
+
|
|
|
+ // 平台学生 发送推送
|
|
|
+ if(checkSendMessage(userPaymentOrder.getUserId(),userPaymentOrder.getOrderClient())) {
|
|
|
+ courseScheduleService.practiceSend(paymentList.get(0).getTeacherId(), userPaymentOrder.getUserId(), paymentList.size() + "", orderNo);
|
|
|
+ }
|
|
|
} catch (Exception e) {
|
|
|
log.error("陪练课消息推送失败");
|
|
|
}
|
|
@@ -587,7 +611,12 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
|
|
|
}
|
|
|
log.info("buyLiveCourseSuccess ok");
|
|
|
//课程购买成功后进行消息推送
|
|
|
-// courseGroupService.buyLiveSendMessage(studentPayment, courseGroup);
|
|
|
+
|
|
|
+ // 平台学生 发送推送
|
|
|
+ if(checkSendMessage(userPaymentOrder.getUserId(),userPaymentOrder.getOrderClient())) {
|
|
|
+ courseGroupService.buyLiveSendMessage(studentPayment, courseGroup);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -665,7 +694,10 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
|
|
|
saveData(userPaymentOrder, tenantdivMap, teacherMap, bizMap);
|
|
|
|
|
|
|
|
|
-// videoLessonPurchaseRecordService.videoSend(lessonGroup.getTeacherId(), purchaseRecord.getStudentId(), lessonGroup);
|
|
|
+ // 平台学生 发送推送
|
|
|
+ if(checkSendMessage(userPaymentOrder.getUserId(),userPaymentOrder.getOrderClient())) {
|
|
|
+ videoLessonPurchaseRecordService.videoSend(lessonGroup.getTeacherId(), purchaseRecord.getStudentId(), lessonGroup);
|
|
|
+ }
|
|
|
|
|
|
// 赠品曲目、专辑插入用户曲目购买记录表
|
|
|
List<CourseRelationMusicAlbum> musicAlbums = courseRelationMusicAlbumService.lambdaQuery()
|
|
@@ -742,7 +774,7 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
|
|
|
// 计算分润
|
|
|
teacherAmount(userPaymentOrder, tenantdivMap, teacherMap, serviceFeeAmount);
|
|
|
|
|
|
- memberPriceSettingsService.orderSuccess(userPaymentOrder,false);
|
|
|
+ memberPriceSettingsService.orderSuccess(userPaymentOrder,checkSendMessage(userPaymentOrder.getUserId(),userPaymentOrder.getOrderClient()));
|
|
|
|
|
|
saveData(userPaymentOrder, tenantdivMap, teacherMap, bizMap);
|
|
|
}
|
|
@@ -768,7 +800,7 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
|
|
|
teacherAmount(userPaymentOrder, tenantdivMap, teacherMap, serviceFeeAmount);
|
|
|
|
|
|
|
|
|
- activityPlanService.orderSuccess(userPaymentOrder,false);
|
|
|
+ activityPlanService.orderSuccess(userPaymentOrder,checkSendMessage(userPaymentOrder.getUserId(),userPaymentOrder.getOrderClient()));
|
|
|
|
|
|
saveData(userPaymentOrder, tenantdivMap, teacherMap, bizMap);
|
|
|
}
|