Commits · 2817cc81500e74d5659ea5c36c0febde5a824f82 · order-group-application / order-group

12 Nov, 2021 11 commits
- Merge branches 'feature/20211112_1元捐插件_wuping' and 'qa' of… · 2817cc81
```
Merge branches 'feature/20211112_1元捐插件_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Nov 12, 2021
  2817cc81 Browse Files
- 获取参数修改 · 0a33e338
  ping.wu committed Nov 12, 2021
  
  0a33e338 Browse Files
- Merge branches 'feature/20211112_1元捐插件_wuping' and 'qa' of… · 150e98b7
```
Merge branches 'feature/20211112_1元捐插件_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Nov 12, 2021
  150e98b7 Browse Files
- 获取参数修改 · e4946141
  ping.wu committed Nov 12, 2021
  
  e4946141 Browse Files
- 合并后报错修改 · e2437d24
  ping.wu committed Nov 12, 2021
  
  e2437d24 Browse Files
- Merge branches 'feature/20211112_1元捐插件_wuping' and 'qa' of… · cc43dd5a
```
Merge branches 'feature/20211112_1元捐插件_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  ping.wu committed Nov 12, 2021
  cc43dd5a Browse Files
- 1元插件参数返回 · 4c0a2bbe
  ping.wu committed Nov 12, 2021
  
  4c0a2bbe Browse Files
- Merge remote-tracking branch 'origin/master' · 47c65956
  查志伟 committed Nov 12, 2021
  
  47c65956 Browse Files
- Merge branch '20211102-支持查询会员合并后的订单-zhiwei.zha' · 45dc37d8
  查志伟 committed Nov 12, 2021
  
  45dc37d8 Browse Files
- Merge branch '20211102-支持查询会员合并后的订单-zhiwei.zha' into qa · cef7c88a
  查志伟 committed Nov 12, 2021
  
  cef7c88a Browse Files
- fix 野翠山发票查询不到的问题 · ef32680c
  查志伟 committed Nov 12, 2021
  
  ef32680c Browse Files
11 Nov, 2021 7 commits
- 合并冲突解决 · 750cfbf0
  查志伟 committed Nov 11, 2021
  
  750cfbf0 Browse Files
- Merge branch '20210928-美团POS支持-zhiwei.zha' into qa · 94506312
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  查志伟 committed Nov 11, 2021
  94506312 Browse Files
- Merge branch 'KA-【华莱士】【半定制】一个订单多张优惠券使用场景-zxh' into qa · 30031ba5
  周晓航 committed Nov 11, 2021
  
  30031ba5 Browse Files
- 券门槛需要加上小料商品 · 669ad588
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 11, 2021
  669ad588 Browse Files
- Merge branch 'feature/xukang_20211110_野萃山商品券黑白名单问题' into qa · 897221be
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
```
  徐康 committed Nov 11, 2021
  897221be Browse Files
- 商品券白名单 · 88073db4
  徐康 committed Nov 11, 2021
  
  88073db4 Browse Files
- Merge branch 'feature/xukang_20211110_野萃山商品券黑白名单问题' into qa · a9c32464
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
```
  徐康 committed Nov 11, 2021
  a9c32464 Browse Files
10 Nov, 2021 15 commits
- Merge branch 'feature/V2.0.52_储值卡支持购买虚拟商品' · b93d453c
  徐光兴 committed Nov 10, 2021
  
  b93d453c Browse Files
- Merge branch 'feature-zxh-20211109-替换券码查询接口-1039131' into qa · f7c8ee9e
  周晓航 committed Nov 10, 2021
  
  f7c8ee9e Browse Files
- 修改时间传参格式 · e6a0a006
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 10, 2021
  e6a0a006 Browse Files
- Merge branch 'feature-zxh-20211109-替换券码查询接口-1039131' into qa · 8dd815a1
  周晓航 committed Nov 10, 2021
  
  8dd815a1 Browse Files
- 修改时间传参格式 · 23061473
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 10, 2021
  23061473 Browse Files
- Merge branch 'feature-zxh-20211109-替换券码查询接口-1039131' into qa · 6bd660eb
  周晓航 committed Nov 10, 2021
  
  6bd660eb Browse Files
- 修改时间传参格式 · cbde79f3
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 10, 2021
  cbde79f3 Browse Files
- 商品券白名单 · 8380af56
  徐康 committed Nov 10, 2021
  
  8380af56 Browse Files
- 美团pos需求去掉三方id保存的逻辑 · 9bea9884
  查志伟 committed Nov 10, 2021
  
  9bea9884 Browse Files
- Merge branch 'master' into 20210928-美团POS支持-zhiwei.zha · 9ed53478
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ActivityCalculationDiscountResponseDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  查志伟 committed Nov 10, 2021
  9ed53478 Browse Files
- Merge branch 'feature-zxh-20211109-替换券码查询接口-1039131' into qa · 03f9174b
  周晓航 committed Nov 10, 2021
  
  03f9174b Browse Files
- 修改时间传参格式 · 844e737d
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 10, 2021
  844e737d Browse Files
- Merge branch 'feature/V2.0.52_储值卡支持购买虚拟商品' into qa · 5187c70d
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
```
  徐光兴 committed Nov 10, 2021
  5187c70d Browse Files
- 修改逻辑。 · ec345320
  徐光兴 committed Nov 10, 2021
  
  ec345320 Browse Files
- Merge branch 'feature-zxh-20211109-替换券码查询接口-1039131' into qa · 8e4cf2bb
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
```
  周晓航 committed Nov 10, 2021
  8e4cf2bb Browse Files
09 Nov, 2021 7 commits
- Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'qa' of… · f26f5577
```
Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Nov 09, 2021
  f26f5577 Browse Files
- 对象错误修改 · 7e4d1eb0
  ping.wu committed Nov 09, 2021
  
  7e4d1eb0 Browse Files
- Merge branch 'feature/V2.0.52_储值卡支持购买虚拟商品' into qa · 97d84ff2
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
```
  徐光兴 committed Nov 09, 2021
  97d84ff2 Browse Files
- 增加储值卡svc商户配置 · 22d7fb64
  徐光兴 committed Nov 09, 2021
  
  22d7fb64 Browse Files
- Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'qa' of… · d9b29703
```
Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderQueueService.java
```
  ping.wu committed Nov 09, 2021
  d9b29703 Browse Files
- 缓存时间修改 · 612b4db3
  ping.wu committed Nov 09, 2021
  
  612b4db3 Browse Files
- Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'qa' of… · e8aca345
```
Merge branches 'feature/20211103_取消支付冲正库存幂等_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Nov 09, 2021
  e8aca345 Browse Files