修复bug

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

@@ -89,19 +89,12 @@ public class bootACourseController extends BaseController {
     @PostMapping("/getSiteList")
     public AjaxResult getSiteList(@RequestBody BeilvSite beilvSite) {
         beilvSite.setVenueId(8L);
-        UserMembershipCard userMembershipCard = new UserMembershipCard();
-        userMembershipCard.setUserId(beilvSite.getUserId());
-        userMembershipCard.setCardType(beilvSite.getSiteType());
-        userMembershipCard.setState("3");
         //获取会员卡集合
-        HashMap<String, Object> result = new HashMap<>();
-        result.put("cardList", userMembershipCardService.selectUserMembershipCardList(userMembershipCard));
         List<BeilvSite> beilvSites = siteService.selectBeilvSiteList(beilvSite);
         beilvSites.forEach(site->{
             site.setCoverList(new ArrayList<>(Arrays.asList(site.getCover().split(","))));
         });
-        result.put("siteList", beilvSites);
-        return AjaxResult.success(result);
+        return AjaxResult.success(beilvSites);
     }
 
     /**
@@ -109,14 +102,14 @@ public class bootACourseController extends BaseController {
      * 有返回会员卡信息集合
      * 没有返回空集合
      */
-    /*@PostMapping("/hasClubCard")
+    @PostMapping("/hasClubCard")
     public AjaxResult hasClubCard(@RequestBody BootACourseBO course) {
         UserMembershipCard userMembershipCard = new UserMembershipCard();
         userMembershipCard.setUserId(course.getUserId());
         userMembershipCard.setCardType(course.getTicketType());
         userMembershipCard.setState("3");
-        return AjaxResult.success();
-    }*/
+        return AjaxResult.success(userMembershipCardService.selectUserMembershipCardList(userMembershipCard));
+    }
 
     /**
      * 查询可购票的场次信息
@@ -170,6 +163,7 @@ public class bootACourseController extends BaseController {
             memberStream.setUserCardId(course.getClubCardId());
             memberStream.setType("0");
             memberStream.setOrderId(orderId);
+            memberStream.setCreateBy(course.getUserId());
 
             cardService.addStream(memberStream);
 

qmjszx-admin/src/main/java/beilv/web/controller/stadium/StadiumController.java

@@ -19,7 +19,7 @@ import java.util.Date;
 import java.util.List;
 
 @RestController
-@RequestMapping("/stadium")
+@RequestMapping("/app-api/stadium")
 public class StadiumController extends BaseController {
 
     @Autowired
@@ -31,13 +31,13 @@ public class StadiumController extends BaseController {
     /**
      * 查询赛事发布列表
      */
-    @PostMapping("/getCompetitionList")
+    @GetMapping("/getCompetitionList")
     @ResponseBody
     public AjaxResult getCompetitionList(Competition competition) {
         startPage();
         competition.setCompetitionState("competiton_state_2");
         List<Competition> list = competitionService.selectCompetitionList(competition);
-        return AjaxResult.success(list);
+        return AjaxResult.success(getDataTable(list));
     }
 
 

qmjszx-business/src/main/java/beilv/usermembershipcard/service/impl/UserMembershipCardServiceImpl.java

@@ -134,7 +134,6 @@ public class UserMembershipCardServiceImpl implements IUserMembershipCardService
         userMembershipCard.setRemainingNumber(Integer.valueOf(memberStream.getType()));
         userMembershipCardMapper.updateRemainingNumber(userMembershipCard);
         //增加流水
-        memberStream.setCreateBy(ShiroUtils.getUserId().toString());
         memberStream.setCreateTime(DateUtils.getNowDate());
         return userMembershipCardMapper.addStream(memberStream);
     }

qmjszx-business/src/main/resources/mapper/admissionticket/AdmissionTicketMapper.xml

@@ -60,6 +60,7 @@
         left join beilv_site bs on ts.site_id = bs.id
         <where>
             <if test="siteName != null and siteName != ''">and bs.name LIKE CONCAT('%', #{siteName}, '%')  </if>
+            <if test="siteId != null and siteId != ''">and bs.id = #{siteId}  </if>
             <if test="siteType != null and siteType != ''">and ts.site_type = #{siteType}</if>
             <if test="ticketDate != null ">and ts.ticket_date = #{ticketDate}</if>
             <if test="admissionTicketStatus != null  and admissionTicketStatus != ''">