Commits · 497bd9bd1535fcd6d6bf4ebbe9050c8111c15de0 · order-group-application / order-group

27 Sep, 2021 2 commits
- Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'master' of… · 497bd9bd
```
Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  蒋小洋 committed Sep 27, 2021
  497bd9bd Browse Files
- 解决代码合并冲突 · 42a0a81e
  陈斌 committed Sep 27, 2021
  
  42a0a81e Browse Files
26 Sep, 2021 4 commits
- 发票查询2个月的数据 · 64639ffd
  蒋小洋 committed Sep 26, 2021
  
  64639ffd Browse Files
- 修改BUG · 948758bd
  蒋小洋 committed Sep 26, 2021
  
  948758bd Browse Files
- 校验订单 · 5eef2c3d
  陈斌 committed Sep 26, 2021
  
  5eef2c3d Browse Files
- update2 · 9e91a17e
  陈斌 committed Sep 26, 2021
  
  9e91a17e Browse Files
24 Sep, 2021 7 commits
- update · 32b181a8
  陈斌 committed Sep 24, 2021
  
  32b181a8 Browse Files
- update · 02b40a6a
  陈斌 committed Sep 24, 2021
  
  02b40a6a Browse Files
- 新增字段 marketingType 查询基础服务 · dc0b38ba
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 24, 2021
  dc0b38ba Browse Files
- 处理拼团订单支付成功会回调多次导致拼团订单退款的问题 · cf75e13d
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 24, 2021
  cf75e13d Browse Files
- update2 · f7922d4c
  陈斌 committed Sep 24, 2021
  
  f7922d4c Browse Files
- update · 9245b642
  陈斌 committed Sep 24, 2021
  
  9245b642 Browse Files
- 修复:运费模板接口字段变动导致订单NPE · a38ca696
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Sep 24, 2021
  a38ca696 Browse Files
23 Sep, 2021 3 commits
- 已退款状态 · 907c5a51
  蒋小洋 committed Sep 23, 2021
  
  907c5a51 Browse Files
- Merge branch 'feature/20210913_促销会员价三期_wuping' · 27752ba3
  查志伟 committed Sep 23, 2021
  
  27752ba3 Browse Files
- 订单发票数据入库增加endTime · 09814903
  陈斌 committed Sep 23, 2021
  
  09814903 Browse Files
22 Sep, 2021 9 commits
- 麦咖啡订单推送 · e9dd488f
  徐康 committed Sep 23, 2021
  
  e9dd488f Browse Files
- 麦咖啡订单推送 · 1cd3da8f
  徐康 committed Sep 23, 2021
  
  1cd3da8f Browse Files
- Merge remote-tracking branch 'origin/master' · 52e2aa37
  徐康 committed Sep 22, 2021
  
  52e2aa37 Browse Files
- 麦咖啡订单推送 · 31fe90a2
  徐康 committed Sep 22, 2021
  
  31fe90a2 Browse Files
- 查询订单列表返回可开票金额 · 5e83e193
  蒋小洋 committed Sep 22, 2021
  
  5e83e193 Browse Files
- 不默认 · d3d7d3e2
  蒋小洋 committed Sep 22, 2021
  
  d3d7d3e2 Browse Files
- 发票校验逻辑 · 0ac28e1f
  陈斌 committed Sep 22, 2021
  
  0ac28e1f Browse Files
- Merge remote-tracking branch 'origin/master' · 4177b1c0
  徐康 committed Sep 22, 2021
  
  4177b1c0 Browse Files
- 增加userid · 8f2c44a9
  徐康 committed Sep 22, 2021
  
  8f2c44a9 Browse Files
18 Sep, 2021 7 commits
- 发票校验逻辑 · c40355cb
  陈斌 committed Sep 18, 2021
  
  c40355cb Browse Files
- 发票url处理 · 7d04bff1
  陈斌 committed Sep 18, 2021
  
  7d04bff1 Browse Files
- update · 083931cf
  陈斌 committed Sep 18, 2021
  
  083931cf Browse Files
- update · 34f9639b
  陈斌 committed Sep 18, 2021
  
  34f9639b Browse Files
- update · 5dfc3122
  陈斌 committed Sep 18, 2021
  
  5dfc3122 Browse Files
- 订单开票 · 9bd2415e
  陈斌 committed Sep 18, 2021
  
  9bd2415e Browse Files
- update · b7bebd44
  陈斌 committed Sep 18, 2021
  
  b7bebd44 Browse Files
17 Sep, 2021 8 commits
- 日志 · 4677d095
  徐康 committed Sep 17, 2021
  
  4677d095 Browse Files
- 数据库字段长度调整 · f5e12cc9
  徐康 committed Sep 17, 2021
  
  f5e12cc9 Browse Files
- SDK升级 · 76402e33
  徐康 committed Sep 17, 2021
  
  76402e33 Browse Files
- SDK升级 · 7b3e8d4e
  徐康 committed Sep 17, 2021
  
  7b3e8d4e Browse Files
- SDK升级 · 211fd28b
  徐康 committed Sep 17, 2021
  
  211fd28b Browse Files
- Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' · d8f25d53
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java
```
  徐康 committed Sep 17, 2021
  d8f25d53 Browse Files
- 网关验证 · 4d349f1e
  徐康 committed Sep 17, 2021
  
  4d349f1e Browse Files
- 网关验证 · b6bb4bcb
  徐康 committed Sep 17, 2021
  
  b6bb4bcb Browse Files