Commits · d3d38ddbd699de11505b8999fcbffd304362500f · order-group-application / order-group · GitLab

13 Oct, 2020 14 commits
- Merge remote-tracking branch 'origin/master' · d3d38ddb
  zhiheng.zhang committed Oct 14, 2020
  
  d3d38ddb Browse Files
- Merge branch 'feature/2020/09/07-1.9.38-优惠信息入库-张志恒' · 947e1e7f
  zhiheng.zhang committed Oct 14, 2020
  
  947e1e7f Browse Files
- Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of… · 5a559d1c
```
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 14, 2020
  5a559d1c Browse Files
- 处理缓存为字符串无法转换问题 · 5ea43207
  ping.wu committed Oct 14, 2020
  
  5ea43207 Browse Files
- Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of… · 6ade05dc
```
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 13, 2020
  6ade05dc Browse Files
- 去掉日志 · 7a465247
  ping.wu committed Oct 13, 2020
  
  7a465247 Browse Files
- Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of… · b5d5e1ce
```
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 13, 2020
  b5d5e1ce Browse Files
- 增加日志 · 0751e0eb
  ping.wu committed Oct 13, 2020
  
  0751e0eb Browse Files
- 修改判断 · 438396ca
  ping.wu committed Oct 13, 2020
  
  438396ca Browse Files
- 增加限购数量日志 · 6e508e26
  ping.wu committed Oct 13, 2020
  
  6e508e26 Browse Files
- Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of… · c3012672
```
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  ping.wu committed Oct 13, 2020
  c3012672 Browse Files
- 数量更新为0修改 · be69ebac
  ping.wu committed Oct 13, 2020
  
  be69ebac Browse Files
- 促销结果为空判断 · feaee55c
  ping.wu committed Oct 13, 2020
  
  feaee55c Browse Files
- sunyu::hotfix::fix bug about checkShoppingCartSdk method · e28223c3
  yu.sun committed Oct 13, 2020
  
  e28223c3 Browse Files
12 Oct, 2020 1 commit
- Merge remote-tracking branch 'origin/master' · b62de01f
  zhiheng.zhang committed Oct 12, 2020
  
  b62de01f Browse Files
10 Oct, 2020 3 commits
- 下单校验优惠券问题修复 · e3e51645
  徐康 committed Oct 10, 2020
  
  e3e51645 Browse Files
- Merge branch 'feature/2020/09/17-1.20-订单投传panChannelType-张志恒' · 92e199c7
  zhiheng.zhang committed Oct 10, 2020
  
  92e199c7 Browse Files
- Merge branch 'feature/2020/09/30-20-停车上订单未支付积分回退-张志恒' · e0f445f7
  zhiheng.zhang committed Oct 10, 2020
  
  e0f445f7 Browse Files
09 Oct, 2020 10 commits
- C端停车场订单只查询支付成功的订单 · 864d5bcc
  zhiheng.zhang committed Oct 09, 2020
  
  864d5bcc Browse Files
- C端停车场订单只查询支付成功的订单 · 3ebe1d7c
  zhiheng.zhang committed Oct 09, 2020
  
  3ebe1d7c Browse Files
- 合代码 · b609b68e
  徐康 committed Oct 09, 2020
  
  b609b68e Browse Files
- 记录使用的券暂时不上 · 87ae4bf9
  徐康 committed Oct 09, 2020
  
  87ae4bf9 Browse Files
- Merge remote-tracking branch 'origin/master' · 13af30e2
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Oct 09, 2020
  13af30e2 Browse Files
- 麦咖啡套餐多规格合代码 · b37dadbe
  徐康 committed Oct 09, 2020
  
  b37dadbe Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' · 311b45a5
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  徐康 committed Oct 09, 2020
  311b45a5 Browse Files
- Merge branch 'feature-yu.sun-getCartInfoByUser-20200925' · f10bef64
  孙昱 committed Oct 09, 2020
  
  f10bef64 Browse Files
- Merge branches 'feature/20200926_麦咖啡特定属性与加料_wuping' and 'master' of… · 9b7f03a1
```
Merge branches 'feature/20200926_麦咖啡特定属性与加料_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 09, 2020
  9b7f03a1 Browse Files
- 使用skuname · 6d7055fa
  徐康 committed Oct 09, 2020
  
  6d7055fa Browse Files
07 Oct, 2020 2 commits
- 套餐可选商品必选时候，传空键位失败 · 376d2d10
  ping.wu committed Oct 07, 2020
  
  376d2d10 Browse Files
- 套餐可选商品空键位 · 36338125
  ping.wu committed Oct 07, 2020
  
  36338125 Browse Files
06 Oct, 2020 1 commit
- sunyu::udpate::remove combineProductList · 104e3a5f
  孙昱 committed Oct 06, 2020
  
  104e3a5f Browse Files
05 Oct, 2020 1 commit
- 套餐价格取固定商品价格，总价格加可选商品价格 · 8a745e29
  ping.wu committed Oct 05, 2020
  
  8a745e29 Browse Files
30 Sep, 2020 4 commits
- 删除多余的日志 · 691a4b0e
  zhiheng.zhang committed Sep 30, 2020
  
  691a4b0e Browse Files
- 停车场订单正向逻辑 · 17e504e7
  zhiheng.zhang committed Sep 30, 2020
  
  17e504e7 Browse Files
- 停车场订单正向逻辑 · a470a7fe
  zhiheng.zhang committed Sep 30, 2020
  
  a470a7fe Browse Files
- 购物车数量限制修改 · 39153b59
  ping.wu committed Sep 30, 2020
  
  39153b59 Browse Files
29 Sep, 2020 3 commits
- 多规格定制属性赋值 · c883877c
  ping.wu committed Sep 29, 2020
  
  c883877c Browse Files
- 定制属性不一致商品非同一个商品 · f1bd5692
  ping.wu committed Sep 29, 2020
  
  f1bd5692 Browse Files
- 套餐多规格赋值修改 · 7135b453
  ping.wu committed Sep 29, 2020
  
  7135b453 Browse Files
28 Sep, 2020 1 commit
- Merge remote-tracking branch 'origin/master' · 59432323
  zhiheng.zhang committed Sep 29, 2020
  
  59432323 Browse Files