Commits · c010847fee3ec07a79450d818077c6080e1720a5 · order-group-application / order-group

20 Aug, 2020 2 commits
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · c010847f
  zhiheng.zhang committed Aug 20, 2020
  
  c010847f Browse Files
- 返回值修改statusCode · 015b96d2
  zhiheng.zhang committed Aug 20, 2020
  
  015b96d2 Browse Files
19 Aug, 2020 9 commits
- Merge branch 'feature/2020/08/013-1.9.35-停车场查询优化-张志恒' into qa · 9fc0d93c
  zhiheng.zhang committed Aug 19, 2020
  
  9fc0d93c Browse Files
- queryOrderByCode 方法添加时间戳参数（重复去除） · f0b82153
  zhiheng.zhang committed Aug 19, 2020
  
  f0b82153 Browse Files
- Merge branch 'feature/2020/08/013-1.9.35-停车场查询优化-张志恒' into qa · ce1b0e51
  zhiheng.zhang committed Aug 19, 2020
  
  ce1b0e51 Browse Files
- queryOrderByCode 方法添加时间戳参数 · 07c46363
  zhiheng.zhang committed Aug 19, 2020
  
  07c46363 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 68f5ec90
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  68f5ec90 Browse Files
- 加料支持多活动均摊 · 58aa074b
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  58aa074b Browse Files
- fix · 0b198d5d
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  0b198d5d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · c437e323
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  c437e323 Browse Files
- fix · af54c69e
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  af54c69e Browse Files
18 Aug, 2020 20 commits
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · 5257e2ce
  zhiheng.zhang committed Aug 18, 2020
  
  5257e2ce Browse Files
- 冲正和核销逻辑处理优化 · 268513db
  zhiheng.zhang committed Aug 18, 2020
  
  268513db Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · 2c6e5eea
  zhiheng.zhang committed Aug 18, 2020
  
  2c6e5eea Browse Files
- 添加mq发送消息参数 · 9bf373fa
  zhiheng.zhang committed Aug 18, 2020
  
  9bf373fa Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · e18f40f9
  xiaoer.li@freemud.com committed Aug 18, 2020
  
  e18f40f9 Browse Files
- 调整PK取值 · 19bd1176
  xiaoer.li@freemud.com committed Aug 18, 2020
  
  19bd1176 Browse Files
- autotype fix · 6a9a91b0
  shuhu.hou@freemud.cn committed Aug 18, 2020
  
  6a9a91b0 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · 17c7a795
  zhiheng.zhang committed Aug 18, 2020
  
  17c7a795 Browse Files
- 支付渠道添加判断是否为微信支付，如果是则锁定，否则核销 · 6975111d
  zhiheng.zhang committed Aug 18, 2020
  
  6975111d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 90bcab14
  xiaoer.li@freemud.com committed Aug 18, 2020
  
  90bcab14 Browse Files
- 去掉行记录计算 · e5202df4
  xiaoer.li@freemud.com committed Aug 18, 2020
  
  e5202df4 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · 93c1569b
  zhiheng.zhang committed Aug 18, 2020
  
  93c1569b Browse Files
- 券码核销添加日志测试 · 97551040
  zhiheng.zhang committed Aug 18, 2020
  
  97551040 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 024b14d6
  xiaoer.li@freemud.com committed Aug 18, 2020
  
  024b14d6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · e34be64e
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java
```
  xiaoer.li@freemud.com committed Aug 18, 2020
  e34be64e Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · b30021ed
  zhiheng.zhang committed Aug 18, 2020
  
  b30021ed Browse Files
- 促销计算增加spuId · cee05f47
  xiaoer.li@freemud.com committed Aug 18, 2020
  
  cee05f47 Browse Files
- 券码核销添加日志测试 · 490efa21
  zhiheng.zhang committed Aug 18, 2020
  
  490efa21 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · 46a5e257
  zhiheng.zhang committed Aug 18, 2020
  
  46a5e257 Browse Files
- 新版核销后无需调用移除卡包功能，只需要调用核销逻辑 · 956cf184
  zhiheng.zhang committed Aug 18, 2020
  
  956cf184 Browse Files
17 Aug, 2020 9 commits

删除多余的方法 · 3c432034
zhiheng.zhang committed Aug 17, 2020

3c432034 Browse Files
Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · f2c44910
zhiheng.zhang committed Aug 17, 2020

f2c44910 Browse Files
添加异常信息 · 6dd3c8de
zhiheng.zhang committed Aug 17, 2020

6dd3c8de Browse Files
删除source属性 · f8f9882a
zhiheng.zhang committed Aug 17, 2020

f8f9882a Browse Files
Merge remote-tracking branch 'origin/qa' into qa · 5972aad7
徐康 committed Aug 17, 2020

5972aad7 Browse Files
合创单、支付成功、申请退款代码 · b8e140fd
徐康 committed Aug 17, 2020

b8e140fd Browse Files
重复代码删除 · 41ea422b
ping.wu committed Aug 17, 2020

41ea422b Browse Files

Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · deb41696

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/OrderApplication.java
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/OrderAdapterService.java
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java
#	order-management/src/main/java/cn/freemud/management/thirdparty/CouponOfflineMCCafeClient.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

committed Aug 17, 2020

deb41696 Browse Files

Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of… · 2da98399

Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java

committed Aug 17, 2020

2da98399 Browse Files