Commits · 92ffecc890cb654e3e15bb0c39aedf99f6889529 · order-group-application / order-group · GitLab

09 Dec, 2020 1 commit
- sunyu::conflicts::rollback about combo-product price calculate · 92ffecc8
  孙昱 committed Dec 09, 2020
  
  92ffecc8 Browse Files
08 Dec, 2020 1 commit
- sunyu::conflicts::fix bug about combo-product price calculate · 678cd3cc
  孙昱 committed Dec 08, 2020
  
  678cd3cc Browse Files
07 Dec, 2020 5 commits
- sunyu::update::fix bug about NPE · 830d18e1
  孙昱 committed Dec 07, 2020
  
  830d18e1 Browse Files
- sunyu::update::fix bug about NPE · c262860e
  孙昱 committed Dec 07, 2020
  
  c262860e Browse Files
- sunyu::update::fix bug about code conflicts · 0d556b3e
  孙昱 committed Dec 07, 2020
  
  0d556b3e Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into feature/20201112_套餐价格计算_yu.sun · 3310ad63
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
```
  孙昱 committed Dec 07, 2020
  3310ad63 Browse Files
- sunyu::update::fix bug about productService reponse code · 6a2cd0aa
  孙昱 committed Dec 07, 2020
  
  6a2cd0aa Browse Files
05 Dec, 2020 2 commits
- sunyu::update::fix bug about combo-product price calculate · 34275a17
  孙昱 committed Dec 05, 2020
  
  34275a17 Browse Files
- sunyu::fixbug::fix bug about combo-product calculate price · 25581b00
  孙昱 committed Dec 05, 2020
  
  25581b00 Browse Files
04 Dec, 2020 18 commits
- sunyu::update::add new class shoppingCartMccafeAdapter for commbox-product calculate price · bcadd874
  孙昱 committed Dec 05, 2020
  
  bcadd874 Browse Files
- sunyu::update::add new class shoppingCartMccafeAdapter for commbox-product calculate price · 772281d7
  孙昱 committed Dec 05, 2020
  
  772281d7 Browse Files
- sunyu::update::add new class shoppingCartMccafeAdapter for commbox-product calculate price · 1379fa73
  孙昱 committed Dec 05, 2020
  
  1379fa73 Browse Files
- sunyu::update::fix bug about combo-product calculate price · 57181980
  孙昱 committed Dec 05, 2020
  
  57181980 Browse Files
- sunyu::fix bug about combo-product calculate price · 018097c8
  yu.sun committed Dec 05, 2020
  
  018097c8 Browse Files
- sunyu::fix bug about combo-product calculate price · 370a4faf
  yu.sun committed Dec 05, 2020
  
  370a4faf Browse Files
- sunyu::fix bug about combo-product calculate price · 5afe39ea
  yu.sun committed Dec 05, 2020
  
  5afe39ea Browse Files
- sunyu::fix bug about combo-product calculate price · 8049cdd1
  yu.sun committed Dec 05, 2020
  
  8049cdd1 Browse Files
- sunyu::fix bug about combo-product calculate price · 049cc33a
  yu.sun committed Dec 05, 2020
  
  049cc33a Browse Files
- sunyu::fix bug about combo-product calculate · 2a722b73
  yu.sun committed Dec 04, 2020
  
  2a722b73 Browse Files
- sunyu::rollback calculate · c5af05c4
  yu.sun committed Dec 04, 2020
  
  c5af05c4 Browse Files
- sunyu::fixbug::fix bug about combox-product price calculate · 14a4aa9b
  yu.sun committed Dec 04, 2020
  
  14a4aa9b Browse Files
- sunyu::conflicts::resolve code conflicts · 95d0b30b
  yu.sun committed Dec 04, 2020
  
  95d0b30b Browse Files
- sunyu::fix bug ::fix bug about combox-product price calculate · e6f22f2a
  孙昱 committed Dec 04, 2020
  
  e6f22f2a Browse Files
- sunyu::update::fix bug about SET_MEAL_GOODS price calculate · 82af2351
  孙昱 committed Dec 04, 2020
  
  82af2351 Browse Files
- sunyu::update::rollback calculate shopping-cart add goods · 372d54c7
  孙昱 committed Dec 04, 2020
  
  372d54c7 Browse Files
- sunyu::update::add new class shoppingCartMccafeAdapter for commbox-product calculate price · e3948c41
  孙昱 committed Dec 04, 2020
  
  e3948c41 Browse Files
- sunyu::update::fixbug · abe84f02
  孙昱 committed Dec 04, 2020
  
  abe84f02 Browse Files
03 Dec, 2020 5 commits
- sunyu::update::fix bug about add singleSpec product to multipleSpec product · b4954e8e
  孙昱 committed Dec 03, 2020
  
  b4954e8e Browse Files
- sunyu::update::fix bug about combox-product price calculate · 24654fa6
  孙昱 committed Dec 03, 2020
  
  24654fa6 Browse Files
- sunyu::fix bug::fix bug about add singleSpec-product to multipleSpec product · aea4eb17
  孙昱 committed Dec 03, 2020
  
  aea4eb17 Browse Files
- sunyu::fixbug::fix bug about singleSpec-product and multipleSpec-product add to shoppingCart · 6b6b1dc4
  yu.sun committed Dec 03, 2020
  
  6b6b1dc4 Browse Files
- sunyu::update::add log info line · d5d858ed
  孙昱 committed Dec 03, 2020
  
  d5d858ed Browse Files
02 Dec, 2020 1 commit
- sunyu::update::fix bug about combox-product calculate · b725c56c
  孙昱 committed Dec 02, 2020
  
  b725c56c Browse Files
01 Dec, 2020 3 commits
- sunyu::update::fix bug about nullPointerException · 624d3e7a
  孙昱 committed Dec 01, 2020
  
  624d3e7a Browse Files
- sunyu::update::fix bug about nullPointException · 1e8cce6e
  孙昱 committed Dec 01, 2020
  
  1e8cce6e Browse Files
- sunyu::fixbug::add nonnull filter · 2014b816
  孙昱 committed Dec 01, 2020
  
  2014b816 Browse Files
30 Nov, 2020 1 commit
- 套餐中有单品组成的多规格，加料商品取值修改 · 0336c80f
  ping.wu committed Nov 30, 2020
  
  0336c80f Browse Files
27 Nov, 2020 3 commits
- sunyu::fix bug::fix bug about materialOriginalPrice is null to createOrder · db300e8d
  孙昱 committed Nov 27, 2020
  
  db300e8d Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' of… · 4255614d
```
Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' of gitlab.freemud.com:order-group-application/order-group into feature/20201125_多规格商品下添加单规格商品_yu.sun
```
  孙昱 committed Nov 27, 2020
  4255614d Browse Files
- sunyu::update::fix bug about delivery-fee payment · 27f9b6f0
  孙昱 committed Nov 27, 2020
  
  27f9b6f0 Browse Files