upgrade after testing

huanggang
1 parent 5e609a45
Showing 5 changed files with 29 additions and 25 deletions
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderToken.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderVO.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/CashierDeskServiceImpl.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/exception/DefaultExceptionHandler.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/CashierPaymentServiceImpl.java
@@ -35,13 +35,13 @@ public class CashierOrderToken {
             payload = payload + signature;
             return payload;
         }  catch (Exception ex) {
-            throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "Failed to generate order token");
+            throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "生成订单TOKEN失败");
         }
     }
     public static long decode(String token, SecretKeySpec secretKey) {
         if (token == null || token.length() <= Constants.TOKEN_SIGN_LENGTH) {
-            throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "Invalid order token");
+            throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "无效的订单TOKEN");
         }
         String payload = token.substring(0, token.length() - Constants.TOKEN_SIGN_LENGTH);
@@ -53,11 +53,11 @@ public class CashierOrderToken {
             byte[] bytes = mac.doFinal(payload.getBytes(StandardCharsets.UTF_8));
             tokenSign = HexUtils.encodeHexStr(bytes).substring(0, Constants.TOKEN_SIGN_LENGTH);
         } catch (Exception ex) {
-            throw new BossServiceException(ErrorCode.OPERATION_NOT_ALLOWED, "Invalid order token");
+            throw new BossServiceException(ErrorCode.OPERATION_NOT_ALLOWED, "无效的订单TOKEN");
         }
         if (!Objects.equals(signature, tokenSign)) {
-            throw new BossServiceException(ErrorCode.OPERATION_NOT_ALLOWED, "Invalid order token signature");
+            throw new BossServiceException(ErrorCode.OPERATION_NOT_ALLOWED, "无效的订单TOKEN");
         }
         return Base62Cipher.decodeLong(payload);
     }
