Changes

Summary

分销v1.30功能 (details)
线下支付-确认到款功能 (details)
测试环境网商配置调整成生产配置 (details)
调整测试环境网商测试配置 (details)

Commit 74745681888a546ff968144ba170942c76d7b7f3 by linchunpeng 分销v1.30功能
The file was modified	src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/order/OrderDetail.java
The file was modified	src/mer_java/crmeb-service/src/main/java/com/zbkj/service/dao/BcxProductBenefitsDao.java
The file was modified	src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/BcxProductBenefitsService.java
The file was modified	src/mer_java/crmeb-admin/src/main/java/com/zbkj/admin/controller/platform/BcxChannelController.java
The file was modified	src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/bcx/BcxPerformanceReport.java
The file was modified	src/mer_java/crmeb-service/src/main/resources/mapper/bcx/BcxProductBenefitsMapper.xml
The file was modified	src/mer_java/crmeb-service/src/main/java/com/zbkj/service/dao/BcxSettleDao.java
The file was added	src/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/UserProductBenefitsController.java
The file was modified	src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/BcxProductBenefitsServiceImpl.java
The file was modified	src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/BcxSettleSearchRequest.java
The file was modified	src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/bcx/BcxChannel.java
The file was modified	src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/ProductService.java
The file was added	src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/UserProductBenefitsSaveRequest.java
The file was modified	src/mer_java/crmeb-service/src/main/resources/mapper/bcx/BcxSettleMapper.xml
The file was modified	src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/bcx/BcxSettleBill.java
The file was modified	src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/BcxPerformanceReportServiceImpl.java
The file was modified	src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/BcxChannelService.java
The file was added	src/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/UserSettleController.java
The file was modified	src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/ProductServiceImpl.java
The file was added	src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/UserProductBenefitsRequest.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/BcxSettleService.java
The file was added	src/mer_java/sql/20240507-fenxiao-1.30.sql
The file was modified	src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/BcxSettleBillServiceImpl.java
The file was modified	src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/BcxSettleServiceImpl.java
The file was modified	src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/BcxChannelServiceImpl.java
The file was added	src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/UserProductBenefitsResponse.java
The file was modified	src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/bcx/BcxProductBenefits.java
The file was modified	src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/bcx/BcxSettle.java
Commit 95ad9b957a43fcb5be3426091c2855ec33af5f58 by linchunpeng 线下支付-确认到款功能
The file was modified	src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/PayService.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/PayServiceImpl.java
The file was modified	src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/bcx/BcxPayOffline.java
The file was modified	src/mer_java/crmeb-common/src/main/java/com/zbkj/common/vo/BcxPayOfflineInfoVo.java
The file was modified	src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/bcx/BcxPayOfflineResponse.java
Commit 2b310c5225ad45abec9bae7646089cbc55bf81f4 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 edad057307d70dd083492e2127c986436088bac8 by zhongxuefeng 调整测试环境网商测试配置
The file was modified	src/mer_java/crmeb-admin/src/main/resources/application-test.yml