Commits · f6911035005aac0c562046be6d7449e305e2b8d8 · order-group-application / order-group · GitLab

17 May, 2022 15 commits
- Merge branch 'KA-顺丰计算商品重量的情况-20220517' into qa · f6911035
  周晓航 committed May 17, 2022
  
  f6911035 Browse Files
- 【订C，获取订单明细商品重量，求和（含套餐），传递给devily/create配送服务，克变成千克，÷1000，保留2位小数】 · 79001388
```
https://www.tapd.cn/43862731/prong/stories/view/1143862731001047524
```
  周晓航 committed May 17, 2022
  79001388 Browse Files
- Merge branch 'master' into qa · 5d5bfcbf
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  查志伟 committed May 17, 2022
  5d5bfcbf Browse Files
- Merge branch 'feature/v1.0.14' into qa · f90c8373
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  查志伟 committed May 17, 2022
  f90c8373 Browse Files
- merge 冲突 · 455bd194
  查志伟 committed May 17, 2022
  
  455bd194 Browse Files
- merge 冲突 · 4d95f86e
  查志伟 committed May 17, 2022
  
  4d95f86e Browse Files
- Merge branch 'feature/v1.0.14' · 19266151
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  查志伟 committed May 17, 2022
  19266151 Browse Files
- 去除无用代码 · af02d7dd
  查志伟 committed May 17, 2022
  
  af02d7dd Browse Files
- oms feign日志增加打印 · a57cb197
  查志伟 committed May 17, 2022
  
  a57cb197 Browse Files
- oms feign日志增加打印 · af7b8d9a
  查志伟 committed May 17, 2022
  
  af7b8d9a Browse Files
- Merge branch 'feature/支付门店查询过滤无效数据/zhiwei.zha' · d3a83303
  查志伟 committed May 17, 2022
  
  d3a83303 Browse Files
- Merge branch 'feature/v1.0.14' · 015ed69a
  查志伟 committed May 17, 2022
  
  015ed69a Browse Files
- Merge branch 'feature/v1.0.14' into qa · 6d64fcc8
  查志伟 committed May 17, 2022
  
  6d64fcc8 Browse Files
- 未接单代付退款支持 · fd36156a
  查志伟 committed May 17, 2022
  
  fd36156a Browse Files
- Merge branch 'feature/v1.0.14' · 7861350a
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
```
  查志伟 committed May 17, 2022
  7861350a Browse Files
16 May, 2022 1 commit
- 添加一个main方法测试 · 2038741f
  周晓航 committed May 16, 2022
  
  2038741f Browse Files
13 May, 2022 8 commits
- Merge branch 'feature/v1.0.14' into qa · f6261a22
  周晓航 committed May 13, 2022
  
  f6261a22 Browse Files
- 代码退款修改调用校验 · f9b84eba
  周晓航 committed May 13, 2022
  
  f9b84eba Browse Files
- Merge branch 'feature/v1.0.14' into qa · dbd9bbb1
  周晓航 committed May 13, 2022
  
  dbd9bbb1 Browse Files
- 代码退款新增参数 · ddb1a021
  周晓航 committed May 13, 2022
  
  ddb1a021 Browse Files
- Merge branch 'feature/v1.0.14' into qa · 62055ca4
  周晓航 committed May 13, 2022
  
  62055ca4 Browse Files
- 代码退款新增参数 · eb0fa411
  周晓航 committed May 13, 2022
  
  eb0fa411 Browse Files
- Merge branch 'feature/v1.0.14' into qa · f641bef4
  周晓航 committed May 13, 2022
  
  f641bef4 Browse Files
- 代码退款日志 · 7f6b4094
  周晓航 committed May 13, 2022
  
  7f6b4094 Browse Files
10 May, 2022 1 commit
- Merge branch 'release-门店拒绝的抖音核销ID1045995-20220421-zxh' into 'master' · 2090312c
```
Release 门店拒绝的抖音核销id1045995 20220421 zxh

See merge request !138
```
  缪晖 committed May 10, 2022
  2090312c Browse Files
07 May, 2022 2 commits
- Merge branch 'KA-小程序展示抖音订单' into qa · 2fdca05a
  周晓航 committed May 07, 2022
  
  2fdca05a Browse Files
- 订单列表展示小助手订单 · 0e5959b7
  周晓航 committed May 07, 2022
  
  0e5959b7 Browse Files
05 May, 2022 3 commits
- Merge remote-tracking branch 'remotes/origin/bugfix/多卡支付余额为0支付方式错误' into qa · 095d034f
  胡敬轩 committed May 05, 2022
  
  095d034f Browse Files
- 多卡支付余额为0支付方式错误 · aa617b26
  胡敬轩 committed May 05, 2022
  
  aa617b26 Browse Files
- Merge remote-tracking branch 'remotes/origin/bugfix/多卡支付余额为0支付方式错误' into qa · 9e34ca73
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  胡敬轩 committed May 05, 2022
  9e34ca73 Browse Files
04 May, 2022 1 commit
- 多卡支付余额为0支付方式错误 · 2adf13e8
  胡敬轩 committed May 04, 2022
  
  2adf13e8 Browse Files
30 Apr, 2022 9 commits
- Merge branch 'KA-接口调用订单退款' into 'master' · 1c5b1c5a
```
仅支持 餐饮订单操作该接口

See merge request !137
```
  缪晖 committed May 01, 2022
  1c5b1c5a Browse Files
- 仅支持餐饮订单操作该接口 · 6e09aff0
  周晓航 committed May 01, 2022
  
  6e09aff0 Browse Files
- Merge branch 'KA-接口调用订单退款' into 'master' · 556e2e89
```
Ka 接口调用订单退款

See merge request !136
```
  缪晖 committed Apr 30, 2022
  556e2e89 Browse Files
- Merge branch 'KA-接口调用订单退款' into qa · 37296fe0
  周晓航 committed Apr 30, 2022
  
  37296fe0 Browse Files
- 仅支持餐饮订单操作该接口 · 37554da8
  周晓航 committed Apr 30, 2022
  
  37554da8 Browse Files
- Merge branch 'KA-接口调用订单退款' into qa · e0e2dad5
  周晓航 committed Apr 30, 2022
  
  e0e2dad5 Browse Files
- 修改成批量操作 · 81d21bf1
  周晓航 committed Apr 30, 2022
  
  81d21bf1 Browse Files
- Merge branch 'KA-接口调用订单退款' into qa · 087a04ce
  周晓航 committed Apr 30, 2022
  
  087a04ce Browse Files
- 修改成批量操作 · dd965948
  周晓航 committed Apr 30, 2022
  
  dd965948 Browse Files