增加乐器采购清单确认接口

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -101,7 +101,7 @@ public class StudentOrderController extends BaseController {
         msg.setMsg("fail");
         Map<String, String> notifyMap = new HashMap<>();
         //if (rs) {
-            notifyMap = JSON.parseObject(msg.getResponseParameters(), Map.class);
+        notifyMap = JSON.parseObject(msg.getResponseParameters(), Map.class);
         //}
         //支付中订单存在，更新状态
         if (msg.getResponseType().equals("1") && notifyMap.size() > 0) {
@@ -132,8 +132,8 @@ public class StudentOrderController extends BaseController {
 
     @ApiOperation(value = "台牌支付")
     @PostMapping("/executePayment")
-    public Object executePayment(BigDecimal amount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody, String sign) throws Exception {
-        String payChannel = PayChannelEnum.ALIPAY_QR.getCode();
+    public Object executePayment(BigDecimal amount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody, String payChannel, String sign) throws Exception {
+        payChannel = PayChannelEnum.ALIPAY_QR.getCode();
 //        if (!new Pay().verifySign(amount, orderNo, notifyUrl, orderSubject, orderBody,sign)) {
 //            return failed("签名验证失败");
 //        }
@@ -169,10 +169,10 @@ public class StudentOrderController extends BaseController {
 
         RsqMsg rsqMsg = new RsqMsg(requestMap);
 
-       Msg queryRs = yqQueryService.orderQuery(rsqMsg);
+        Msg queryRs = yqQueryService.orderQuery(rsqMsg);
 
-       logger.info("查询易乾结果" +queryRs.toString());
-       //logger.info("查询易乾结果" + queryRs.toString());
+        logger.info("查询易乾结果" + queryRs.toString());
+        //logger.info("查询易乾结果" + queryRs.toString());
         if (queryRs.getCode().equals("88")) {
             //更新订单状态
             String[] statusArr = {"0", "1", "7"};
@@ -200,7 +200,7 @@ public class StudentOrderController extends BaseController {
 
         if (status.equals(DealStatusEnum.SUCCESS)) {
             order.setPayTime(new Date());
-        }else {
+        } else {
             order.setMemo(rpMap.get("remarks"));
         }
         order.setStatus(status);
@@ -226,7 +226,7 @@ public class StudentOrderController extends BaseController {
         beforeTime.add(Calendar.MINUTE, -30);// 30分钟之前的时间
         Date beforeDate = beforeTime.getTime();
 
-        List<StudentPaymentOrder> ordersOverTime = studentPaymentOrderService.findOrdersOverTime(orderNoList,DealStatusEnum.ING,beforeDate);
+        List<StudentPaymentOrder> ordersOverTime = studentPaymentOrderService.findOrdersOverTime(orderNoList, DealStatusEnum.ING, beforeDate);
         for (StudentPaymentOrder order : ordersOverTime) {
             order.setStatus(DealStatusEnum.FAilED);
             order.setMemo("超时未支付关闭");
@@ -241,5 +241,35 @@ public class StudentOrderController extends BaseController {
 
     }
 
+    @Scheduled(cron = "0/5 * * * * ?")
+    public void adaPayQuery() throws Exception {
+        List<StudentPaymentOrder> payingOrders = studentPaymentOrderService.findOrdersByStatus(DealStatusEnum.ING, "ADAPAY");
+
+        List<String> orderNoList = new ArrayList<String>();
+
+        for (StudentPaymentOrder payingOrder : payingOrders) {
+            if (payingOrder.getTransNo() == null) {
+                orderNoList.add(payingOrder.getOrderNo());
+                continue;
+            }
+            Payment payment = new Pay().queryPayment(payingOrder.getTransNo());
+            Map<String, String> rpMap = new HashMap<>();
+            rpMap.put("merOrderNo", payingOrder.getOrderNo());
+            rpMap.put("remarks", payment.getReason());
+            rpMap.put("orderNo", payment.getId());
+            rpMap.put("channelType", payment.getPayChannel());
+            if (payment.getStatus().equals("succeeded")) {
+                rpMap.put("tradeState", "1");
+            }
+            if (payment.getStatus().equals("failed")) {
+                rpMap.put("tradeState", "0");
+            }
+            if (payment.getStatus().equals("pending")) {
+                orderNoList.add(payingOrder.getOrderNo());
+            }
+        }
+        closeOrders(orderNoList);
+    }
+
 
 }