Skip to content

Changes

Summary

  1. 优化支付流程 (details)
  2. 完毕支付流程,接下来修改回调功能,以解决非预期情况的异常处理 (details)
  3. 支付 (details)
  4. 虚单转实单增加用户设置 (details)
  5. 修改虚单创建实单归属用户设置 (details)
  6. 增加保证金退款业务 (details)
Commit c82a55e73bfce2a19c692c7072fac447c90667d5 by linhancheng
优化支付流程
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderImpl_WS.java
The file was addedsrc/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/exceptions/CoreExceptionAbstract.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-front/pom.xml
The file was addedsrc/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/service/impl/CommonWalletServiceImpl.java
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/entities/EntityAbstract.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-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/impls/PaymentProviderImpl_HF.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-payment/src/main/java/com/zbkj/payment/constants/PaymentConstant.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-payment/src/main/java/com/zbkj/payment/services/WalletPaymentServiceImpl.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/commands/CreatePaymentCommand.java
The file was modified src/mer_java/pom.xml
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-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/snapshots/PaymentTransferSnapshot.java
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/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-bcxCore/pom.xml
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/exception/CrmebWalletException.java
The file was modified src/mer_java/crmeb-service/pom.xml
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/WalletPaymentService.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-service/src/main/java/com/zbkj/service/payments/PaymentProvider.java
The file was addedsrc/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/LockConstant.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-payment/src/main/java/com/zbkj/payment/entities/PaymentTransactionEntity.java
Commit 28ca9d9fe9058c63a5a75735111539aeaefff1da by linhancheng
完毕支付流程,接下来修改回调功能,以解决非预期情况的异常处理
The file was modified src/mer_java/sql/20250826_eb_virtual_order.sql
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/service/impl/PayServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/HuifuReconcileServiceImpl.java
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/impls/PaymentProviderAbstract.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/HuifuWalletServiceImpl.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/huifu/v2/V2TradeAcctpaymentBalanceQuery.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-service/src/main/java/com/zbkj/service/payments/commands/CreateTransferCommand.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-payment/src/main/java/com/zbkj/payment/services/WalletPaymentServiceImpl.java
The file was addedsrc/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/mappers/PaymentTransactionMapper.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-service/src/main/java/com/zbkj/service/config/PaymentChannel.java
The file was modified src/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/impl/WangShangWalletServiceImpl.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/java/com/zbkj/front/CrmebFrontApplication.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/results/PaymentCommandResult.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/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/WSApiRequest.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/CommonWalletServiceImpl.java
Commit f0174e0c7b6a09f31c853b1847552e022bdff1a6 by linhancheng
支付
The file was modified src/mer_java/sql/20250826_eb_virtual_order.sql
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-admin/src/main/resources/application-test.yml
The file was addedsrc/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/tasks/ReplenishOrderPlatformFeeTask.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-front/src/main/java/com/zbkj/front/CrmebFrontApplication.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/resources/application.yml
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/services/WalletPaymentServiceImpl.java
The file was addedsrc/mer_java/sql/20250925-payment.sql
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/entities/PaymentTransactionEntity.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/commands/ReplenishOrderPlatformFeeCommand.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/crmeb-front/src/main/java/com/zbkj/front/config/JacksonConfig.java
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
The file was addedsrc/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/bcx/ReplenishPaymentController.java
The file was addedsrc/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/bcx/requests/ReplenishPaymentRequest.java
Commit e472c46426997b13c50df4201a7708ede28c1d92 by zhongxuefeng
虚单转实单增加用户设置
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/constants/OrderConstants.java
Commit 35d1182fd88cc6c76b31586b4e93eb39661f8d75 by zhongxuefeng
修改虚单创建实单归属用户设置
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java
Commit 22cd49136f8a1737b75a68dc1724f320aa35b1dd by zhongxuefeng
增加保证金退款业务
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/HuifuWalletServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/HuifuWalletService.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-front/src/main/java/com/zbkj/front/controller/HuifuWalletController.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-service/src/main/resources/mapper/huifu/HuifuWalletTranslogMapper.xml
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkcloudfundsRefundNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/dao/HuifuWalletTranslogDao.java