add 增加关闭订单接口

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamOrderController.java

@@ -189,5 +189,11 @@ public class ExamOrderController extends BaseController {
         return msg;
     }
 
+    @ApiOperation(value = "/关闭订单")
+    @PostMapping("/closeOrder")
+    public HttpResponseResult closeOrder(String orderNo){
+        return succeed(examRegistrationPaymentService.closeOrder(orderNo));
+    }
+
 
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRegistrationPaymentService.java

@@ -60,4 +60,12 @@ public interface ExamRegistrationPaymentService extends BaseService<Long, ExamRe
      */
     void queryPaymentStatus() throws Exception;
 
+
+    /**
+     * 关闭支付中订单
+     * @param orderNo 订单编号
+     * @return
+     */
+    Boolean closeOrder(String orderNo);
+
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationPaymentServiceImpl.java

@@ -147,6 +147,21 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
         adaPayQuery();
     }
 
+    @Override
+    public Boolean closeOrder(String orderNo) {
+        ExamRegistrationPayment order = examRegistrationPaymentDao.getByOrderNo(orderNo);
+        if (!order.getTransStatus().equals(TransStatusEnum.ING)) {
+            throw new BizException("订单不是待支付状态,请重新报名");
+        }
+        Date nowDate = new Date();
+        order.setTransStatus(TransStatusEnum.CLOSE);
+        order.setUpdateTime(nowDate);
+        if (examRegistrationPaymentDao.update(order) <= 0) {
+            throw new BizException("订单关闭失败，请重试");
+        }
+        return true;
+    }
+
 
     private void yqPayQuery() throws Exception {
         List<ExamRegistrationPayment> orders = examRegistrationPaymentDao.getOrdersByStatus("ING", "YQPAY");

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -293,7 +293,6 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         }
         Date nowDate = new Date();
         order.setTransStatus(TransStatusEnum.CLOSE);
-        order.setCreateTime(nowDate);
         order.setUpdateTime(nowDate);
         examRegistrationPaymentService.update(order);
 
@@ -301,6 +300,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
 
         order.setId(null);
         order.setTransNo(null);
+        order.setCreateTime(nowDate);
         order.setTransStatus(TransStatusEnum.ING);
         order.setOrderNo(orderNo);
         examRegistrationPaymentService.insert(order);