Commits · aa55b7b8adc07d09bc2dfc58557751b611aca5ba · order-group-application / order-group

21 Dec, 2020 1 commit
- ordercenter-sdk添加markeringType字段 · aa55b7b8
  缪晖 committed Dec 21, 2020
  
  aa55b7b8 Browse Files
17 Dec, 2020 9 commits

sunyu::update::update assortment-shoppingCart-sdk · 7fcff535
孙昱 committed Dec 17, 2020

7fcff535 Browse Files
Merge branch 'feature/20201216_切换门店清除代金券缓存_yu.sun' into master_back · 0d8dedaf
孙昱 committed Dec 17, 2020

0d8dedaf Browse Files
合并 · dd50c569
邓杰 committed Dec 17, 2020

dd50c569 Browse Files

Merge branch '20201127_coco配送进程' into master_back · 5cd6ace1

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

committed Dec 17, 2020

5cd6ace1 Browse Files

Merge branch '20201125-coco-zhw' into 20201127_coco配送进程 · 0e06325a
邓杰 committed Dec 17, 2020

0e06325a Browse Files
Merge remote-tracking branch 'origin/master_back' into master_back · 24a51ac2
刘鹏飞 committed Dec 17, 2020

24a51ac2 Browse Files

Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into master_back · 6c4fe406

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartClearRequestVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

committed Dec 17, 2020

6c4fe406 Browse Files

Merge remote-tracking branch 'origin/bugfix/20201203_xukang_麦咖啡线上问题修复' into master_back · 41975219
徐康 committed Dec 17, 2020

41975219 Browse Files
Merge branch 'feature/20201201_xukang_麦咖啡p4v1' into master_back · a84b553a
徐康 committed Dec 17, 2020

a84b553a Browse Files

16 Dec, 2020 5 commits
- sunyu::update::update shopping-cart-application-sdk version · 91f1c0a5
  孙昱 committed Dec 16, 2020
  
  91f1c0a5 Browse Files
- sunyu::update::fix bug about money coupon at switchStore · c4cc09c3
  孙昱 committed Dec 16, 2020
  
  c4cc09c3 Browse Files
- sunyu::update::add new api about clear Money Coupon · 0913a6fe
  孙昱 committed Dec 16, 2020
  
  0913a6fe Browse Files
- coco点餐页购物车的展示 · 52a6f61e
  刘鹏飞 committed Dec 16, 2020
  
  52a6f61e Browse Files
- fix 预约时间判断 · 22b05626
  张洪旺 committed Dec 16, 2020
  
  22b05626 Browse Files
15 Dec, 2020 25 commits
- coco订单详情展示的商品单价需要加上小料的价格 · e45c234f
  刘鹏飞 committed Dec 15, 2020
  
  e45c234f Browse Files
- coco订单详情展示的商品单价需要加上小料的价格 · 33268a08
  刘鹏飞 committed Dec 15, 2020
  
  33268a08 Browse Files
- coco订单详情展示的商品单价需要加上小料的价格 · 340735c1
  刘鹏飞 committed Dec 15, 2020
  
  340735c1 Browse Files
- coco小料价格问题 · e09a3b6e
  刘鹏飞 committed Dec 15, 2020
  
  e09a3b6e Browse Files
- coco小料价格问题 · f312d3bb
  刘鹏飞 committed Dec 15, 2020
  
  f312d3bb Browse Files
- coco结算页商品现单价添加小料的计算 · febcb64c
  刘鹏飞 committed Dec 15, 2020
  
  febcb64c Browse Files
- coco结算页商品现单价添加小料的计算 · 32b33b9f
  刘鹏飞 committed Dec 15, 2020
  
  32b33b9f Browse Files
- coco点餐页购物车行价格商品现单价不做二次编辑 · 0270a33f
  刘鹏飞 committed Dec 15, 2020
  
  0270a33f Browse Files
- coco点餐页购物车行价格商品现单价不做二次编辑 · 34cdb393
  刘鹏飞 committed Dec 15, 2020
  
  34cdb393 Browse Files
- coco点餐页购物车行价格商品现单价不做二次编辑 · a5ed495f
  刘鹏飞 committed Dec 15, 2020
  
  a5ed495f Browse Files
- Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' · 7ea84534
  chongfu.liang committed Dec 15, 2020
  
  7ea84534 Browse Files
- 校验 · 395eb5e4
  chongfu.liang committed Dec 15, 2020
  
  395eb5e4 Browse Files
- coco加点日志 · 9d13cb3a
  刘鹏飞 committed Dec 15, 2020
  
  9d13cb3a 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 'master' · 05d702d6
```
goodsTag取值逻辑修正

See merge request !94
```
  缪晖 committed Dec 15, 2020
  05d702d6 Browse Files
- goodsTag取值逻辑修正 · f2896b45
  缪晖 committed Dec 15, 2020
  
  f2896b45 Browse Files
- coco半价行小料半价显示判空 · 542b5009
  刘鹏飞 committed Dec 15, 2020
  
  542b5009 Browse Files
- coco半价行小料半价显示 · 7cb91139
  刘鹏飞 committed Dec 15, 2020
  
  7cb91139 Browse Files
- coco半价行小料半价显示 · b33ad0f4
  刘鹏飞 committed Dec 15, 2020
  
  b33ad0f4 Browse Files
- 打点日志 · e667eee5
  刘鹏飞 committed Dec 15, 2020
  
  e667eee5 Browse Files
- 返回校验 · cfd03ae7
  chongfu.liang committed Dec 15, 2020
  
  cfd03ae7 Browse Files
- coco商品原单价=商品现单价+小料现单价 · ba905d33
  刘鹏飞 committed Dec 15, 2020
  
  ba905d33 Browse Files
- coco商品原单价=商品现单价+小料现单价 · d3d3bb8d
  刘鹏飞 committed Dec 15, 2020
  
  d3d3bb8d Browse Files
- coco支付有礼添加新的参数 · 1931658d
  刘鹏飞 committed Dec 15, 2020
  
  1931658d Browse Files