refactor(pay): 优化 FIUU 支付回调逻辑

KKSU

2025-02-07 89db573c1b753ad197c2ce35430048ba4b18505d

refactor(pay): 优化 FIUU 支付回调逻辑

- 移除了支付成功后的重复代码块
- 调整了回调接口的处理流程，先验证支付状态再更新订单信息
- 优化了日志输出，提高了调试的便利性

 src/main/java/cc/mrbird/febs/pay/controller/FIUUController.java

@@ -145,15 +145,13 @@
        ValidateEntityUtils.ensureNotEqual(mallOrderInfo.getPayResult(), "1", "订单已支付");
        ValidateEntityUtils.ensureEqual(mallOrderInfo.getAmount().toString(), amount, "订单金额异常");
        // 更新订单状态
        if ("00".equals(status)) {
            mallOrderInfo.setPayMethod("FIUU支付");
            mallOrderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
            mallOrderInfo.setPayResult("1");
            mallOrderInfo.setPayTime(DateUtil.parseDateTime(paydate));
            mallOrderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
            mallOrderInfo.setPayOrderNo(tranID);
            mallOrderInfoMapper.updateById(mallOrderInfo);
        }
        mallOrderInfo.setPayMethod("FIUU支付");
        mallOrderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
        mallOrderInfo.setPayResult("1");
        mallOrderInfo.setPayTime(DateUtil.parseDateTime(paydate));
        mallOrderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
        mallOrderInfo.setPayOrderNo(tranID);
        mallOrderInfoMapper.updateById(mallOrderInfo);
    }

    // Java 通知接口 暂时停止使用
@@ -174,20 +172,19 @@
        String calculatedSkey = DigestUtils.md5Hex(paydate + domain + preSkey + secretKey);
        MallOrderInfo mallOrderInfo = ValidateEntityUtils
                .ensureColumnReturnEntity(orderId, MallOrderInfo::getId, mallOrderInfoMapper::selectOne, "订单不存在");
        log.info("callback status: {}", status);
        log.info("callback skey: {}", preSkey);
        log.info("callback calculatedSkey: {}", calculatedSkey);
        log.info("callback payResult: {}", mallOrderInfo.getPayResult());
        if("1".equals(mallOrderInfo.getPayResult())){
            return new FebsResponse().success().data("/pages/order/pay/paySuccess?amount="+ amount +"&type=3");
        }

        log.info("callback skey: {}", preSkey);
        log.info("callback calculatedSkey: {}", calculatedSkey);

        if (!calculatedSkey.equals(skey)) {
            throw new FebsException("订单回调失败，---"+orderId);
        }

        updateOrderStatus(orderId, status, amount, paydate, tranID);
        if ("00".equals(status)) {
            updateOrderStatus(orderId, status, amount, paydate, tranID);
            return new FebsResponse().success().data("/pages/order/pay/paySuccess?amount="+ amount +"&type=3");
        }else{
            return new FebsResponse().fail().message("支付失败");