会员购买

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AccountBizTypeEnum.java

@@ -16,6 +16,7 @@ public enum AccountBizTypeEnum implements BaseEnum<String, AccountBizTypeEnum> {
     VIDEO("视频课"),
     MUSIC("乐谱购买"),
     VIP("会员充值"),
+    SVIP("SVIP会员充值"),
     MALL("商品购买"),
     PIANO_ROOM("琴房充值"),
     ACTI_REGIST("活动报名"),
@@ -28,6 +29,7 @@ public enum AccountBizTypeEnum implements BaseEnum<String, AccountBizTypeEnum> {
     MUSIC_SHARE("乐谱分润"),
     ALBUM_SHARE("专辑分润"),
     VIP_SHARE("会员分润"),
+    SVIP_SHARE("会员分润"),
     MALL_SHARE("商品分润"),
     ACTI_REGIST_SHARE("活动报名分润"),
 

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

@@ -132,9 +132,9 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         orderCreateRes.setBizId(detail.getId());
         orderCreateRes.setBizContent("会员卡购买-" + detail.getPeriod().getMsg());
         orderCreateRes.setGoodNum(orderReqInfo.getGoodsNum());
-        orderCreateRes.setOriginalPrice(detail.getOriginalPrice());
+        orderCreateRes.setOriginalPrice(detail.getOriginalPrice().multiply(new BigDecimal(orderReqInfo.getGoodsNum())));
         orderCreateRes.setCouponAmount(couponAmount.multiply(new BigDecimal(orderReqInfo.getGoodsNum())));
-        orderCreateRes.setExpectPrice(detail.getSalePrice());
+        orderCreateRes.setExpectPrice(detail.getSalePrice().multiply(new BigDecimal(orderReqInfo.getGoodsNum())));
         orderCreateRes.setSourceType(SourceTypeEnum.PLATFORM);
         UserPaymentOrderWrapper.VipDays vipDays = new UserPaymentOrderWrapper.VipDays();
         vipDays.setVipEndDays(orderReqInfo.getVipEndDays());
@@ -170,7 +170,7 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         addVipCardRecord.setSendMsg(false);
         addVipCardRecord.setSourceType(SourceTypeEnum.ORDER);
         addVipCardRecord.setCreateBy(orderDetailVo.getUserId());
-        vipCardRecordService.addVip(addVipCardRecord);
+        vipCardRecordService.add(addVipCardRecord);
 
         //会员购买消息推送
         if (messageFlag) {
@@ -229,7 +229,7 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         addVipCardRecord.setSendMsg(false);
         addVipCardRecord.setCreateBy(userId);
         addVipCardRecord.setSourceType(SourceTypeEnum.ACTIVITY);
-        vipCardRecordService.addVip(addVipCardRecord);
+        vipCardRecordService.add(addVipCardRecord);
 
     }
 
@@ -385,9 +385,9 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         userOrderDetail.setBizId(detail.getId());
         userOrderDetail.setBizContent("会员卡购买-" + detail.getPeriod().getMsg());
         userOrderDetail.setGoodNum(orderGoodsInfo.getGoodNum());
-        userOrderDetail.setOriginalPrice(detail.getOriginalPrice());
+        userOrderDetail.setOriginalPrice(detail.getOriginalPrice().multiply(new BigDecimal(orderGoodsInfo.getGoodNum())));
         userOrderDetail.setCouponAmount(couponAmount.multiply(new BigDecimal(orderGoodsInfo.getGoodNum())));
-        userOrderDetail.setExpectPrice(detail.getSalePrice());
+        userOrderDetail.setExpectPrice(detail.getSalePrice().multiply(new BigDecimal(orderGoodsInfo.getGoodNum())));
         userOrderDetail.setActualPrice(userOrderDetail.getExpectPrice().subtract(couponAmount));
         orderGoodsInfo.setUserOrderDetail(userOrderDetail);