Commits · 75b499d492ca1ff3221c2f3b070d583fd2b82474 · order-group-application / order-group

22 Dec, 2020 5 commits
- Merge branch 'develop' of… · 75b499d4
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  缪晖 committed Dec 22, 2020
  75b499d4 Browse Files
- 基础订单sdk查询订单列表ES接口更新 · bf40161e
  缪晖 committed Dec 22, 2020
  
  bf40161e Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 82530220
  zhiheng.zhang committed Dec 22, 2020
  
  82530220 Browse Files
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into develop · af2b013b
  zhiheng.zhang committed Dec 22, 2020
  
  af2b013b Browse Files
- C端添加抖音小程序查询渠道 · dbeb3f31
  zhiheng.zhang committed Dec 22, 2020
  
  dbeb3f31 Browse Files
21 Dec, 2020 10 commits
- ordercentersdk-es查询条件添加营销活动类型字段 · dacf64bf
  缪晖 committed Dec 21, 2020
  
  dacf64bf Browse Files
- Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' into develop · dc94b0b4
  yu.sun committed Dec 21, 2020
  
  dc94b0b4 Browse Files
- sunyu::update::fix bug about cartGoods compare method · 9ef3647c
  yu.sun committed Dec 21, 2020
  
  9ef3647c Browse Files
- sunyu::update::update pom · b4bcf556
  yu.sun committed Dec 21, 2020
  
  b4bcf556 Browse Files
- Merge branch 'develop' of gitlab.freemud.com:order-group-application/order-group into develop · 12bcd633
  yu.sun committed Dec 21, 2020
  
  12bcd633 Browse Files
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into develop · 42285970
  zhiheng.zhang committed Dec 21, 2020
  
  42285970 Browse Files
- 渠道类型转换 · de7d4982
  zhiheng.zhang committed Dec 21, 2020
  
  de7d4982 Browse Files
- 支付sdk升级 · 7cb7f6df
  zhiheng.zhang committed Dec 21, 2020
  
  7cb7f6df Browse Files
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into develop · d6574606
  zhiheng.zhang committed Dec 21, 2020
  
  d6574606 Browse Files
- 删除多余的字段 · 5b8c1f52
  zhiheng.zhang committed Dec 21, 2020
  
  5b8c1f52 Browse Files
18 Dec, 2020 7 commits
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into develop · f4faf165
  zhiheng.zhang committed Dec 18, 2020
  
  f4faf165 Browse Files
- 抖音支付渠道为5 · 275092af
  zhiheng.zhang committed Dec 18, 2020
  
  275092af Browse Files
- Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' into develop · 077d0d0e
  yu.sun committed Dec 18, 2020
  
  077d0d0e Browse Files
- sdkjar包升级 · 942b0b9e
  zhiheng.zhang committed Dec 18, 2020
  
  942b0b9e Browse Files
- sunyu::update::可选商品加料 · 59b98e22
  yu.sun committed Dec 18, 2020
  
  59b98e22 Browse Files
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into develop · 7514f072
  zhiheng.zhang committed Dec 18, 2020
  
  7514f072 Browse Files
- 抖音支付更换返回值 · 54bbcd85
  zhiheng.zhang committed Dec 18, 2020
  
  54bbcd85 Browse Files
16 Dec, 2020 3 commits

sunyu::update::fix conflicts · 98c50659
孙昱 committed Dec 16, 2020

98c50659 Browse Files
sunyu::update::add new api about clear Money Coupon · 0913a6fe
孙昱 committed Dec 16, 2020

0913a6fe Browse Files

Merge branch 'feature/20201214-买一增一赠品价格修改-lcf' into develop · d720eca8

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-shoppingcart-sdk/pom.xml
#	assortment-shoppingcart-sdk/readme.md
#	call-back-service/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml

committed Dec 16, 2020

d720eca8 Browse Files

15 Dec, 2020 11 commits
- Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' · 7ea84534
  chongfu.liang committed Dec 15, 2020
  
  7ea84534 Browse Files
- 校验 · 395eb5e4
  chongfu.liang committed Dec 15, 2020
  
  395eb5e4 Browse Files
- Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' · d331f236
  chongfu.liang committed Dec 15, 2020
  
  d331f236 Browse Files
- 换购券 · a38c21b2
  chongfu.liang committed Dec 15, 2020
  
  a38c21b2 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop' · 2c32edf0
```
goodsTag取值逻辑修正

See merge request !96
```
  缪晖 committed Dec 15, 2020
  2c32edf0 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'master' · 05d702d6
```
goodsTag取值逻辑修正

See merge request !94
```
  缪晖 committed Dec 15, 2020
  05d702d6 Browse Files
- goodsTag取值逻辑修正 · f2896b45
  缪晖 committed Dec 15, 2020
  
  f2896b45 Browse Files
- SDK升级 · 2be4bd99
  chongfu.liang committed Dec 15, 2020
  
  2be4bd99 Browse Files
- Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' into develop · 5f5dd155
  chongfu.liang committed Dec 15, 2020
  
  5f5dd155 Browse Files
- 返回校验 · cfd03ae7
  chongfu.liang committed Dec 15, 2020
  
  cfd03ae7 Browse Files
- 买一增一价格修改 · a91d7897
  chongfu.liang committed Dec 15, 2020
  
  a91d7897 Browse Files
14 Dec, 2020 4 commits
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'master' · 883a8293
```
goodsTag新增列表配置

See merge request !93
```
  缪晖 committed Dec 14, 2020
  883a8293 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into develop · a2dfe842
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  缪晖 committed Dec 14, 2020
  a2dfe842 Browse Files
- goodsTag新增列表配置 · 586ea14a
  缪晖 committed Dec 14, 2020
  
  586ea14a Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'master' · 5f2687c2
```
拼单组合商品优惠价格计算修复

See merge request !90
```
  缪晖 committed Dec 14, 2020
  5f2687c2 Browse Files