Skip to content

O
order-group
Commit 90f9b2db by huiyang.chen
Options

Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop

parents 00ca24f2 bb3313c9
Showing with 2 additions and 2 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -2459,9 +2459,9 @@ public class OrderAdapter { ...@@ -2459,9 +2459,9 @@ public class OrderAdapter {
sdkUpdateOrderProductInfoRequest.setOrderClient(OrderClientType.WAI_MEAL.getIndex()); sdkUpdateOrderProductInfoRequest.setOrderClient(OrderClientType.WAI_MEAL.getIndex());
sdkUpdateOrderProductInfoRequest.setOpUpdateOrderItemEnum(AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPrice); sdkUpdateOrderProductInfoRequest.setOpUpdateOrderItemEnum(AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPrice);
sdkUpdateOrderProductInfoRequest.setThirdOrderCode(queryOrderByIdResponse.getData().getThirdOrderCode()); sdkUpdateOrderProductInfoRequest.setThirdOrderCode(queryOrderByIdResponse.getData().getThirdOrderCode());
/*sdkUpdateOrderProductInfoRequest.setActualPayAmount(shoppingCartGoodsResponse.getTotalAmount()); sdkUpdateOrderProductInfoRequest.setActualPayAmount(shoppingCartGoodsResponse.getTotalAmount());
sdkUpdateOrderProductInfoRequest.setOriginalAmount(shoppingCartGoodsResponse.getOriginalTotalAmount()); sdkUpdateOrderProductInfoRequest.setOriginalAmount(shoppingCartGoodsResponse.getOriginalTotalAmount());
sdkUpdateOrderProductInfoRequest.setSettlementAmount(shoppingCartGoodsResponse.getTotalAmount());*/ sdkUpdateOrderProductInfoRequest.setSettlementAmount(shoppingCartGoodsResponse.getTotalAmount());
sdkUpdateOrderProductInfoRequest.setUserId(assortmentCustomerInfoVo.getMemberId()); sdkUpdateOrderProductInfoRequest.setUserId(assortmentCustomerInfoVo.getMemberId());
sdkUpdateOrderProductInfoRequest.setUserName(assortmentCustomerInfoVo.getNickName()); sdkUpdateOrderProductInfoRequest.setUserName(assortmentCustomerInfoVo.getNickName());
sdkUpdateOrderProductInfoRequest.setOperator(assortmentCustomerInfoVo.getNickName()); sdkUpdateOrderProductInfoRequest.setOperator(assortmentCustomerInfoVo.getNickName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment