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)
Commit 4f3601c5648d714d8f05341be7b05b9fed468313 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/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-service/src/main/java/com/zbkj/service/wangshang/api/WSApiRequest.java
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 704c30fdd8dda6f25b43d116dbc00128858d3fed 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/wangshang/notify/service/impl/BkMerchantprodMerchAsyncUpdateMerchantNotifyServiceImpl.java
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
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-admin/src/main/resources/application-test.yml
Commit f5dcc58c1b216eb627f6d8fb917e2d0f34aa962d 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/BkcloudfundsElectronicReceiptNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkmbpStmtApplyResultCommonNotifyServiceImpl.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/BkMerchantprodMerchControlNotifyServiceImpl.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/BkMerchantprodMerchNotifyServiceImpl.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/notify/service/impl/BkMerchantprodMerchAsyncUpdateMerchantNotifyServiceImpl.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-service/src/main/java/com/zbkj/service/wangshang/notify/service/impl/BkcloudfundsWithdrawNotifyServiceImpl.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
Commit 679bc1e109cc256f7a6765622eb02cdeb3e25e76 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-front/src/main/resources/application-test.yml
Commit 32b6b7d9c5a38ccb87d4f6e42a6abcf880ec235c 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-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
Commit 613233826f1eec8ffea96901414ac216fc286d3c by zhongxuefeng
调整测试数据库链接
The file was modified src/mer_java/crmeb-front/src/main/resources/application-test.yml
Commit 934627766c45eac2ba8bc3d6493e5e472ac3bca3 by zhongxuefeng
修改提现查询业务
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/service/impl/WangShangWalletServiceImpl.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/java/com/zbkj/front/controller/HuifuWalletController.java
The file was modified src/mer_java/crmeb-front/src/main/resources/application-test.yml
Commit 89a3921e84fc41955e0c24424eef32f338be37ce by zhongxuefeng
限制订单支付增加重复提交，修改确认成绩设置是考培并且状态为已完成的返回成功
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/PayController.java
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.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/java/com/zbkj/service/service/impl/WangShangWalletServiceImpl.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/resources/mapper/huifu/HuifuWalletTradeMapper.xml
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/PayController.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/resources/mapper/huifu/HuifuWalletReconciliationMapper.xml