Skip to content
[Jenkins]Jenkins
log in

Changes

Summary

  1. 分销v1.30功能 (details)
  2. 目前分销为众邦商城逻辑，订单后台改价格后，分销取值仍为原价。——分销-春鹏 (details)
  3. 加 userMsg (details)
  4. 线下支付-确认到款功能 (details)
  5. 线下支付-确认到款功能 (details)
  6. 线下支付-确认到款功能 (details)
  7. 增加体检商品虚单创建，送检体检实际订单创建及缴费、额度退款接口等 (details)
  8. 虚拟订单增加状态标识有没有完成金额冻结 (details)
  9. 调整体检生成正式订单，修改订单号规则 (details)
  10. 修改考培业务适应虚拟订单流程 (details)
  11. 调整考培支付判断，修复订单转账后解冻 (details)
  12. 增加记录未匹配到的对账记录 (details)
  13. 虚单转实单增加用户设置 (details)
Commit 74745681888a546ff968144ba170942c76d7b7f3 by linchunpeng
分销v1.30功能
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/bcx/BcxProductBenefits.java
The file was addedsrc/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/BcxSettleServiceImpl.java
The file was addedsrc/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/BcxChannelServiceImpl.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-common/src/main/java/com/zbkj/common/model/order/OrderDetail.java
The file was addedsrc/mer_java/sql/20240507-fenxiao-1.30.sql
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-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/BcxProductBenefitsServiceImpl.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-service/src/main/resources/mapper/bcx/BcxProductBenefitsMapper.xml
The file was addedsrc/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/UserProductBenefitsRequest.java
The file was addedsrc/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/UserProductBenefitsSaveRequest.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/java/com/zbkj/service/service/impl/BcxPerformanceReportServiceImpl.java
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/resources/mapper/bcx/BcxSettleMapper.xml
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/BcxChannelService.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/ProductServiceImpl.java
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/bcx/BcxSettle.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-service/src/main/java/com/zbkj/service/service/BcxSettleService.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/dao/BcxSettleDao.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/ProductService.java
The file was addedsrc/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/UserProductBenefitsResponse.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/dao/BcxProductBenefitsDao.java
Commit a931815dc75a5d51ffc6101bf2a5c89322809129 by linchunpeng
目前分销为众邦商城逻辑，订单后台改价格后，分销取值仍为原价。——分销-春鹏
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/service/impl/BcxPerformanceReportServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/PayServiceImpl.java
Commit be1dd564997f6f0074ed5afe69f8e14dc4087179 by lmy
加 userMsg
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/bcx/BcxPayOfflineController.java
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/vo/BcxPayOfflineInfoVo.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-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/vo/BcxPayOfflineInfoVo.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-admin/src/main/java/com/zbkj/admin/controller/merchant/MerchantOrderController.java
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/bcx/BcxPayOfflineResponse.java
Commit 4e7c515a2e6edb1d22e939b3f34d5a2961198f69 by linchunpeng
线下支付-确认到款功能
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/CommonOrderPageResponse.java
The file was modified src/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml
Commit ea10bd5fb3b377cb3694bbb99714a1b3c3884f34 by linchunpeng
线下支付-确认到款功能
The file was modified src/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/CommonOrderPageResponse.java
Commit 8706dd728230a8c3b93c4ec24b7fac5a3683bcf4 by zhongxuefeng
增加体检商品虚单创建，送检体检实际订单创建及缴费、额度退款接口等
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/OrderController.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/dao/VirtualOrderDao.java
The file was addedsrc/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/order/VirtualOrder.java
The file was addedsrc/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/order/VirtualOrderOperate.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/PayServiceImpl.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/VirtualOrderOperateServiceImpl.java
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/FrontOrderService.java
The file was addedsrc/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/CreateVirtualOrderRequest.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-common/src/main/java/com/zbkj/common/response/VirtualOrderResponse.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/dao/VirtualOrderOperateDao.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/VirtualOrderServiceImpl.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/VirtualOrderService.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/VirtualOrderOperateService.java
The file was addedsrc/mer_java/crmeb-service/src/main/resources/mapper/order/VirtualOrderMapper.xml
The file was addedsrc/mer_java/sql/20250826_eb_virtual_order.sql
The file was addedsrc/mer_java/crmeb-service/src/main/resources/mapper/order/VirtualOrderOperateMapper.xml
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 81a73af0be81a6013c655b8db03c396f63eb3086 by zhongxuefeng
虚拟订单增加状态标识有没有完成金额冻结
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/VirtualOrderServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/VirtualOrderService.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/resources/mapper/order/VirtualOrderMapper.xml
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/order/VirtualOrder.java
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/VirtualOrderResponse.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/PayServiceImpl.java
Commit aa04aa4db6e25acaddb630532ce0da96400b18b5 by zhongxuefeng
调整体检生成正式订单，修改订单号规则
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderDetailServiceImpl.java
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/CreateVirtualOrderRequest.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/dao/VirtualOrderDao.java
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/controller/OrderController.java
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-common/src/main/java/com/zbkj/common/response/VirtualOrderResponse.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/VirtualOrderServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/resources/mapper/order/VirtualOrderMapper.xml
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/VirtualOrderService.java
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/FrontOrderService.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/OrderDetailService.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/AsyncServiceImpl.java
The file was addedsrc/mer_java/crmeb-common/src/main/java/com/zbkj/common/enums/BizEnum.java
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/order/VirtualOrder.java
Commit f414bf9778981c21c9e3e2e639c082120db0a6a0 by zhongxuefeng
修改考培业务适应虚拟订单流程
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.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-common/src/main/java/com/zbkj/common/constants/OrderConstants.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/VirtualOrderServiceImpl.java
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/enums/BizEnum.java
Commit 0f696356f5e9f9dadbef9f3ca5199144c04c09a8 by zhongxuefeng
调整考培支付判断，修复订单转账后解冻
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/order/VirtualOrder.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-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/VirtualOrderService.java
The file was modified src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/VirtualOrderServiceImpl.java
Commit 0b01568116b92b8a3da9b419edfa3151a5c7df35 by zhongxuefeng
增加记录未匹配到的对账记录
The file was addedsrc/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/huifu/HuifuWalletTradeRecon.java
The file was addedsrc/mer_java/crmeb-service/src/main/resources/mapper/huifu/HuifuWalletTradeReconMapper.xml
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/service/impl/HuifuReconcileServiceImpl.java
The file was addedsrc/mer_java/crmeb-service/src/main/java/com/zbkj/service/dao/HuifuWalletTradeReconDao.java
Commit e472c46426997b13c50df4201a7708ede28c1d92 by zhongxuefeng
虚单转实单增加用户设置
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/constants/OrderConstants.java