Преглед изворни кода

[新增]增加取消支付接口

liying пре 7 година
родитељ
комит
d0d5863275

+ 6 - 2
src/main/java/com/example/cinema/bl/TicketService.java

@@ -1,5 +1,6 @@
 package com.example.cinema.bl;
 
+import com.example.cinema.po.Ticket;
 import com.example.cinema.vo.ResponseVO;
 import com.example.cinema.vo.TicketForm;
 
@@ -8,6 +9,7 @@ import com.example.cinema.vo.TicketForm;
  * Created by liying on 2019/4/16.
  */
 public interface TicketService {
+    ResponseVO addTicket(TicketForm ticketForm);
 
     ResponseVO completeTicket(int id);
 
@@ -15,7 +17,9 @@ public interface TicketService {
 
     ResponseVO getTicketByUser(int userId);
 
-    ResponseVO buyTicketByVIPCard(TicketForm ticketForm);
+    ResponseVO completeByVIPCard(int ticketId);
+
+    ResponseVO cancelTicket(int ticketId);
+
 
-    ResponseVO buyTicketByCash(TicketForm ticketForm);
 }

+ 27 - 15
src/main/java/com/example/cinema/blImpl/TicketServiceImpl.java

@@ -1,7 +1,6 @@
 package com.example.cinema.blImpl;
 
 import com.example.cinema.bl.TicketService;
-import com.example.cinema.bl.VIPService;
 import com.example.cinema.data.ScheduleMapper;
 import com.example.cinema.data.TicketMapper;
 import com.example.cinema.data.VIPCardMapper;
@@ -28,15 +27,25 @@ public class TicketServiceImpl implements TicketService {
     @Autowired
     ScheduleMapper scheduleMapper;
 
-    private TicketVO addTicket(TicketForm ticketForm) {
+    @Override
+    public ResponseVO addTicket(TicketForm ticketForm) {
+
         Ticket ticket = new Ticket();
         ticket.setUserId(ticketForm.getUserId());
         ticket.setScheduleId(ticketForm.getScheduleId());
         ticket.setColumnIndex(ticketForm.getColumnIndex());
         ticket.setRowIndex(ticketForm.getRowIndex());
         ticket.setState(0);
-        int id = ticketMapper.insertTicket(ticket);
-        return ticketMapper.selectTicketById(id).getVO();
+        try {
+            if(ticketMapper.selectTicketByScheduleIdAndSeat(ticketForm.getScheduleId(),ticketForm.getColumnIndex(),ticketForm.getRowIndex())!=null){
+                return ResponseVO.buildFailure("该位置已被占");
+            }
+            ticketMapper.insertTicket(ticket);
+            return ResponseVO.buildSuccess(ticket.getVO());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseVO.buildFailure("失败");
+        }
     }
 
     @Override
@@ -81,19 +90,20 @@ public class TicketServiceImpl implements TicketService {
 
     @Override
     @Transactional
-    public ResponseVO buyTicketByVIPCard(TicketForm ticketForm) {
+    public ResponseVO completeByVIPCard(int ticketId) {
         try {
-            VIPCard vipCard=vipCardMapper.selectCardByUserId(ticketForm.getUserId());
-            ScheduleItem scheduleItem=scheduleMapper.selectScheduleById(ticketForm.getScheduleId());
+            Ticket ticket=ticketMapper.selectTicketById(ticketId);
+            VIPCard vipCard = vipCardMapper.selectCardByUserId(ticket.getUserId());
+            ScheduleItem scheduleItem = scheduleMapper.selectScheduleById(ticket.getScheduleId());
             //todo 优惠券
-            double balance=vipCard.getBalance()-scheduleItem.getFare();
-            if(balance<0){
+            double balance = vipCard.getBalance() - scheduleItem.getFare();
+            if (balance < 0) {
                 return ResponseVO.buildFailure("会员卡余额不足");
             }
-            vipCardMapper.updateCardBalance(vipCard.getId(),balance);
-            TicketVO vos=addTicket(ticketForm);
-            completeTicket(vos.getId());
-            return ResponseVO.buildSuccess(vos);
+            vipCardMapper.updateCardBalance(vipCard.getId(), balance);
+            completeTicket(ticketId);
+            ticket.setState(1);
+            return ResponseVO.buildSuccess(ticket.getVO());
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseVO.buildFailure("失败");
@@ -101,13 +111,15 @@ public class TicketServiceImpl implements TicketService {
     }
 
     @Override
-    public ResponseVO buyTicketByCash(TicketForm ticketForm) {
+    public ResponseVO cancelTicket(int ticketId) {
         try {
-            return ResponseVO.buildSuccess(addTicket(ticketForm));
+            ticketMapper.updateTicketState(ticketId, 2);
+            return ResponseVO.buildSuccess(ticketMapper.selectTicketById(ticketId).getVO());
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseVO.buildFailure("失败");
         }
     }
 
+
 }

+ 15 - 6
src/main/java/com/example/cinema/controller/TicketController.java

@@ -17,17 +17,21 @@ public class TicketController {
     TicketService ticketService;
 
     @PostMapping("/vip/buy")
-    public ResponseVO buyTicketByVIPCard(@RequestBody TicketForm ticketForm){
-        return ticketService.buyTicketByVIPCard(ticketForm);
+    public ResponseVO buyTicketByVIPCard(@RequestParam int ticketId){
+        return ticketService.completeByVIPCard(ticketId);
     }
 
+    @PostMapping("/lockSeat")
+    public ResponseVO lockSeat(@RequestBody TicketForm ticketForm){
+        return ticketService.addTicket(ticketForm);
+    }
     @PostMapping("/buy")
-    public ResponseVO buyTicket(@RequestBody TicketForm ticketForm){
-        return ticketService.buyTicketByCash(ticketForm);
+    public ResponseVO buyTicket(@RequestParam int ticketId){
+        return ticketService.completeTicket(ticketId);
     }
 
     @PostMapping("/{ticketId}/complete")
-    public ResponseVO completeOrder (int ticketId){
+    public ResponseVO completeOrder (@PathVariable  int ticketId){
         return ticketService.completeTicket(ticketId);
     }
 
@@ -37,9 +41,14 @@ public class TicketController {
     }
 
     @GetMapping("/get/occupiedSeats")
-    public ResponseVO getOccupiedSeats(@PathVariable int scheduleId){
+    public ResponseVO getOccupiedSeats(@RequestParam int scheduleId){
         return ticketService.getBySchedule(scheduleId);
     }
+    @PostMapping("/cancel")
+    public ResponseVO cancelTicket(@RequestParam int ticketId){
+        return ticketService.cancelTicket(ticketId);
+    }
+
 
 
 

+ 1 - 0
src/main/java/com/example/cinema/data/TicketMapper.java

@@ -26,3 +26,4 @@ public interface TicketMapper {
 
     List<Ticket> selectTicketByUser(int userId);
 }
+

+ 3 - 3
src/main/java/com/example/cinema/data/TicketMapper.xml

@@ -12,11 +12,11 @@
     </select>
 
     <select id="selectTicketsBySchedule" resultMap="Ticket">
-        select * from ticket where scheduleId=#{schedule_id}
+        select * from ticket where schedule_id=#{scheduleId} and state!=2
     </select>
 
     <select id="selectTicketByScheduleIdAndSeat" resultMap="Ticket">
-        select * from ticket where schedule_id=#{scheduleId} and column_index=#{column} and row_index=#{row}
+        select * from ticket where schedule_id=#{scheduleId} and column_index=#{column} and row_index=#{row} and state!=2
     </select>
 
     <select id="selectTicketByUser" resultMap="Ticket">
@@ -25,7 +25,7 @@
 
 
     <update id="updateTicketState" >
-        update ticket set state = #{state} where ticket_id=#{ticketId}
+        update ticket set state = #{state} where id=#{ticketId}
     </update>
 
     <delete id="deleteTicket">

+ 11 - 7
src/main/java/com/example/cinema/po/Ticket.java

@@ -30,7 +30,7 @@ public class Ticket {
 
     /**
      * 订单状态:
-     * 0:未完成 1:已完成
+     * 0:未完成 1:已完成 2:已失效
      */
     private int state;
 
@@ -38,28 +38,32 @@ public class Ticket {
     }
 
 
-    public TicketVO getVO(){
-        TicketVO vo=new TicketVO();
+    public TicketVO getVO() {
+        TicketVO vo = new TicketVO();
         vo.setRowIndex(this.getRowIndex());
         vo.setColumnIndex(this.getColumnIndex());
         vo.setScheduleId(this.getScheduleId());
         vo.setId(this.getId());
         vo.setUserId(this.getUserId());
         String stateString;
-        switch (state){
+        switch (state) {
             case 0:
-                stateString="未完成";
+                stateString = "未完成";
                 break;
             case 1:
-                stateString="已完成";
+                stateString = "已完成";
+                break;
+            case 2:
+                stateString = "已失效";
                 break;
             default:
-                stateString="未完成";
+                stateString = "未完成";
         }
         vo.setState(stateString);
         return vo;
 
     }
+
     public int getId() {
         return id;
     }