Commits · 624d3e7a4ae0f233c5a671f086418cdb89e90ffe · order-group-application / order-group · GitLab

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
26 Nov, 2020 2 commits
- sunyu::update::fix bug about material about originPrice · 51c1df6a
  yu.sun committed Nov 26, 2020
  
  51c1df6a Browse Files
- sunyu::fixbug::fix bug about material · f07cd9f5
  yu.sun committed Nov 26, 2020
  
  f07cd9f5 Browse Files
25 Nov, 2020 3 commits
- sunyu::update::fix bug about multipleSpec add singleSpec product · 45acdbb8
  孙昱 committed Nov 25, 2020
  
  45acdbb8 Browse Files
- sunyu::update::fix bug about multipleSpec add singleSpec product and material · 5bad4a62
  孙昱 committed Nov 25, 2020
  
  5bad4a62 Browse Files
- sunyu::new function::about multipleSpec product add singleSpec product and material · e21da78e
  yu.sun committed Nov 25, 2020
  
  e21da78e Browse Files
24 Nov, 2020 3 commits
- Merge branch 'feature/new-fixbig' · 6f457559
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  6f457559 Browse Files
- fix · 8ce0a122
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  8ce0a122 Browse Files
- debug · c68750a7
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  c68750a7 Browse Files
23 Nov, 2020 2 commits
- 套餐取finalPrice · 828558a0
  xiaoer.li@freemud.com committed Nov 23, 2020
  
  828558a0 Browse Files
- fix · 2a36f3ff
  xiaoer.li@freemud.com committed Nov 23, 2020
  
  2a36f3ff Browse Files
17 Nov, 2020 1 commit
- fix · 40f28a76
  xiaoer.li@freemud.com committed Nov 17, 2020
  
  40f28a76 Browse Files
12 Nov, 2020 9 commits
- Merge remote-tracking branch 'origin/feature/20201112_fixbug-getCouponNameByCode_yu.sun' · aa39d0e3
  yu.sun committed Nov 12, 2020
  
  aa39d0e3 Browse Files
- Merge branch 'feature/20201112_优惠为0的券也要核销_xukang' · 8920c151
  徐康 committed Nov 12, 2020
  
  8920c151 Browse Files
- sunyu::fixbug::fix bug about getCouponNameByCode · 7ddf01d5
  yu.sun committed Nov 12, 2020
  
  7ddf01d5 Browse Files
- Merge branch 'feature/2.0.5-配送单异常或取消状态，通知pos' · c0493117
  chongfu.liang committed Nov 12, 2020
  
  c0493117 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/refundJudgeNull-刘鹏飞' into develop · b8c6416e
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
```
  刘鹏飞 committed Nov 12, 2020
  b8c6416e Browse Files
- setAfterSalesOrderTimeOutTask如果配置为空返回null · c4be9dca
  刘鹏飞 committed Nov 12, 2020
  
  c4be9dca Browse Files
- 0元优惠处理 · d61d9f5e
  徐康 committed Nov 12, 2020
  
  d61d9f5e Browse Files
- Merge branch 'feature/2.0.5-储值卡支持推配送费' · 06caa08c
  chongfu.liang committed Nov 12, 2020
  
  06caa08c Browse Files
- 下单err更新 · 5adc8e8e
  刘鹏飞 committed Nov 12, 2020
  
  5adc8e8e Browse Files
11 Nov, 2020 7 commits
- Merge branch 'feature/2.0.5【ID1018638】【C端服务端】活动库存接口调整对接-sdk版本打包' into 'master' · 5c63e07d
```
jar版本号修复

See merge request !10
```
  缪晖 committed Nov 11, 2020
  5c63e07d Browse Files
- jar版本号修复 · 23adfb6f
  缪晖 committed Nov 11, 2020
  
  23adfb6f Browse Files
- Merge branch 'feature/2.0.5【ID1018638】【C端服务端】活动库存接口调整对接-sdk版本打包' into 'master' · fdac3748
```
master分支sdk版本升级

See merge request !9
```
  缪晖 committed Nov 11, 2020
  fdac3748 Browse Files
- master分支sdk版本升级 · 2b4c4047
  缪晖 committed Nov 11, 2020
  
  2b4c4047 Browse Files
- Merge branch 'feature/2.0.5【ID1018638】【C端服务端】活动库存接口调整对接' into 'master' · 8a2c3f68
```
Feature/2.0.5【id1018638】【c端服务端】活动库存接口调整对接

See merge request !8
```
  缪晖 committed Nov 11, 2020
  8a2c3f68 Browse Files
- 预发布环境活动sdk版本升级至2.7.RELEASE · 3f38b0e7
  缪晖 committed Nov 11, 2020
  
  3f38b0e7 Browse Files
- Merge remote-tracking branch 'remotes/origin/20201026-queryRefundCount-刘鹏飞' into master · 7dd68d5b
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	ordercenter-sdk/pom.xml
```
  刘鹏飞 committed Nov 11, 2020
  7dd68d5b Browse Files
10 Nov, 2020 6 commits
- 主动清除的逻辑先去掉，测试 · 7886003b
  刘鹏飞 committed Nov 10, 2020
  
  7886003b Browse Files
- 增加错误信息日志 · d2ff39e5
  刘鹏飞 committed Nov 10, 2020
  
  d2ff39e5 Browse Files
- 升级assortment-ordercenter-sdk版本为2.1.3-SNAPSHOT · 2c58fee5
  刘鹏飞 committed Nov 10, 2020
  
  2c58fee5 Browse Files
- 升级assortment-ordercenter-sdk版本号2.1.3-SNAPSHOT · de3d5cba
  刘鹏飞 committed Nov 10, 2020
  
  de3d5cba Browse Files
- 下单锁定的key设置默认时间 · d6f6a270
  刘鹏飞 committed Nov 10, 2020
  
  d6f6a270 Browse Files
- 创建订单添加redis锁，防止重复创建订单 · fdb9daa6
  刘鹏飞 committed Nov 10, 2020
  
  fdb9daa6 Browse Files