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)
  20. 修改回调查询账户信息 (details)
  21. 修改测试配置用生产的，部署测试环境 (details)
  22. 修改网商日志存储，修改报文解析 (details)
  23. 修改提现金额计算 (details)
  24. 修改提现金额计算 (details)
  25. 修改汇付入驻步骤，如果没生成初始步骤做生成 (details)
  26. 调整使用id (details)
  27. 修改提现计算，退款接口参数调整 (details)
  28. 修改企业入驻设置负责人手机 (details)
  29. 修改提现查询业务 (details)
  30. 修改收支明细、对账明细数据生成 (details)
  31. 增加业务类型 (details)
Commit 4f3601c5648d714d8f05341be7b05b9fed468313 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-front/src/main/java/com/zbkj/front/controller/HuifuWalletController.java
Commit 9938717f501b9a508af09936284de1da6ef6f720 by zhongxuefeng
修改入驻通道设置
The file was modified src/mer_java/crmeb-service/src/main/resources/mapper/huifu/HuifuWalletAccountMapper.xml
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/WangShangWalletServiceImpl.java
Commit 5667716e247b0f7a09e0c7cce16699f0d7befd56 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/wangshang/notify/service/impl/BkMerchantprodMerchNotifyServiceImpl.java
Commit 142744455a57e94bce2c77b82e5ca90e1ca459ac 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/impl/WangShangWalletServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/resources/mapper/huifu/HuifuWalletAccountMapper.xml
Commit 8672032788fafc053fa87aaf9671b84eea4043b9 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/HuifuWalletAccountMapper.xml
Commit ef9b9063268c412210a156868be0cff4a8b754c3 by zhongxuefeng
网商账户信息查询判断如果还没开户状态默认还在开通不查合约信息
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/WangShangWalletServiceImpl.java
Commit dc5050d386c0cc2ac72d72bfe569330f247cda6e by zhongxuefeng
修改生产激活码获取
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/WSApiRequest.java
Commit 0c53928453446b351f4597d194bbbcaa6b671020 by zhongxuefeng
网商增加经办人身份证信息录入
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/huifu/HuifuWalletAccount.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/HuifuWalletAccountMapper.xml
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/WangShangWalletServiceImpl.java
Commit 18904afd7481f1f1ac5991cf27254983cd5530b1 by zhongxuefeng
修改网商根据环境生成二维码
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/WangShangWalletServiceImpl.java
Commit 7576d0c40ff2ff6a3fa61386363ba1a26a373ad3 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-common/src/main/java/com/zbkj/common/model/huifu/HuifuWalletAccount.java
The file was modified src/mer_java/crmeb-service/src/main/resources/mapper/huifu/HuifuWalletAccountMapper.xml
Commit 5820ff787983ee8a26acc5273fdf6342721bcc02 by zhongxuefeng
开户成功回调问题修复
The file was modified src/mer_java/crmeb-service/src/main/resources/mapper/huifu/HuifuWalletMapper.xml
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/wangshang/notify/service/impl/BkMerchantprodMerchNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/WangShangWalletServiceImpl.java
Commit 42cfe1cf288c07e8977590d3fc4300bf39007a5d by zhongxuefeng
修改回调查询语句
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkMerchantprodMerchNotifyServiceImpl.java
Commit fac75c10fc614d378242b4824c71f875d0bb29ac by zhongxuefeng
修改激活二维码生成，修改冻结金额异步修改，修改异步平台转账业务
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/dto/HuifuWalletTransferDto.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/CommonWalletService.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-admin/src/main/java/com/zbkj/admin/controller/merchant/MerchantOrderController.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkMerchantprodMerchNotifyServiceImpl.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-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/HuifuWalletAccountDao.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/HuifuWalletAccountMapper.xml
Commit dda792ab7dbf1a5e83b1a3c45bc3c9d8394bf0d2 by zhongxuefeng
修改获取环境变量
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/WangShangWalletServiceImpl.java
Commit e32036cafb01c64879829359d756a6e99d48a0c5 by zhongxuefeng
修改环境变量获取
The file was modified src/mer_java/crmeb-front/src/main/resources/application-test.yml
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/WSApiRequest.java
Commit 686d3cd008e1c80ffe97a057f01150608760cff5 by zhongxuefeng
修改配置获取
The file was modified src/mer_java/crmeb-front/src/main/resources/application-test.yml
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
Commit bb3773f8b24263ded1b9182c86f0f7a253b5f2eb by zhongxuefeng
修改环境配置
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/WSApiRequest.java
Commit 46bd6f1ae91759f054521274f91d98fd5434ffa4 by zhongxuefeng
修改冻结金额计算
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-service/src/main/resources/mapper/huifu/HuifuWalletAccountMapper.xml
Commit 17f261409556009579513192b264e72e8c8f0a6c by zhongxuefeng
修改冻结金额计算
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-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/impl/WangShangWalletServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/resources/mapper/huifu/HuifuWalletAccountMapper.xml
Commit fb25e9d116014d569c3fc24213eb22b46a13b22d by zhongxuefeng
修改回调查询账户信息
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/dao/HuifuWalletAccountDao.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkMerchantprodMerchNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/resources/mapper/huifu/HuifuWalletAccountMapper.xml
Commit 704c30fdd8dda6f25b43d116dbc00128858d3fed 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/service/impl/CommonWalletServiceImpl.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-admin/src/main/resources/application-test.yml
The file was modified src/mer_java/crmeb-front/src/main/resources/application-test.yml
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkMerchantprodMerchAsyncUpdateMerchantNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkMerchantprodMerchNotifyServiceImpl.java
Commit f5dcc58c1b216eb627f6d8fb917e2d0f34aa962d by zhongxuefeng
修改网商日志存储，修改报文解析
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkMerchantprodMerchControlNotifyServiceImpl.java
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/BkcloudfundsElectronicReceiptNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/MerchantprodMerchantArrangementInfoNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkcloudfundsVostroNotifyServiceImpl.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/notify/service/impl/BkcloudfundsWithdrawNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/ProtocolWithholdRefundResultNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkMerchantprodMerchAsyncUpdateMerchantNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkMerchantprodMerchNotifyServiceImpl.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/notify/service/impl/BkcloudfundsProtocolWithholdResultNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkmbpStmtApplyResultCommonNotifyServiceImpl.java
Commit 32b6b7d9c5a38ccb87d4f6e42a6abcf880ec235c by zhongxuefeng
修改提现金额计算
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/service/impl/WangShangWalletServiceImpl.java
The file was modified src/mer_java/crmeb-front/src/main/resources/application-test.yml
Commit ddef652f9dff13edd9b06a81ef023d00f7702689 by zhongxuefeng
修改提现金额计算
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/WangShangWalletServiceImpl.java
Commit e1411cee0704cb48fcd2263619b0e62e78e27dff by zhongxuefeng
修改汇付入驻步骤，如果没生成初始步骤做生成
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/HuifuWalletServiceImpl.java
Commit a4343cad5bda5e20dbd572a8f09c3d13b8161d64 by zhongxuefeng
调整使用id
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/HuifuWalletServiceImpl.java
Commit efb6b6ba6b51cf1a9535268b9e79ee97a5b3055c by zhongxuefeng
修改提现计算，退款接口参数调整
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/WangShangWalletServiceImpl.java
Commit 5b0ae89fec4420b21168fcc6c4bf0efd4b697259 by zhongxuefeng
修改企业入驻设置负责人手机
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/WSApiRequest.java
Commit 934627766c45eac2ba8bc3d6493e5e472ac3bca3 by zhongxuefeng
修改提现查询业务
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/resources/mapper/huifu/HuifuWalletTradeMapper.xml
The file was modified src/mer_java/crmeb-admin/src/main/resources/application-test.yml
The file was modified src/mer_java/crmeb-front/src/main/resources/application-test.yml
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/WangShangWalletServiceImpl.java
Commit 341becc76061d8c911c19bcd95517f37007a7058 by zhongxuefeng
修改收支明细、对账明细数据生成
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-service/src/main/resources/mapper/huifu/HuifuWalletTradeMapper.xml
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkcloudfundsProtocolWithholdResultNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/resources/mapper/huifu/HuifuWalletReconciliationMapper.xml
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/PayController.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/config/WSTransactionType.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/WangShangWalletServiceImpl.java
Commit 664c3a2a1dd1879281ed47f086b8e6bd8293331e by zhongxuefeng
增加业务类型
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/api/config/WSTransactionType.java