Просмотр исходного кода

修改查询可购票的场次信息报错问题

bihs 1 неделя назад
Родитель
Сommit
e162d1d5cb

+ 9 - 3
qmjszx-admin/src/main/java/beilv/web/controller/bootacourse/bootACourseController.java

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

+ 2 - 2
qmjszx-admin/src/main/resources/application.yml

@@ -164,9 +164,9 @@ wx:
     publicKeyId: PUB_KEY_ID_0117303822532025111100191793000600
     appSecret: 228a6905484fbf9c3e571962c92c7e7e
     # 异步通知地址(必需)
-    notifyUrl: http://p9d766c9.natappfree.cc/app/pay/notify
+    notifyUrl: http://h97c8a82.natappfree.cc/app/pay/notify
     # 退款异步通知地址
-    refundNotifyUrl: http://p9d766c9.natappfree.cc/app/notify/refund
+    refundNotifyUrl: http://h97c8a82.natappfree.cc/app/notify/refund
 # 海康获取直播视频流配置
 hik:
   appKey: "28356728"