- 30 Dec, 2021 2 commits
- 29 Dec, 2021 2 commits
- 28 Dec, 2021 12 commits
-
-
Merge branches 'feature/20211228_微信视频号卖券门店对接_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'feature/20211224_订单业务类型改造合并分支_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerExtendClient.java # shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomScoreClient.java
ping.wu committed -
ping.wu committed
-
# Conflicts: # order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
周晓航 committed -
Merge branches 'feature/20211228_微信视频号卖券门店对接_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
- 27 Dec, 2021 8 commits
-
-
Merge branch 'feature/20211224_订单业务类型改造合并分支_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature/20211224_订单业务类型改造合并分支_wuping
ping.wu committed -
ping.wu committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'qa' and '百旺发票改10000和30个订单-20211227-jxy' of http://gitlab.freemud.com/order-group-application/order-group into qa
蒋小洋 committed -
蒋小洋 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed
-
- 25 Dec, 2021 1 commit
-
-
ping.wu committed
-
- 24 Dec, 2021 10 commits
-
-
Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'feature/20211224_订单业务类型改造合并分支_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature/20211224_订单业务类型改造合并分支_wuping # Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/enums/OrderStatus.java # order-application-service/src/main/java/cn/freemud/enums/OrderType.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerExtendClient.java
ping.wu committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'feature/20211220_购物车活动互斥提示_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
ping.wu committed
-
1.优先匹配是否活动日 2.工作日/双休日二选一,不会出现没有的情况(产品明确) Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
ping.wu committed
-
Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # order-management/src/main/java/cn/freemud/management/service/OrderBaseService.java
ping.wu committed -
ping.wu committed
-
- 23 Dec, 2021 5 commits
-
-
查志伟 committed
-
查志伟 committed
-
查志伟 committed
-
Merge branches 'feature/20211220_购物车活动互斥提示_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java
ping.wu committed -
ping.wu committed
-
