- 30 Dec, 2021 1 commit
-
-
Merge branches 'feature/20211228_微信视频号卖券门店对接_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed
-
- 29 Dec, 2021 5 commits
-
-
Merge branches 'master' and '百旺发票改10000和30个订单-20211227-jxy' of http://gitlab.freemud.com/order-group-application/order-group
蒋小洋 committed -
周晓航 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# 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 -
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
查志伟 committed
-
- 28 Dec, 2021 4 commits
- 27 Dec, 2021 5 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 -
蒋小洋 committed
-
- 25 Dec, 2021 1 commit
-
-
ping.wu committed
-
- 24 Dec, 2021 3 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 -
ping.wu committed
-
ping.wu committed
-
- 23 Dec, 2021 3 commits
- 22 Dec, 2021 3 commits
- 21 Dec, 2021 2 commits
-
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/impl/GradDeliveryServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
周晓航 committed
-
- 20 Dec, 2021 2 commits
- 17 Dec, 2021 3 commits
-
-
Merge branches 'feature/20211213_保存spu商品货号_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
胡敬轩 committed
-
- 16 Dec, 2021 8 commits
-
-
ping.wu committed
-
ping.wu committed
-
徐康 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 -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed
-
