- 13 May, 2020 4 commits
-
-
shuhu.hou@freemud.cn committed
-
# 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 # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
shuhu.hou@freemud.cn committed -
shuhu.hou@freemud.cn committed
-
xiaoer.li@freemud.com committed
-
- 12 May, 2020 36 commits
-
-
胡超 committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-shoppingcart-sdk/pom.xml # order-application-service/pom.xml # shopping-cart-application-service/pom.xml
胡超 committed -
[assortment-shoppingcart-sdk] couponcenter-sdk 根据点餐方式、校验商品券是否满足 updateSpqCartGoodsInfo ->getCouponsDetail -> getCouponsDetail -> onlineCouponSdkService.allDetail [shopping-cart-application] freemud-card-sdk couponcenter-sdk assortment-shoppingcart-sdk 1.添加商品校验券是否有效 2.校验商品券 ？ 3.创建订单时候用、去支付时候 4.查询购物车商品列表 批次查询券详情(code_v4) couponOnlineClient.getCouponDetails [assortment-ordercenter-sdk] couponcenter-sdk 创建订单-核销券接口： updateStockAndScore - offlineCouponSdkService.couponRedeem [order-application-service] couponcenter-sdk assortment-ordercenter-sdk 核销券
胡超 committed -
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
姜海波 committed -
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
姜海波 committed -
姜海波 committed
-
姜海波 committed
-
# Conflicts: # order-application-service/pom.xml
shuhu.hou@freemud.cn committed -
shuhu.hou@freemud.cn committed
-
Merge branches 'feature/20200423_蜜雪新下单接口_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
Merge branches 'develop' and 'feature/20200423_蜜雪新下单接口_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
xiang.ru committed
-
ping.wu committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
xiang.ru committed -
Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # assortment-ordercenter-sdk/pom.xml
ping.wu committed -
姜海波 committed
-
ping.wu committed
-
xiang.ru committed
-
Merge branches 'develop' and 'feature/20200423_蜜雪新下单接口_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
dingkai committed
-
dingkai committed
-
dingkai committed
-
dingkai committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
dingkai committed -
dingkai committed
-
http://gitlab.freemud.com/order-group-application/order-group
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # ordercenter-sdk/readme.md
姜海波 committed -
姜海波 committed
-
姜海波 committed
-
张明警 committed
-
姜海波 committed
-
张明警 committed
-
dingkai committed
-
