Commits · 6946e6a731a7595acad1b17351c10aa641820178 · order-group-application / order-group

08 Jul, 2021 1 commit
- kehuo need auto order complete · 6946e6a7
  缪晖 committed Jul 08, 2021
  
  6946e6a7 Browse Files
07 Jul, 2021 9 commits
- kehuo need auto order complete · 2a952469
  缪晖 committed Jul 07, 2021
  
  2a952469 Browse Files
- Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'master' of… · 236f2051
```
Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jul 07, 2021
  236f2051 Browse Files
- Merge branch 'KA-20210617评价有礼ID1031153-周晓航' · c6dc0449
  周晓航 committed Jul 07, 2021
  
  c6dc0449 Browse Files
- 字段属性赋值 · b4ad3cc4
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 07, 2021
  b4ad3cc4 Browse Files
- Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group · cc0e4a3d
  周晓航 committed Jul 07, 2021
  
  cc0e4a3d Browse Files
- 修改 pom里面 assortment-data-manager 的版本为最新 5.5.16.reseale · 0a899b25
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 07, 2021
  0a899b25 Browse Files
- Merge branches 'feature/20210707_wuping' and 'master' of… · e71f74bc
```
Merge branches 'feature/20210707_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  ping.wu committed Jul 07, 2021
  e71f74bc Browse Files
- 去除打印日志 · 592ab7ee
  ping.wu committed Jul 07, 2021
  
  592ab7ee Browse Files
- Merge branch 'KA-20210617评价有礼ID1031153-周晓航' · 5a7c5e71
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java
```
  周晓航 committed Jul 07, 2021
  5a7c5e71 Browse Files
06 Jul, 2021 6 commits
- 增加消耗时间 · 4fd3538c
  胡博文 committed Jul 07, 2021
  
  4fd3538c Browse Files
- 打印日志 · 965f3d1f
  ping.wu committed Jul 07, 2021
  
  965f3d1f Browse Files
- 蜜雪APP取消订单重复，取消支付准确提示 · af9af288
  ping.wu committed Jul 06, 2021
  
  af9af288 Browse Files
- 调用取消支付接口查询支付状态，关闭预支付订单 · 5b14488d
  ping.wu committed Jul 06, 2021
  
  5b14488d Browse Files
- 蜜雪APP 取消支付接口合并 · d82e224b
  ping.wu committed Jul 06, 2021
  
  d82e224b Browse Files
- 裂变活动接口迁移换新接口 · fe8d1432
  ping.wu committed Jul 06, 2021
  
  fe8d1432 Browse Files
05 Jul, 2021 3 commits
- 无修改提交 · bb2eef4f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 05, 2021
  bb2eef4f Browse Files
- 日志变动 · 6b51fc92
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 05, 2021
  6b51fc92 Browse Files
- 小料三方商品id修复 · a69ed155
  王世昌 committed Jul 05, 2021
  
  a69ed155 Browse Files
02 Jul, 2021 1 commit
- 总优惠金额新增活动满减配送费优惠金额 · a046c2ff
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 02, 2021
  a046c2ff Browse Files
01 Jul, 2021 8 commits
- 门店数据错误校验 · 41d984ff
  ping.wu committed Jul 01, 2021
  
  41d984ff Browse Files
- 新增字段 · 59fc762b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 01, 2021
  59fc762b Browse Files
- bug 修复使用多券核销 · f817e297
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 01, 2021
  f817e297 Browse Files
- bug 修复使用多券核销 · 150ae092
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 01, 2021
  150ae092 Browse Files
- 核销日志数据 · de80cc8c
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 01, 2021
  de80cc8c Browse Files
- 新增字段 · c78c45d5
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jul 01, 2021
  c78c45d5 Browse Files
- sdk 升级 · b74e8276
  zhiheng.zhang committed Jul 01, 2021
  
  b74e8276 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20210610-开放平台取消订单接口移动-张志恒' · 1d534cd1
  zhiheng.zhang committed Jul 01, 2021
  
  1d534cd1 Browse Files
30 Jun, 2021 12 commits
- Merge branch 'KA-20210622-ID1032306总部和区域活动可同时生效-周晓航' · e985febb
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/vo/PayGiftWechatCouponInfoVo.java
```
  周晓航 committed Jun 30, 2021
  e985febb Browse Files
- 提交代码 · 8139d5ce
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 30, 2021
  8139d5ce Browse Files
- Merge branch 'KA-20210622-ID1032306总部和区域活动可同时生效-周晓航' · a110f961
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/vo/PayGiftCouponVo.java
```
  周晓航 committed Jun 30, 2021
  a110f961 Browse Files
- 提交代码 · ea4ccbef
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 30, 2021
  ea4ccbef Browse Files
- 提交代码 · 08120ab8
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 30, 2021
  08120ab8 Browse Files
- Merge branch 'KA-20210622-ID1032306总部和区域活动可同时生效-周晓航' · 05d7233c
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
```
  周晓航 committed Jun 30, 2021
  05d7233c Browse Files
- 提交代码 · a4be53b3
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 30, 2021
  a4be53b3 Browse Files
- 提交代码 · f1abfc5f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 30, 2021
  f1abfc5f Browse Files
- Merge branch 'KA-20210622-ID1032306总部和区域活动可同时生效-周晓航' · 7b8e8bf3
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  周晓航 committed Jun 30, 2021
  7b8e8bf3 Browse Files
- 提交代码 · af59a6a4
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 30, 2021
  af59a6a4 Browse Files
- 提交代码 · e5d486c6
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 30, 2021
  e5d486c6 Browse Files
- Merge branch 'KA-20210622-ID1032306总部和区域活动可同时生效-周晓航' · c5ac5e7b
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivitysDtoNew.java
```
  周晓航 committed Jun 30, 2021
  c5ac5e7b Browse Files