|
|
@@ -20,10 +20,12 @@ import beilv.system.service.ISysConfigService;
|
|
|
import beilv.usermembershipcard.domain.MemberStream;
|
|
|
import beilv.usermembershipcard.domain.UserMembershipCard;
|
|
|
import beilv.usermembershipcard.service.IUserMembershipCardService;
|
|
|
+import beilv.vipCard.domain.VipCard;
|
|
|
import beilv.vipCard.service.IVipCardService;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import org.apache.commons.collections4.MapUtils;
|
|
|
+import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
@@ -122,10 +124,14 @@ public class bootACourseController extends BaseController {
|
|
|
List<AdmissionTicket> admissionTickets = ticketService.selectBeilvAdmissionTicketList(admissionTicket);
|
|
|
Map<String, String> siteType = DictUtils.getDictCacheToMap("site_type");
|
|
|
|
|
|
- String vipLevel = vipCardService.selectVipCardByUserId(admissionTicket.getUserId()).getVipLevel();
|
|
|
+ //查询会员等级
|
|
|
+ String vipLevel = null;
|
|
|
+ VipCard vipCard = vipCardService.selectVipCardByUserId(admissionTicket.getUserId());
|
|
|
+ if (ObjectUtils.isNotEmpty(vipCard)) {
|
|
|
+ vipLevel = vipCard.getVipLevel();
|
|
|
+ }
|
|
|
//查询会员折扣
|
|
|
- BigDecimal coefficient = BigDecimal.valueOf(Double.parseDouble(StringUtils.isEmpty(configService.selectConfigByKey(vipLevel))? "1" : configService.selectConfigByKey(vipLevel)));
|
|
|
-
|
|
|
+ BigDecimal coefficient = BigDecimal.valueOf(Double.parseDouble(StringUtils.isEmpty(vipLevel) ? "1" : configService.selectConfigByKey(vipLevel)));
|
|
|
|
|
|
admissionTickets.forEach(ticket->{
|
|
|
ticket.setTicketPrice(new PriceOptions(ticket.getPrice(),coefficient));
|