- 22 May, 2020 3 commits
-
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-shoppingcart-sdk/pom.xml # assortment-shoppingcart-sdk/readme.md # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java # order-application-service/src/main/java/cn/freemud/service/AppOrderService.java # order-application-service/src/main/java/cn/freemud/service/OrderAdapterService.java # order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-management/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java # shopping-cart-application-service/pom.xml
dingkai committed -
# Conflicts: # order-management/pom.xml
shuhu.hou@freemud.cn committed -
dingkai committed
-
- 21 May, 2020 2 commits
-
-
ping.wu committed
-
Merge branches 'feature/20200421_申请退款任务_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # 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-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
ping.wu committed
-
- 20 May, 2020 1 commit
-
-
xiaoer.li committed
-
- 19 May, 2020 7 commits
-
-
Merge branches 'develop' and 'feature/20200506_取餐时间调整_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
# Conflicts: # order-management/pom.xml
shuhu.hou@freemud.cn committed -
shuhu.hou@freemud.cn committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/dto/order/CreatePrepayRequestDto.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java # ordercenter-sdk/pom.xml
shuhu.hou@freemud.cn committed -
shuhu.hou@freemud.cn committed
-
- 18 May, 2020 27 commits
-
-
ping.wu committed
-
ping.wu committed
-
胡超 committed
-
胡超 committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/AppOrderService.java # order-application-service/src/main/java/cn/freemud/service/OrderAdapterService.java # order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
dingkai committed -
胡超 committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml
胡超 committed -
胡超 committed
-
胡超 committed
-
dingkai committed
-
shuhu.hou@freemud.cn committed
-
Merge branches 'develop' and 'feature/20200506_取餐时间调整_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # order-application-service/pom.xml # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
haibo.jiang committed -
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # order-application-service/pom.xml # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
haibo.jiang committed -
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # order-application-service/pom.xml # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
haibo.jiang committed -
shuhu.hou@freemud.cn committed
-
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
haibo.jiang committed -
haibo.jiang committed
-
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
haibo.jiang committed -
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
haibo.jiang committed -
haibo.jiang committed
-
xiaoer.li committed
-
shuhu.hou@freemud.cn committed
-
shuhu.hou@freemud.cn committed
-
haibo.jiang committed
-
shuhu.hou@freemud.cn committed
-
