Skip to content
[Jenkins]Jenkins
log in

Changes

Summary

  1. 优化支付流程 (details)
  2. 接下来是回调的时候更改订单状态以及支付平台费用 (details)
  3. 完毕支付流程，接下来修改回调功能，以解决非预期情况的异常处理 (details)
  4. 支付 (details)
  5. 补偿平台费用 (details)
  6. 自动补偿平台费用 (details)
  7. 自动重试支付 (details)
Commit c82a55e73bfce2a19c692c7072fac447c90667d5 by linhancheng
优化支付流程
The file was modified src/mer_java/crmeb-front/pom.xml
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/exception/CrmebWalletException.java
The file was addedsrc/mer_java/crmeb-payment/pom.xml
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/exception/CrmebException.java
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/snapshots/PaymentTransferSnapshot.java
The file was addedsrc/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/components/RetryProvider.java
The file was addedsrc/mer_java/crmeb-bcxCore/pom.xml
The file was addedsrc/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/exceptions/CoreExceptionAbstract.java
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderImpl_WS.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/OrderDetailService.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/PaymentProvider.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/CommonWalletServiceImpl.java
The file was addedsrc/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/LockConstant.java
The file was modified src/mer_java/crmeb-service/pom.xml
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/IocResolve.java
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderAbstract.java
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/services/WalletPaymentServiceImpl.java
The file was addedsrc/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/exceptions/IgnoreCoreException.java
The file was addedsrc/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/exceptions/BadCoreException.java
The file was addedsrc/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/exceptions/RetryableCoreException.java
The file was addedsrc/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/configs/BcxCoreConfig.java
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/entities/EntityAbstract.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/commands/CreatePaymentCommand.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/WalletPaymentService.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/commands/CreateTransferCommand.java
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/constants/PaymentConstant.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/commands/CommandAbstract.java
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderImpl_HF.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/PayServiceImpl.java
The file was modified src/mer_java/pom.xml
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/entities/PaymentTransactionEntity.java
Commit be681190fcbe776273ace4a0f3dd06458794c27f by linhancheng
接下来是回调的时候更改订单状态以及支付平台费用
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderImpl_WS.java
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/mappers/PaymentTransactionMapper.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/entities/PaymentTransactionEntity.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/services/WalletPaymentServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/PayServiceImpl.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/results/PaymentCommandResult.java
The file was addedsrc/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/components/JsonProvider.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderAbstract.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderImpl_HF.java
The file was modified src/mer_java/crmeb-bcxCore/pom.xml
The file was modified src/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/configs/BcxCoreConfig.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/PaymentProvider.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/snapshots/PaymentTransferSnapshot.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/snapshots/PaymentTradeSnapshot.java
The file was removedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/snapshots/PaymentTransferSnapshot.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/commands/DonePaymentCommand.java
Commit 28ca9d9fe9058c63a5a75735111539aeaefff1da by linhancheng
完毕支付流程，接下来修改回调功能，以解决非预期情况的异常处理
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/entities/PaymentTransactionEntity.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/huifu/v2/V2TradeAcctpaymentBalanceQuery.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/commands/CreateTransferCommand.java
The file was modified src/mer_java/crmeb-front/src/main/resources/application-test.yml
The file was modified src/mer_java/crmeb-front/src/main/resources/application.yml
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/services/WalletPaymentServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/WSApiRequest.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderAbstract.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/huifu/v2/V2UserBasicdataEntModifySubRequest.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/mappers/PaymentTransactionMapper.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/PayServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/CommonWalletServiceImpl.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderImpl_WS.java
The file was removedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/constants/PaymentConstant.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/results/PaymentCommandResult.java
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/mappers/dtos/PaymentStatusUpdateDTO.java
The file was addedsrc/mer_java/crmeb-payment/src/main/resources/mapper/payments/PaymentTransactionMapper.xml
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/config/PaymentChannel.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/snapshots/PaymentTradeSnapshot.java
The file was modified src/mer_java/sql/20250826_eb_virtual_order.sql
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/HuifuReconcileServiceImpl.java
The file was addedsrc/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/constants/PaymentConstant.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/commands/DonePaymentCommand.java
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/CrmebFrontApplication.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/WangShangWalletServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/HuifuWalletServiceImpl.java
Commit f0174e0c7b6a09f31c853b1847552e022bdff1a6 by linhancheng
支付
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/snapshots/PaymentTradeSnapshot.java
The file was modified src/mer_java/crmeb-admin/src/main/resources/application.yml
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/tasks/ReplenishOrderPlatformFeeTask.java
The file was addedsrc/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/bcx/requests/ReplenishPaymentRequest.java
The file was addedsrc/mer_java/sql/20250925-payment.sql
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/CrmebFrontApplication.java
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/config/JacksonConfig.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/commands/ReplenishOrderPlatformFeeCommand.java
The file was addedsrc/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/bcx/ReplenishPaymentController.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderAbstract.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/entities/PaymentTransactionEntity.java
The file was modified src/mer_java/crmeb-admin/src/main/java/com/zbkj/admin/CrmebAdminApplication.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/mappers/dtos/PaymentStatusUpdateDTO.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/services/WalletPaymentServiceImpl.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/mappers/PaymentTransactionMapper.java
The file was modified src/mer_java/sql/20250826_eb_virtual_order.sql
The file was modified src/mer_java/crmeb-admin/src/main/resources/application-test.yml
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/WalletPaymentService.java
The file was modified src/mer_java/crmeb-admin/pom.xml
Commit f784c4283bc07bb31929d59ba1be7cdb2c9cb00a by linhancheng
补偿平台费用
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/services/WalletPaymentServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/PaymentProvider.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderAbstract.java
Commit 32154c12d1c5c874d231e9f9f50a5d220b64cee1 by linhancheng
自动补偿平台费用
The file was modified src/mer_java/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/ScheduleJobServiceImpl.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/tasks/ReplenishOrderPlatformFeeTask.java
The file was modified src/mer_java/sql/20250925-payment.sql
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/services/WalletPaymentServiceImpl.java
The file was modified src/mer_java/crmeb-payment/src/main/resources/mapper/payments/PaymentTransactionMapper.xml
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderAbstract.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/mappers/dtos/PaymentStatusUpdateDTO.java
The file was modified src/mer_java/crmeb-admin/src/main/java/com/zbkj/admin/task/brokerage/GenerateSettleBillTask.java
Commit a5a1dc1ac74be6d5afe0145e2588a9df10a5511d by linhancheng
自动重试支付
The file was modified src/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/constants/PaymentConstant.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/services/WalletPaymentServiceImpl.java
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderAbstract.java
The file was modified src/mer_java/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/ScheduleJobServiceImpl.java
The file was modified src/mer_java/crmeb-admin/src/main/resources/application-test.yml
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/tasks/ReplenishOrderPlatformFeeTask.java