Commits · 88bab9aab5ac34ec731af39c9cc65eaf03465fef · order-group-application / order-group

17 Jan, 2022 1 commit
- 签名密钥取值修改 · 88bab9aa
  ping.wu committed Jan 17, 2022
  
  88bab9aa Browse Files
14 Jan, 2022 5 commits
- 签名密钥取值修改与签名联调 · 64733e56
  ping.wu committed Jan 14, 2022
  
  64733e56 Browse Files
- 签名密钥取值修改与签名联调 · a6fba59b
  ping.wu committed Jan 14, 2022
  
  a6fba59b Browse Files
- 删除调试代码 · e69c769c
  ping.wu committed Jan 14, 2022
  
  e69c769c Browse Files
- 周周惠storeId 统一前端门店id字段 · 2ef4971d
  ping.wu committed Jan 14, 2022
  
  2ef4971d Browse Files
- 周周惠 · 8d0a02bf
  ping.wu committed Jan 14, 2022
  
  8d0a02bf Browse Files
13 Jan, 2022 3 commits
- 周周惠 · d8a2b56d
  ping.wu committed Jan 13, 2022
  
  d8a2b56d Browse Files
- 周周惠 · 7941f5bf
  ping.wu committed Jan 13, 2022
  
  7941f5bf Browse Files
- 微信周周惠活动签名 · b1ccfa3a
  ping.wu committed Jan 13, 2022
  
  b1ccfa3a Browse Files
10 Jan, 2022 2 commits
- 提示修改 · ff09cd60
  ping.wu committed Jan 10, 2022
  
  ff09cd60 Browse Files
- Merge branch '202112310-增加商品单点不可下单功能-zhiwei.zha' · 9407fb9d
  查志伟 committed Jan 10, 2022
  
  9407fb9d Browse Files
05 Jan, 2022 1 commit
- 添加调用基础服务标识: 商户号 · 1ab2de56
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jan 05, 2022
  1ab2de56 Browse Files
04 Jan, 2022 7 commits
- 临时解决2807商户不可下预约单问题 · d74027bf
  查志伟 committed Jan 04, 2022
  
  d74027bf Browse Files
- Merge branch 'feature-ka半自动派单ID1040800-20211222-zxh' · 79409307
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
```
  周晓航 committed Jan 04, 2022
  79409307 Browse Files
- 自提单不走配送计算逻辑 · c7a34af5
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jan 04, 2022
  c7a34af5 Browse Files
- 自提单不走配送计算逻辑 · 2e0b8d10
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jan 04, 2022
  2e0b8d10 Browse Files
- 修改三方接口回参格式 · dc5fe109
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jan 04, 2022
  dc5fe109 Browse Files
- Merge branch '20211223-code_v4接口查询优化-zhiwei.zha' · 9a41a82f
  查志伟 committed Jan 04, 2022
  
  9a41a82f Browse Files
- 修改三方接口回参格式 · e215493c
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jan 04, 2022
  e215493c Browse Files
31 Dec, 2021 1 commit
- 商品支持不可单点下单功能 · aa063bfa
  查志伟 committed Dec 31, 2021
  
  aa063bfa Browse Files
30 Dec, 2021 4 commits
- 商家自配送不走手动\半自动派单 · 1d0351db
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 30, 2021
  1d0351db Browse Files
- 商家自配送不走手动\半自动派单 · 5df0690d
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 30, 2021
  5df0690d Browse Files
- 对接api修改 · 414e714f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 30, 2021
  414e714f Browse Files
- Merge branches 'feature/20211228_微信视频号卖券门店对接_wuping' and 'master' of… · 46d96f62
```
Merge branches 'feature/20211228_微信视频号卖券门店对接_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Dec 30, 2021
  46d96f62 Browse Files
29 Dec, 2021 5 commits
- Merge branches 'master' and '百旺发票改10000和30个订单-20211227-jxy' of… · 4df9e021
```
Merge branches 'master' and '百旺发票改10000和30个订单-20211227-jxy' of http://gitlab.freemud.com/order-group-application/order-group
```
  蒋小洋 committed Dec 29, 2021
  4df9e021 Browse Files
- Merge branch 'feature-维护POS商品编码ID1039549-zxh-20211123' · 97586e14
  周晓航 committed Dec 29, 2021
  
  97586e14 Browse Files
- 修复历史问题导致卖券订单无法享受促销优惠 · 5f89ab5f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 29, 2021
  5f89ab5f Browse Files
- Merge branch 'feature-维护POS商品编码ID1039549-zxh-20211123' · a3180250
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
```
  周晓航 committed Dec 29, 2021
  a3180250 Browse Files
- Merge branch '20211220-会员合并后支持退历史订单-zhiwei.zha' · 250b8061
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  查志伟 committed Dec 29, 2021
  250b8061 Browse Files
28 Dec, 2021 6 commits
- 老算价　满减配送费活动优惠记录到优惠总金额 · 4eb519cd
  ping.wu committed Dec 28, 2021
  
  4eb519cd Browse Files
- 加价购活动优惠为0,不记录订单级别优惠 · dca91832
  ping.wu committed Dec 28, 2021
  
  dca91832 Browse Files
- 修复生产NPE · a29ac354
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 28, 2021
  a29ac354 Browse Files
- 优化购物车调用促销的提示 · 4482097b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 28, 2021
  4482097b Browse Files
- 微信视频号订单上报判断修改 · 657edb66
  ping.wu committed Dec 28, 2021
  
  657edb66 Browse Files
- saas 微信视频号直播门店查询配置 · b9b87053
  ping.wu committed Dec 28, 2021
  
  b9b87053 Browse Files
27 Dec, 2021 5 commits
- Merge branch 'feature/20211224_订单业务类型改造合并分支_wuping' of… · f37c9caf
```
Merge branch 'feature/20211224_订单业务类型改造合并分支_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature/20211224_订单业务类型改造合并分支_wuping
```
  ping.wu committed Dec 27, 2021
  f37c9caf Browse Files
- 抖音小程序查询卖券订单处理，美业代码去除 · 88442623
  ping.wu committed Dec 27, 2021
  
  88442623 Browse Files
- 预定单预约单不走手动派单&半自动派单逻辑 · adcbc575
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 27, 2021
  adcbc575 Browse Files
- 预定单预约单预定时间校验模式修改 · ac94b49e
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 27, 2021
  ac94b49e Browse Files
- 预定单预约单预定时间校验模式修改 · 7fb2bb35
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 27, 2021
  7fb2bb35 Browse Files