|
@@ -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);
|
|
|
|