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

26 May, 2022 9 commits
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into pre · c0509fe5
  周晓航 committed May 26, 2022
  
  c0509fe5 Browse Files
- 打个日志 · 2784e586
  周晓航 committed May 26, 2022
  
  2784e586 Browse Files
- 当前时间点默认走同享逻辑上线 2022年5月26日17:23:00 · 3529be88
  周晓航 committed May 26, 2022
  
  3529be88 Browse Files
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into pre · 083cbad9
  周晓航 committed May 26, 2022
  
  083cbad9 Browse Files
- 当前时间点默认走同享逻辑上线 2022年5月26日17:23:00 · f17f2564
  周晓航 committed May 26, 2022
  
  f17f2564 Browse Files
- 临时优化,卡配置互斥的情况导致购物车返回数据不对, · f638ae41
```
解决方案: 先自己重新请求一次购物车
```
  周晓航 committed May 26, 2022
  f638ae41 Browse Files
- 打个日志 · fdb37cd6
  周晓航 committed May 26, 2022
  
  fdb37cd6 Browse Files
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into pre · f28fcfb5
  周晓航 committed May 26, 2022
  
  f28fcfb5 Browse Files
- 虚拟商品支持储值卡互斥 · 241c4a51
  周晓航 committed May 26, 2022
  
  241c4a51 Browse Files
25 May, 2022 3 commits
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into pre · 55ccf4da
  周晓航 committed May 25, 2022
  
  55ccf4da Browse Files
- Merge branch 'master' into pre · 86dbe377
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  周晓航 committed May 25, 2022
  86dbe377 Browse Files
- 加价购活动查询新增限制 · 41dc72f6
  周晓航 committed May 25, 2022
  
  41dc72f6 Browse Files
17 May, 2022 11 commits
- 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
- 未接单代付退款支持 · 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
- Merge branch 'feature/v1.0.14' into pre · 27cc2377
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  周晓航 committed May 17, 2022
  27cc2377 Browse Files
16 May, 2022 1 commit
- 添加一个main方法测试 · 2038741f
  周晓航 committed May 16, 2022
  
  2038741f Browse Files
13 May, 2022 4 commits
- 代码退款修改调用校验 · f9b84eba
  周晓航 committed May 13, 2022
  
  f9b84eba Browse Files
- 代码退款新增参数 · ddb1a021
  周晓航 committed May 13, 2022
  
  ddb1a021 Browse Files
- 代码退款新增参数 · eb0fa411
  周晓航 committed May 13, 2022
  
  eb0fa411 Browse Files
- 代码退款日志 · 7f6b4094
  周晓航 committed May 13, 2022
  
  7f6b4094 Browse Files
10 May, 2022 3 commits
- 【紧急】【盛香亭】储值卡增加营销规则同享配置（对内5.23，对外5.26） · d5a2a3da
  周晓航 committed May 10, 2022
  
  d5a2a3da Browse Files
- Merge branch 'release-门店拒绝的抖音核销ID1045995-20220421-zxh' into 'master' · 2090312c
```
Release 门店拒绝的抖音核销id1045995 20220421 zxh

See merge request !138
```
  缪晖 committed May 10, 2022
  2090312c Browse Files
- 【紧急】【盛香亭】储值卡增加营销规则同享配置（对内5.23，对外5.26） · cedddf18
  周晓航 committed May 10, 2022
  
  cedddf18 Browse Files
07 May, 2022 2 commits
- Merge branch 'KA-小程序展示抖音订单' into pre · 9f33dca2
  周晓航 committed May 07, 2022
  
  9f33dca2 Browse Files
- 订单列表展示小助手订单 · 0e5959b7
  周晓航 committed May 07, 2022
  
  0e5959b7 Browse Files
05 May, 2022 2 commits
- Merge remote-tracking branch 'remotes/origin/bugfix/多卡支付余额为0支付方式错误' into pre · 1d977c96
  胡敬轩 committed May 05, 2022
  
  1d977c96 Browse Files
- 多卡支付余额为0支付方式错误 · aa617b26
  胡敬轩 committed May 05, 2022
  
  aa617b26 Browse Files
04 May, 2022 2 commits
- Merge remote-tracking branch 'remotes/origin/bugfix/多卡支付余额为0支付方式错误' into pre · 51c1eaba
  胡敬轩 committed May 04, 2022
  
  51c1eaba Browse Files
- 多卡支付余额为0支付方式错误 · 2adf13e8
  胡敬轩 committed May 04, 2022
  
  2adf13e8 Browse Files
30 Apr, 2022 3 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