|
@@ -344,14 +344,12 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
|
|
|
* @param musicSheetId 曲目id
|
|
|
*/
|
|
|
private void checkoutPay(Long userId, Long musicSheetId) {
|
|
|
- List<MusicSheetPurchaseRecord> list = musicSheetPurchaseRecordService.lambdaQuery()
|
|
|
- .eq(MusicSheetPurchaseRecord::getMusicSheetId,
|
|
|
- musicSheetId)
|
|
|
- .eq(MusicSheetPurchaseRecord::getStudentId,
|
|
|
- userId)
|
|
|
- .eq(MusicSheetPurchaseRecord::getOrderStatus,
|
|
|
- YesOrNoEnum.YES)
|
|
|
- .list();
|
|
|
+ List<MusicSheetPurchaseRecord> list = musicSheetPurchaseRecordService
|
|
|
+ .lambdaQuery()
|
|
|
+ .eq(MusicSheetPurchaseRecord::getMusicSheetId, musicSheetId)
|
|
|
+ .eq(MusicSheetPurchaseRecord::getStudentId, userId)
|
|
|
+ .eq(MusicSheetPurchaseRecord::getOrderStatus, YesOrNoEnum.YES)
|
|
|
+ .list();
|
|
|
if (!CollectionUtils.isEmpty(list)) {
|
|
|
throw new BizException("已经购买了当前曲目");
|
|
|
}
|
|
@@ -372,10 +370,15 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
|
|
|
|
|
|
// 加入账户
|
|
|
UserAccountRecordDto userAccountRecordDto = new UserAccountRecordDto();
|
|
|
- userAccountRecordDto.setUserId(userOrderDetailVo.getUserId());
|
|
|
+ userAccountRecordDto.setUserId(userOrderDetailVo.getMerchId());
|
|
|
userAccountRecordDto.setFrozenType(FrozenTypeEnum.NONE);
|
|
|
-
|
|
|
- userAccountService.accountChange();
|
|
|
+ userAccountRecordDto.setTransAmount(musicSheetPurchaseRecord.getPurchasePrice());
|
|
|
+ userAccountRecordDto.setInOrOut(InOrOutEnum.IN);
|
|
|
+ userAccountRecordDto.setBizType(AccountBizTypeEnum.MUSIC);
|
|
|
+ userAccountRecordDto.setBizId(musicSheetPurchaseRecord.getMusicSheetId());
|
|
|
+ userAccountRecordDto.setBizName(userOrderDetailVo.getGoodName());
|
|
|
+ userAccountRecordDto.setOrderId(userOrderDetailVo.getOrderId());
|
|
|
+ userAccountService.accountChange(userAccountRecordDto);
|
|
|
}
|
|
|
|
|
|
private SysUser getSysUser(Long userId) {
|