cashierdesk / dili-cashier · Commits

Commit a213767f40e418c3538c8b74e67ab2df068ed4b2

Authored by huanggang
1 parent 5562d990
build: skipped

add SuppressWarnings

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