Skip to content
[Jenkins]Jenkins
log in

Changes

Summary

  1. 优化支付流程 (details)
  2. 接下来是回调的时候更改订单状态以及支付平台费用 (details)
  3. 完毕支付流程，接下来修改回调功能，以解决非预期情况的异常处理 (details)
  4. 支付 (details)
  5. 补偿平台费用 (details)
  6. 自动补偿平台费用 (details)
  7. 调整测试环境网商测试配置 (details)
  8. 虚单转实单增加用户设置 (details)
  9. 修改虚单创建实单归属用户设置 (details)
  10. 新增保证金退回申请对接、保证金退回查询对接、查询保证金列表对接，未开发接入业务 (details)
  11. 修改企业培训学校的企业类型 (details)
  12. 自动重试支付 (details)
  13. 增加保证金退款业务 (details)
  14. 增加保证金退回相关业务 (details)
  15. 判断可退款列表金额 (details)
  16. 修改退款设置卡号，调整提现列表倒序 (details)
  17. 关闭汇付的充值业务 (details)
  18. 修改匹配网商证件类型编码 (details)
  19. 修改法人增加类型编码 (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-service/src/main/java/com/zbkj/service/payments/commands/CreateTransferCommand.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/constants/PaymentConstant.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/crmeb-service/src/main/java/com/zbkj/service/service/OrderDetailService.java
The file was addedsrc/mer_java/crmeb-bcxCore/pom.xml
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/WalletPaymentService.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/src/main/java/com/zbkj/payment/entities/PaymentTransactionEntity.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/services/WalletPaymentServiceImpl.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-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/service/impl/CommonWalletServiceImpl.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/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-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/snapshots/PaymentTransferSnapshot.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-bcxCore/src/main/java/com/zbkj/bcx/cores/exceptions/BadCoreException.java
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-bcxCore/src/main/java/com/zbkj/bcx/cores/exceptions/CoreExceptionAbstract.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/LockConstant.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-service/src/main/java/com/zbkj/service/payments/PaymentProvider.java
Commit be681190fcbe776273ace4a0f3dd06458794c27f by linhancheng
接下来是回调的时候更改订单状态以及支付平台费用
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/commands/DonePaymentCommand.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-service/src/main/java/com/zbkj/service/service/impl/PayServiceImpl.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-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/impls/PaymentProviderImpl_HF.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-bcxCore/src/main/java/com/zbkj/bcx/cores/components/JsonProvider.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/services/WalletPaymentServiceImpl.java
The file was modified src/mer_java/crmeb-bcxCore/src/main/java/com/zbkj/bcx/cores/configs/BcxCoreConfig.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 addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/payments/results/PaymentCommandResult.java
The file was modified src/mer_java/crmeb-bcxCore/pom.xml
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/impls/PaymentProviderAbstract.java
Commit 28ca9d9fe9058c63a5a75735111539aeaefff1da by linhancheng
完毕支付流程，接下来修改回调功能，以解决非预期情况的异常处理
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-front/src/main/resources/application-test.yml
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-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/payments/commands/CreateTransferCommand.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/service/impl/CommonWalletServiceImpl.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-front/src/main/resources/application.yml
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-front/src/main/java/com/zbkj/front/CrmebFrontApplication.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/payments/commands/DonePaymentCommand.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/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/sql/20250826_eb_virtual_order.sql
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/config/PaymentChannel.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/snapshots/PaymentTradeSnapshot.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-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
Commit f0174e0c7b6a09f31c853b1847552e022bdff1a6 by linhancheng
支付
The file was modified src/mer_java/sql/20250826_eb_virtual_order.sql
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-front/src/main/java/com/zbkj/front/config/JacksonConfig.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/payments/WalletPaymentService.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-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/snapshots/PaymentTradeSnapshot.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/pom.xml
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/services/WalletPaymentServiceImpl.java
The file was addedsrc/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/bcx/requests/ReplenishPaymentRequest.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/entities/PaymentTransactionEntity.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-admin/src/main/resources/application.yml
The file was addedsrc/mer_java/sql/20250925-payment.sql
The file was addedsrc/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/bcx/ReplenishPaymentController.java
Commit f784c4283bc07bb31929d59ba1be7cdb2c9cb00a by linhancheng
补偿平台费用
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
The file was modified src/mer_java/crmeb-payment/src/main/java/com/zbkj/payment/services/WalletPaymentServiceImpl.java
Commit 32154c12d1c5c874d231e9f9f50a5d220b64cee1 by linhancheng
自动补偿平台费用
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/sql/20250925-payment.sql
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/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/ScheduleJobServiceImpl.java
The file was modified src/mer_java/crmeb-admin/src/main/java/com/zbkj/admin/task/brokerage/GenerateSettleBillTask.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/services/WalletPaymentServiceImpl.java
Commit edad057307d70dd083492e2127c986436088bac8 by zhongxuefeng
调整测试环境网商测试配置
The file was modified src/mer_java/crmeb-admin/src/main/resources/application-test.yml
Commit e472c46426997b13c50df4201a7708ede28c1d92 by zhongxuefeng
虚单转实单增加用户设置
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/constants/OrderConstants.java
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.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 3f1b918589494cc575c1300ca6ee80e493f13973 by zhongxuefeng
新增保证金退回申请对接、保证金退回查询对接、查询保证金列表对接，未开发接入业务
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/domain/model/BkcloudfundsVostroChargeBatchQueryRequestModel.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/domain/model/BkcloudfundsRefundApplyRequestModel.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/domain/model/BkcloudfundsVostroChargeBatchQueryResponseModel.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/WSApiRequest.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/service/BkcloudfundsRefundApplyResponse.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/domain/model/BkcloudfundsRefundQueryRequestModel.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/domain/model/BkcloudfundsRefundQueryResponseModel.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/service/BkcloudfundsVostroChargeBatchQueryRequest.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/service/BkcloudfundsRefundApplyRequest.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/service/BkcloudfundsVostroChargeBatchQueryResponse.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/domain/model/BkcloudfundsRefundApplyResponseModel.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/domain/model/VostroInfo.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/service/BkcloudfundsRefundQueryResponse.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/service/BkcloudfundsRefundQueryRequest.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/constants/WSBusiCode.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/domain/RequestBody.java
Commit b056c807349dc141b4fe6b6bb765428fbf22aac6 by zhongxuefeng
修改企业培训学校的企业类型
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/WSApiRequest.java
Commit a5a1dc1ac74be6d5afe0145e2588a9df10a5511d by linhancheng
自动重试支付
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
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/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-bcxCore/src/main/java/com/zbkj/bcx/cores/constants/PaymentConstant.java
Commit 22cd49136f8a1737b75a68dc1724f320aa35b1dd by zhongxuefeng
增加保证金退款业务
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/dao/HuifuWalletTranslogDao.java
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/resources/mapper/huifu/HuifuWalletTranslogMapper.xml
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/notify/service/impl/BkcloudfundsRefundNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/WSApiRequest.java
Commit 80e43972ac4a30e4e4d375fe8d28f8401f703c4d by zhongxuefeng
增加保证金退回相关业务
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkcloudfundsMerchantAccountUnfreezeNotifyImpl.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/wangshang/notify/service/impl/BkcloudfundsWithdrawNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/service/BkcloudfundsVostroChargeBatchQueryRequest.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/AbstractMybankClient.java
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/service/impl/WangShangWalletServiceImpl.java
Commit fbf8189becacb3ba146d0190535d7832b7afea69 by zhongxuefeng
判断可退款列表金额
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/WangShangWalletServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/domain/model/VostroInfo.java
Commit 87cc9527b97a8f0e05a94c42392398fa1a60fe6c by zhongxuefeng
修改退款设置卡号，调整提现列表倒序
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/resources/mapper/huifu/HuifuWalletTranslogMapper.xml
Commit 2121ef79fdab5cf86a27bd4413d7e18035eea79f by zhongxuefeng
关闭汇付的充值业务
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/HuifuWalletServiceImpl.java
Commit e49af7f42a2dfe3ef22f9435e9208e62283563fc by zhongxuefeng
修改匹配网商证件类型编码
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/WSApiRequest.java
Commit 3eda7e12c8ff16ebf52c4c9c14fb10df39e6897f by zhongxuefeng
修改法人增加类型编码
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/WSApiRequest.java