1

qmjszx-admin/src/main/java/beilv/web/controller/competition/CompetitionController.java

@@ -43,7 +43,6 @@ public class CompetitionController extends BaseController {
     /**
      * 查询赛事发布列表
      */
-    @RequiresPermissions("system:competition:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(Competition competition) {

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

@@ -3,8 +3,10 @@ package beilv.web.controller.stadium;
 import beilv.common.core.controller.BaseController;
 import beilv.common.core.domain.AjaxResult;
 import beilv.common.core.page.TableDataInfo;
+import beilv.common.utils.StringUtils;
 import beilv.common.utils.uuid.IdUtils;
 import beilv.competition.domain.Competition;
+import beilv.competition.service.ICompetitionService;
 import beilv.stadium.domain.Stadium;
 import beilv.stadium.domain.StadiumBO;
 import beilv.stadium.service.IStadiumService;
@@ -23,16 +25,36 @@ public class StadiumController extends BaseController {
     @Autowired
     private IStadiumService stadiumService;
 
+    @Autowired
+    private ICompetitionService competitionService;
+
+    /**
+     * 查询赛事发布列表
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public AjaxResult list(Competition competition) {
+        startPage();
+        competition.setCompetitionState("competiton_state_2");
+        List<Competition> list = competitionService.selectCompetitionList(competition);
+        return AjaxResult.success(list);
+    }
 
 
     /**
      * 添加订单
      * 写入订单信息: 下单人id, 订单编号, 下单时间, 支付状态:待支付
      * 调用者传递参数: 用户id, 联系人, 联系电话, 赛事id, 订单类型,
+     * return orderId  订单id
      */
     @PostMapping("/toBeStadium")
     public AjaxResult addStadium(@RequestBody Stadium stadium) {
-        return toAjax(stadiumService.toBeStadium(stadium));
+        String orderId = stadiumService.toBeStadium(stadium);
+        if (StringUtils.isNotEmpty(orderId)) {
+            return AjaxResult.success("下单成功",orderId);
+        } else {
+            return AjaxResult.error("下单失败");
+        }
     }
 
     /**
@@ -41,7 +63,7 @@ public class StadiumController extends BaseController {
      * 注:  取消订单时在下单后没有支付时, 可以执行的操作. 如果已经支付了, 则需要调用申请退款接口
      */
     @PostMapping("/cancellStadium")
-    public AjaxResult cancellStadium(@RequestBody Stadium stadium){
+    public AjaxResult cancellStadium(@RequestBody Stadium stadium) {
         return toAjax(stadiumService.cancellStadium(stadium));
     }
 
@@ -50,7 +72,8 @@ public class StadiumController extends BaseController {
      * 调用者传递参数: 用户id, 订单状态, 订单类型
      */
     @GetMapping("/getStadiumList")
-    public AjaxResult getStadiumList(StadiumBO stadiumBO){
+    public AjaxResult getStadiumList(StadiumBO stadiumBO) {
+        startPage();
         return AjaxResult.success(stadiumService.getStadiumList(stadiumBO));
     }
 
@@ -59,7 +82,7 @@ public class StadiumController extends BaseController {
      * 调用着传递: 订单编号, 支付状态
      */
     @PostMapping("/havePaidStadium")
-    public AjaxResult havePaidStadium(@RequestBody Stadium stadium){
+    public AjaxResult havePaidStadium(@RequestBody Stadium stadium) {
         return toAjax(stadiumService.havePaidStadium(stadium));
     }
 
@@ -68,24 +91,25 @@ public class StadiumController extends BaseController {
      * 调用者传递参数: 订单id, 用户id
      */
     @PostMapping("/refundStadium")
-    public AjaxResult refundStadium(@RequestBody Stadium stadium){
+    public AjaxResult refundStadium(@RequestBody Stadium stadium) {
         return toAjax(stadiumService.refundStadium(stadium));
     }
 
     /**
      * 支付验证
      * 支付之前调用方法, 检测是否可以进行支付
+     *
      * @return Boolean  true: 可以支付; false: 不可以支付
      */
     @PostMapping("/paymentVerification")
-    public Boolean paymentVerification(@RequestBody Stadium stadium){
+    public Boolean paymentVerification(@RequestBody Stadium stadium) {
         return stadiumService.paymentVerification(stadium);
     }
 
     /**
      * 查询购票记录
      */
-    @PostMapping("/getTakePartList")
+    /*@PostMapping("/getTakePartList")
     @ResponseBody
     public TableDataInfo getTakePartList(Stadium stadium) {
         startPage();
@@ -93,15 +117,16 @@ public class StadiumController extends BaseController {
         List<Stadium> stadiumList = stadiumService.getTakePartList(stadium);
         return getDataTable(stadiumList);
     }
-
+*/
     /**
      * 针对某个购票记录进行退票处理
-     * @param id 购票记录id
+     *
+     * @param orderId 购票记录id
      * @return
      */
-    @GetMapping("/close")
+    @GetMapping("/close/{orderId}")
     @ResponseBody
-    public AjaxResult closeStadiumById(String id){
-        return toAjax(stadiumService.closeStadiumById(id));
+    public AjaxResult closeStadiumById(@PathVariable("orderId") String orderId) {
+        return toAjax(stadiumService.closeStadiumById(orderId));
     }
 }

qmjszx-business/src/main/java/beilv/stadium/service/IStadiumService.java

@@ -7,7 +7,7 @@ import beilv.stadium.domain.StadiumBO;
 import java.util.List;
 
 public interface IStadiumService {
-    int toBeStadium(Stadium stadium);
+    String toBeStadium(Stadium stadium);
 
     int cancellStadium(Stadium stadium);
 
@@ -21,5 +21,5 @@ public interface IStadiumService {
 
     List<Stadium> getTakePartList(Stadium stadium);
 
-    int closeStadiumById(String id);
+    int closeStadiumById(String orderId);
 }

qmjszx-business/src/main/java/beilv/stadium/service/impl/StadiumServiceImpl.java

@@ -31,14 +31,21 @@ public class StadiumServiceImpl implements IStadiumService {
     private final static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @Override
-    public int toBeStadium(Stadium stadium) {
-        //设置订单状态为 待支付
-        stadium.setPaymentStatus(DAI_ZHI_FU);
-        //设置下单时间为当前时间
-        stadium.setRegistrationTime(simpleDateFormat.format(new Date()));
-        //生成订单编号
-        stadium.setOrderId(IdUtils.fastSimpleUUID());
-        return stadiumMapper.toBeStadium(stadium);
+    public String toBeStadium(Stadium stadium) {
+        try{
+            String orderId = IdUtils.fastSimpleUUID();
+            //设置订单状态为 待支付
+            stadium.setPaymentStatus(DAI_ZHI_FU);
+            //设置下单时间为当前时间
+            stadium.setRegistrationTime(simpleDateFormat.format(new Date()));
+            //生成订单编号
+            stadium.setOrderId(orderId);
+            stadiumMapper.toBeStadium(stadium);
+            return orderId;
+        }catch (Exception e){
+            return "";
+        }
+
     }
 
     @Override
@@ -100,12 +107,12 @@ public class StadiumServiceImpl implements IStadiumService {
     }
 
     @Override
-    public int closeStadiumById(String id) {
+    public int closeStadiumById(String orderId) {
         //发起退票
 
         //修改购票状态
         Stadium stadium = new Stadium();
-        stadium.setId(Long.parseLong(id));
+        stadium.setOrderId(orderId);
         stadium.setRefundInstructions("商家发起退款");
         //设置订单状态
         stadium.setPaymentStatus("payment_status_refunded");

qmjszx-business/src/main/resources/mapper/stadium/StadiumMapper.xml

@@ -74,7 +74,7 @@
 
     <select id="getStadimList" parameterType="stadiumBO" resultMap="StadiumResult">
         select
-            user_id, contact_perple, contact_number, registration_time, payment_time,
+            id, user_id, contact_perple, contact_number, registration_time, payment_time,
             cancellation_time, refund_time, payment_status, order_id, competition_id, order_type, refund_instructions
         from beilv_book_a_race
         <where>
@@ -85,7 +85,7 @@
                 and order_type = #{orderType}
             </if>
             <if test="paymentStatus != null and paymentStatus != ''">
-                and paymen_status = #{paymentStatus}
+                and payment_status = #{paymentStatus}
             </if>
         </where>
     </select>