@@ -5,6 +5,8 @@ import com.diligrp.cashier.pipeline.type.ChannelType;
 import java.util.List;
 public class CashierOrderVO {
+    // 交易号
+    private final String tradeId;
     // 业务系统用户标识
     private final String userId;
     // 商品描述
@@ -16,8 +18,9 @@ public class CashierOrderVO {
     // 支付通道
     private final List<PaymentPipeline> pipelines;
-    public CashierOrderVO(String userId, String goods, String amount,
+    public CashierOrderVO(String tradeId, String userId, String goods, String amount,
                           String redirectUrl, List<PaymentPipeline> pipelines) {
+        this.tradeId = tradeId;
         this.userId = userId;
         this.goods = goods;
         this.amount = amount;
@@ -25,6 +28,10 @@ public class CashierOrderVO {
         this.pipelines = pipelines;
     }
+    public String getTradeId() {
+        return tradeId;
+    }
+
     public String getUserId() {
         return userId;
     }
@@ -76,7 +76,7 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
         String tokenKey = String.format(Constants.TRADE_REDIS_KEY, tradeId);
         String payload = stringRedisTemplate.opsForValue().get(tokenKey);
         if (ObjectUtils.isEmpty(payload)) {
-            throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "TOKEN超时过期，不能完成支付");
+            throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "订单TOKEN超时过期，不能完成支付");
         }
         CashierOrderToken orderToken = CashierOrderToken.decodeCashierOrder(payload);
@@ -88,7 +88,8 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
         List<CashierOrderVO.PaymentPipeline> pipelineList = pipelines.stream().map(pipeline ->
             new CashierOrderVO.PaymentPipeline(pipeline.pipelineId(), pipeline.supportedChannel())).toList();
         String amount = CurrencyUtils.toNoSymbolCurrency(trade.getMaxAmount());
-        return new CashierOrderVO(orderToken.getUserId(), trade.getGoods(), amount, orderToken.getRedirectUrl(), pipelineList);
+        return new CashierOrderVO(orderToken.getTradeId(), orderToken.getUserId(), trade.getGoods(), amount,
+            orderToken.getRedirectUrl(), pipelineList);
     }
     /**
@@ -22,17 +22,18 @@ import java.util.stream.Collectors;
 @RestControllerAdvice
 public class DefaultExceptionHandler {
-    private final Logger LOG = LoggerFactory.getLogger(this.getClass());
+
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultExceptionHandler.class);
     @ExceptionHandler(PlatformServiceException.class)
     public Message<?> platformServiceException(PlatformServiceException ex) {
-        LOG.warn("assistant platform service exception", ex);
+        LOG.warn("cashier platform service exception", ex);
         return Message.failure(ex.getCode(), ex.getMessage());
     }
     @ExceptionHandler(IllegalArgumentException.class)
     public Message<?> illegalArgumentException(IllegalArgumentException ex) {
-        LOG.warn("assistant platform service exception", ex);
+        LOG.warn("cashier platform service exception", ex);
         return Message.failure(ErrorCode.ILLEGAL_ARGUMENT_ERROR, ex.getMessage());
     }
@@ -40,39 +41,33 @@ public class DefaultExceptionHandler {
     public Message<?> constraintViolationException(ConstraintViolationException exs) {
         Set<ConstraintViolation<?>> violations = exs.getConstraintViolations();
         String msg = violations.stream().map(ConstraintViolation::getMessage)
-                .collect(Collectors.joining(","));
+            .collect(Collectors.joining(","));
         return Message.failure(ErrorCode.ILLEGAL_ARGUMENT_ERROR, msg);
     }
     @ExceptionHandler(value = {MethodArgumentNotValidException.class, BindException.class})
-    public Message<?> methodArgumentNotValidException(Exception e) {
-        BindingResult bindingResult;
-        if (e instanceof MethodArgumentNotValidException) {
-            bindingResult = ((MethodArgumentNotValidException) e).getBindingResult();
-        } else {
-            bindingResult = ((BindException) e).getBindingResult();
-        }
+    public Message<?> methodArgumentNotValidException(BindException ex) {
+        BindingResult bindingResult = ex.getBindingResult();
         List<ObjectError> allErrors = bindingResult.getAllErrors();
         String msg = allErrors.stream().map(DefaultMessageSourceResolvable::getDefaultMessage)
-                .collect(Collectors.joining("、"));
+            .collect(Collectors.joining(","));
         return Message.failure(ErrorCode.ILLEGAL_ARGUMENT_ERROR, msg);
     }
     @ExceptionHandler(MissingServletRequestParameterException.class)
     public Message<?> missingServletRequestParameterExceptionHandler(MissingServletRequestParameterException ex) {
-        return Message.failure(ErrorCode.ILLEGAL_ARGUMENT_ERROR, String.format("缺少参数：%s", ex.getParameterName()));
+        return Message.failure(ErrorCode.ILLEGAL_ARGUMENT_ERROR, String.format("缺少参数: %s", ex.getParameterName()));
     }
     @ExceptionHandler({HttpRequestMethodNotSupportedException.class})
     public Message<?> handleRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException ex) {
-        return Message.failure(ErrorCode.METHOD_NOT_SUPPORTED_ERROR, "请求方式错误！");
+        return Message.failure(ErrorCode.METHOD_NOT_SUPPORTED_ERROR, "请求方式错误!");
     }
-
     @ExceptionHandler(Exception.class)
     public Message<?> defaultExceptionHandler(Exception ex) {
-        LOG.warn("assistant platform service exception", ex);
+        LOG.warn("cashier platform service exception", ex);
         return Message.failure(ErrorCode.SYSTEM_UNKNOWN_ERROR, ErrorCode.MESSAGE_UNKNOWN_ERROR);
     }
 }
@@ -345,8 +345,9 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
             .type(TradeType.REFUND).paymentId(refundId).channelId(payment.getChannelId())
             .payType(payment.getPayType()).pipelineId(payment.getPipelineId()).goods(payment.getGoods() + "-退款")
             .amount(request.getAmount()).objectId(payment.getPaymentId()).payerId(payment.getPayerId())
-            .finishTime(response.getWhen()).outTradeNo(response.getOutTradeNo()).outPayType(payment.getOutPayType())
-            .state(response.getState()).description(request.getDescription()).version(0).createdTime(now).modifiedTime(now).build();
+            .outTradeNo(response.getOutTradeNo()).outPayType(payment.getOutPayType()).finishTime(response.getWhen())
+            .state(response.getState()).notifyUrl(request.getNotifyUrl()).description(request.getDescription())
+            .version(0).createdTime(now).modifiedTime(now).build();
         onlinePaymentDao.insertOnlinePayment(refund);
         if (response.getState() == PaymentState.SUCCESS) {