Commits · dbf8f2119c93f54f203c6ac1cdaa58d99e9abc3b · order-group-application / order-group

23 Nov, 2021 2 commits
- 合并代码 · dbf8f211
  ping.wu committed Nov 23, 2021
  
  dbf8f211 Browse Files
- 门店配送信息接口合并到门店综合查询接口 · 7c620afc
  ping.wu committed Nov 23, 2021
  
  7c620afc Browse Files
19 Nov, 2021 11 commits
- Merge branch 'feature-20211115-视频卖券ID1039458-zxh-look' · bb3225d7
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderResponseVo.java
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
```
  周晓航 committed Nov 19, 2021
  bb3225d7 Browse Files
- 删除提示语改动 · 3c9f00ad
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 19, 2021
  3c9f00ad Browse Files
- Merge branches 'feature/20211112_1元捐插件_wuping' and 'master' of… · 6e6221d8
```
Merge branches 'feature/20211112_1元捐插件_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
```
  ping.wu committed Nov 19, 2021
  6e6221d8 Browse Files
- 上生产修改版本信息 · 7c319713
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 19, 2021
  7c319713 Browse Files
- fix 卖券订单创建兼容储值卡支付 · c9b9a18c
  徐光兴 committed Nov 19, 2021
  
  c9b9a18c Browse Files
- 删除无效代码 · 99d40d8f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 19, 2021
  99d40d8f Browse Files
- 删除无效代码准备上预发布 · 5021ce2f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 19, 2021
  5021ce2f Browse Files
- 存储用户的openid · 09311189
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 19, 2021
  09311189 Browse Files
- 使用master维护的卖券extinfo信息 · 29fd0eeb
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 19, 2021
  29fd0eeb Browse Files
- Merge branch 'master' into feature-20211115-视频卖券ID1039458-zxh-look · 301ae05e
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
```
  周晓航 committed Nov 19, 2021
  301ae05e Browse Files
- 删除extinfo 的维护 · bbb46862
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 19, 2021
  bbb46862 Browse Files
18 Nov, 2021 12 commits
- 卖券订单更新订单 · b552280c
  ping.wu committed Nov 19, 2021
  
  b552280c Browse Files
- 修改上报订单数据状态 · 1ce3a768
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 18, 2021
  1ce3a768 Browse Files
- 上报数据处理 · 529ac38f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 18, 2021
  529ac38f Browse Files
- 上报数据处理 · b791829c
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 18, 2021
  b791829c Browse Files
- 修复枚举判断问题 · 40cc98bf
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 18, 2021
  40cc98bf Browse Files
- Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'master' of… · 67801862
```
Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Nov 18, 2021
  67801862 Browse Files
- 积分商城兑换记录查询时间调整 · 15600225
  ping.wu committed Nov 18, 2021
  
  15600225 Browse Files
- Merge branch 'fix-卖券参加活动限制传参' · a9161f2f
  周晓航 committed Nov 18, 2021
  
  a9161f2f Browse Files
- Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'master' of… · fe88b2ce
```
Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Nov 18, 2021
  fe88b2ce Browse Files
- 处理集合中返回null对象报错 · 2c1fe837
  ping.wu committed Nov 18, 2021
  
  2c1fe837 Browse Files
- 调用促销传递isaas参数 · 06d22a8d
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 18, 2021
  06d22a8d Browse Files
- 券包参加活动的数量限制 · 6b09148e
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 18, 2021
  6b09148e Browse Files
17 Nov, 2021 15 commits
- 修改 token的刷新机制 · 72cae5aa
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 17, 2021
  72cae5aa Browse Files
- 测试controller · cefeab39
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 17, 2021
  cefeab39 Browse Files
- 测试controller · bcebfa9f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 17, 2021
  bcebfa9f Browse Files
- 测试controller · 11af4899
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 17, 2021
  11af4899 Browse Files
- 测试controller · fc5ba80f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 17, 2021
  fc5ba80f Browse Files
- 测试controller · fe3b98a4
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 17, 2021
  fe3b98a4 Browse Files
- 测试controller · 4ea2e54e
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 17, 2021
  4ea2e54e Browse Files
- 测试controller · 764dda86
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 17, 2021
  764dda86 Browse Files
- 修改反馈类 · 11f7c1d9
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 17, 2021
  11f7c1d9 Browse Files
- 修改卖券直播商品配置的静态路径读取 apollo · ba8f5e69
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 17, 2021
  ba8f5e69 Browse Files
- 卖券新增extinfo 字段维护 · ffcbc061
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 17, 2021
  ffcbc061 Browse Files
- 支付门店判断 · 647bb77a
  蒋小洋 committed Nov 17, 2021
  
  647bb77a Browse Files
- 卖券新增extinfo 字段维护 · 3c183714
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 17, 2021
  3c183714 Browse Files
- 增加getset方法 · 874977d0
  ping.wu committed Nov 17, 2021
  
  874977d0 Browse Files
- 订单删除数据上报测试 · bfd544af
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 17, 2021
  bfd544af Browse Files