Merge remote-tracking branch 'origin/feature/1113-vipCourse' into feature/1113-vipCourse

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -1792,6 +1792,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             default:
                 break;
         }
+        userOrderDetail.setCouponAmount(BigDecimal.ZERO);
         userOrderDetail.setActualPrice(userOrderDetail.getExpectPrice());
 
         // 检查已经购买，抛出已购买异常
@@ -1811,7 +1812,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         }
         userOrderDetail.setAccountConfig(teacherService.teacherSettlementFrom(teacherId,orderGoodsInfo.getRecomUserId()).jsonString());
         // 存入缓存
-//        redisCacheService.saveUserAccountConfig(orderGoodsInfo.getSubOrderNo(), teacherService.teacherSettlementFrom(teacherId,orderGoodsInfo.getRecomUserId()).jsonString());
 
     }