wlzboy
3 天以前 40a8157440e3b906da8f52e07d939d78c3f4c313
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskPaymentServiceImpl.java
@@ -82,9 +82,9 @@
        SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
        BigDecimal transferPrice = emergencyInfo != null && emergencyInfo.getTransferPrice() != null 
                                   ? emergencyInfo.getTransferPrice() : BigDecimal.ZERO;
        task.setEmergencyInfo(emergencyInfo);
        // 获取任务基本信息
        String taskCode = task.getTaskCode();
        String taskCode = task.getShowTaskCode();
        String taskType = task.getTaskType();
        
        // 获取车辆信息
@@ -146,7 +146,6 @@
    }
    
    @Override
    @Transactional
    public BigDecimal addAdditionalFee(Long taskId, String feeType, String feeName, 
                                      BigDecimal unitAmount, Integer quantity, String remark) {
        // 验证参数
@@ -185,14 +184,13 @@
    }
    
    @Override
    @Transactional
    public BigDecimal removeAdditionalFee(Long taskId, Long feeId) {
        additionalFeeMapper.deleteById(feeId);
        return calculateAdditionalAmount(taskId);
    }
    
    @Override
    @Transactional
    public TaskPaymentResultVO createPayment(TaskPaymentCreateVO createVO) {
        Long taskId = createVO.getTaskId();
        String paymentMethod = createVO.getPaymentMethod();
@@ -213,7 +211,9 @@
        
        // 查询任务编号
        SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
        String taskCode = task.getTaskCode();
        SysTaskEmergency emergency=sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
        task.setEmergencyInfo(emergency);
        String taskCode = task.getShowTaskCode();
        
        // 生成商户订单号: {taskCode}-{timestampMillis}
        String outTradeNo = taskCode + "-" + System.currentTimeMillis();
@@ -262,6 +262,7 @@
            
            // 生成回调地址
            String callbackUrl = callbackBaseUrl + "/payment/callback/" + provider.toLowerCase();
            payment.setCallbackUrl(callbackUrl);
            
            try {
@@ -361,7 +362,7 @@
    }
    
    @Override
    @Transactional
    public boolean handlePaymentCallback(String outTradeNo, String tradeNo, String provider) {
        log.info("收到支付回调:outTradeNo={}, tradeNo={}, provider={}", outTradeNo, tradeNo, provider);