check trade order api supported

huanggang
1 parent ea0f8e2c
Showing 6 changed files with 41 additions and 2 deletions
cashier-boss/src/main/java/com/diligrp/cashier/boss/controller/CashierDeskController.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/ICashierDeskService.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/CashierDeskServiceImpl.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/ICashierPaymentService.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/CashierPaymentServiceImpl.java
scripts/cashier-data.sql
@@ -53,6 +53,12 @@ public class CashierDeskController {
         return Message.success(cashierDeskService.getCashierOrderByToken(token));
     }
+    @RequestMapping("/checkOrder")
+    public Message<?> checkOrder(@RequestParam("tradeId") String tradeId) {
+        cashierDeskService.checkTradeOrder(tradeId);
+        return Message.success();
+    }
+
     @RequestMapping("/orderPayment")
     public Message<?> orderPayment(@RequestBody CashierPayment request) {
         // 基本参数校验
@@ -24,6 +24,11 @@ public interface ICashierDeskService {
     CashierOrderVO getCashierOrderByToken(String token);
     /**
+     * 检查交易订单是否能进行支付
+     */
+    void checkTradeOrder(String tradeId);
+
+    /**
      * 提交收银台支付
      *
      * @param payment - 支付信息
@@ -98,6 +98,11 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
             trade.getGoods(), trade.getMaxAmount(), orderToken.getRedirectUrl(), pipelineList);
     }
+    @Override
+    public void checkTradeOrder(String tradeId) {
+        cashierPaymentService.checkTradeOrder(tradeId);
+    }
+
     /**
      * 提交收银台支付
      *
@@ -17,6 +17,11 @@ public interface ICashierPaymentService {
     String doSubmit(Merchant merchant, CashierOrder cashierOrder);
     /**
+     * 检查交易订单是否能进行支付
+     */
+    void checkTradeOrder(String tradeId);
+
+    /**
      * 收银台支付
      *
      * @param cashierPayment - 支付信息
@@ -38,7 +43,7 @@ public interface ICashierPaymentService {
     void closeTradeOrder(String tradeId);
     /**
-     * 查询交易订单状态
+     * 查询支付状态
      */
     OnlinePaymentResult queryPaymentState(String paymentId, String mode);
@@ -103,6 +103,24 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
         return tradeId;
     }
+    @Override
+    public void checkTradeOrder(String tradeId) {
+        TradeOrder tradeOrder = tradeAssistantService.findByTradeId(tradeId);
+        if (TradeState.PENDING.equalTo(tradeOrder.getState())) {
+            return;
+        }
+
+        if (TradeState.SUCCESS.equalTo(tradeOrder.getState()) || TradeState.REFUND.equalTo(tradeOrder.getState())) {
+            throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "订单已交易成功，不能重复支付");
+        }
+        if (TradeState.FAILED.equalTo(tradeOrder.getState())) {
+            throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "订单已完成，不能进行支付");
+        }
+        if (TradeState.CLOSED.equalTo(tradeOrder.getState())) {
+            throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "订单已关闭，不能进行支付");
+        }
+    }
+
     /**
      * 收银台支付
      *
@@ -13,7 +13,7 @@ VALUES (1001, 10014, 29, 2, &#39;微信支付&#39;, &#39;https://epos.ahrcu.com:3443&#39;, &#39;{&quot;me
 -- 中瑞园区卡支付通道, 根据环境配置不同的参数(服务地址、回调地址等)
 INSERT INTO `dili_cashier`.upay_payment_pipeline(mch_id, pipeline_id, channel_id, type, name, uri, param, state, created_time, modified_time)
-VALUES (1001, 10012, 19, 2, '园区卡支付', 'https://gateway.zr.zrgyl.com/pay-service', '{"outMchId": 9, "accountId": 118924}', 1, now(), now());
+VALUES (1001, 10012, 19, 2, '园区卡支付', 'https://gateway.zr.zrgyl.com/pay-service', '{"outMchId": 9, "accountId": 133005}', 1, now(), now());
 -- 高斯智达微信支付直连通道, 根据环境配置不同的参数(服务地址、回调地址等)
 -- INSERT INTO `dili_cashier`.upay_payment_pipeline(mch_id, pipeline_id, channel_id, type, name, uri, param, state, created_time, modified_time)