Skip to content
[Jenkins]Jenkins
log in

Changes

Summary

  1. 修改虚拟订单转实际订单去除商品查询，修改支付代扣回调生成收支明细业务编码值 (details)
  2. 修改虚单转实单业务判断 (details)
  3. 修改字段类型 (details)
  4. 修改虚单转实单保存订单业务 (details)
  5. 修改虚单来源订单支付校验冻结金额 (details)
  6. 修改barcode携带规则 (details)
  7. 修改虚单生成存储分账配置，虚单转实单改造通过缓存取虚单存的分账配置 (details)
Commit 15c56134519f083393c8ad4c7be993ba6fd5709a 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/resources/mapper/order/VirtualOrderMapper.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/java/com/zbkj/service/service/impl/PayServiceImpl.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/model/order/VirtualOrder.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
Commit 29fb82a6ccddb26b2b7fa6647f04945f317feef6 by zhongxuefeng
修改虚单转实单业务判断
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 b6321df4044c3499078abd3ba224d6a8ed1f1f8c by zhongxuefeng
修改字段类型
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java
Commit 6c6f0d87dde03c696efe406ee027656b486d0d9f 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/wangshang/notify/service/impl/BkcloudfundsProtocolWithholdResultNotifyServiceImpl.java
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/FrontOrderService.java
Commit a38b73142bf336ca13a24fda0565340d2e3fba74 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/PayServiceImpl.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/service/HuifuWalletService.java
The file was modified src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/order/Order.java
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java
Commit ae769b10a7c8bd57c86658f80d307630931cfae6 by zhongxuefeng
修改barcode携带规则
The file was modified src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java
Commit f75eda7149dbef787106bb4dae5bdaafbf811791 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
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/resources/mapper/order/VirtualOrderMapper.xml
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/model/order/VirtualOrder.java