小程序增加返回值.

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

@@ -5,24 +5,29 @@ import beilv.admissionticket.service.IAdmissionTicketService;
 import beilv.bootacourse.domain.BootACourse;
 import beilv.bootacourse.domain.BootACourseBO;
 import beilv.bootacourse.service.IBootACourseService;
+import beilv.common.constant.PriceOptions;
 import beilv.common.core.controller.BaseController;
 import beilv.common.core.domain.AjaxResult;
 import beilv.common.core.page.PageDomain;
 import beilv.common.core.page.TableSupport;
 import beilv.common.utils.DictUtils;
+import beilv.common.utils.StringUtils;
 import beilv.common.utils.uuid.IdUtils;
 import beilv.site.domain.BeilvSite;
 import beilv.site.service.IBeilvSiteService;
 import beilv.system.domain.SysNotice;
+import beilv.system.service.ISysConfigService;
 import beilv.usermembershipcard.domain.MemberStream;
 import beilv.usermembershipcard.domain.UserMembershipCard;
 import beilv.usermembershipcard.service.IUserMembershipCardService;
+import beilv.vipCard.service.IVipCardService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -42,6 +47,11 @@ public class bootACourseController extends BaseController {
     @Autowired
     private IUserMembershipCardService userMembershipCardService;
 
+    @Autowired
+    private ISysConfigService configService;
+    @Autowired
+    private IVipCardService vipCardService;
+
     /**
      * 查询球馆列表
      */
@@ -110,6 +120,18 @@ public class bootACourseController extends BaseController {
 //        admissionTicket.setAdmissionTicketStatus("0");
         //查询可用时段
         List<AdmissionTicket> admissionTickets = ticketService.selectBeilvAdmissionTicketList(admissionTicket);
+        Map<String, String> siteType = DictUtils.getDictCacheToMap("site_type");
+
+        String vipLevel = vipCardService.selectVipCardByUserId(admissionTicket.getUserId()).getVipLevel();
+        //查询会员折扣
+        BigDecimal coefficient = BigDecimal.valueOf(Double.parseDouble(StringUtils.isEmpty(configService.selectConfigByKey(vipLevel))? "1" : configService.selectConfigByKey(vipLevel)));
+
+
+        admissionTickets.forEach(ticket->{
+            ticket.setTicketPrice(new PriceOptions(ticket.getPrice(),coefficient));
+            ticket.setSiteTypeLabel(MapUtils.getString(siteType, ticket.getSiteType()));
+        });
+
         return AjaxResult.success(admissionTickets);
     }
 

qmjszx-business/src/main/java/beilv/admissionticket/domain/AdmissionTicket.java

@@ -1,5 +1,6 @@
 package beilv.admissionticket.domain;
 
+import beilv.common.constant.PriceOptions;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -30,6 +31,7 @@ public class AdmissionTicket {
      * 场地类型
      */
     private String siteType;
+    private String siteTypeLabel;
     /**
      * 场地时段
      */
@@ -38,6 +40,9 @@ public class AdmissionTicket {
      * 时段价格
      */
     private BigDecimal price;
+
+    private PriceOptions ticketPrice;
+
     /**
      * 日期
      */
@@ -53,6 +58,8 @@ public class AdmissionTicket {
      */
     private String venueName;
 
+    private String userId;
+
     /**
      * 排序
      */

qmjszx-business/src/main/resources/mapper/card/UserMembershipCardMapper.xml

@@ -55,6 +55,7 @@
         left join card_information c on a.card_info_id = c.id
         <where>
             <if test="userId != null  and userId != ''">and a.user_id = #{userId}</if>
+            <if test="cardType != null  and cardType != ''">and c.type = #{cardType}</if>
             <if test="recordId != null  and recordId != ''">and a.record_id = #{recordId}</if>
             <if test="remainingNumber != null ">and a.remaining_number = #{remainingNumber}</if>
             <if test="version != null  and version != ''">and a.version = #{version}</if>