Changes

Summary

修改激活二维码生成，修改冻结金额异步修改，修改异步平台转账业务 (details)
修改测试配置用生产的，部署测试环境 (details)
还原测试网商配置 (details)
修改提现金额计算 (details)
修改提现查询业务 (details)

Commit fac75c10fc614d378242b4824c71f875d0bb29ac by zhongxuefeng 修改激活二维码生成，修改冻结金额异步修改，修改异步平台转账业务
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-common/src/main/java/com/zbkj/common/dto/HuifuWalletTransferDto.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/CommonWalletServiceImpl.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/CommonWalletService.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-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/service/impl/HuifuWalletServiceImpl.java
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/wangshang/notify/service/impl/BkMerchantprodMerchNotifyServiceImpl.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/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/CommonWalletServiceImpl.java
The file was modified	src/mer_java/crmeb-admin/src/main/resources/application-test.yml
Commit 679bc1e109cc256f7a6765622eb02cdeb3e25e76 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
Commit 32b6b7d9c5a38ccb87d4f6e42a6abcf880ec235c 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-admin/src/main/resources/application-test.yml
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-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
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