add SuppressWarnings

huanggang
1 parent 5562d990
Showing 3 changed files with 7 additions and 1 deletions
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/CardPaymentHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/RcbOnlineHttpClient.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/CashierPaymentServiceImpl.java
@@ -71,6 +71,7 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
             LOG.debug("Card payment response received: {}\n{}", request.getPaymentId(), result.responseText);
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             if ("200".equals(response.get("code"))) {
+                @SuppressWarnings("unchecked")
                 Map<String, Object> data = (Map<String, Object>) response.get("data");
                 String outTradeNo = (String) data.get("tradeId");
                 Map<String, Object> payerId = new LinkedHashMap<>();
@@ -273,6 +273,7 @@ public class RcbOnlineHttpClient extends ServiceEndpointSupport {
             StringBuilder traceNo = new StringBuilder();
             List<Object> results = stringRedisTemplate.executePipelined(new SessionCallback<Object>() {
                 @Override
+                @SuppressWarnings("unchecked")
                 public Object execute(@NonNull RedisOperations operations) throws DataAccessException {
                     operations.opsForValue().increment(key);
                     operations.expire(key, 36 * 60 * 60, TimeUnit.SECONDS);
@@ -120,7 +120,11 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                 TradeOrder trade = tradeAssistantService.findByTradeId(payment.getTradeId());
                 CashierType cashierType = CashierType.getByCode(trade.getType());
                 if (TradeState.isFinished(trade.getState())) {
-                    throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不能进行支付, 交易订单已经完成");
+                    if (TradeState.CLOSED.equalTo(trade.getState())) {
+                        throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "交易订单已关闭, 不能进行支付");
+                    } else {
+                        throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "交易订单已经完成, 不能进行支付");
+                    }
                 }
                 // 目前只支持小程序收银台，后期将支持其他收银台类型
                 if (cashierType != CashierType.MINIPRO) {