Commit 5b7c2579 by zhiheng.zhang

华莱士更新

parent fbe2f77a
...@@ -109,7 +109,7 @@ public class MallOrderAdapter { ...@@ -109,7 +109,7 @@ public class MallOrderAdapter {
} }
public BaseCreateOrderRequest getCreateOrderDto(CreateOrderVo createOrderVo) { public BaseCreateOrderRequest getCreateOrderDto(CreateOrderVo createOrderVo) {
// UserDeliveryInfoDto userDeliveryInfoDto = createOrderVo.getUserDeliveryInfoDto(); UserDeliveryInfoDto userDeliveryInfoDto = createOrderVo.getUserDeliveryInfoDto();
String remark = StringUtils.isNotBlank(createOrderVo.getOrderRemark()) ? createOrderVo.getOrderRemark() : ""; String remark = StringUtils.isNotBlank(createOrderVo.getOrderRemark()) ? createOrderVo.getOrderRemark() : "";
BaseCreateOrderRequest createOrderDto = new BaseCreateOrderRequest(); BaseCreateOrderRequest createOrderDto = new BaseCreateOrderRequest();
createOrderDto.setCompanyId(createOrderVo.getPartnerId()); createOrderDto.setCompanyId(createOrderVo.getPartnerId());
...@@ -117,11 +117,11 @@ public class MallOrderAdapter { ...@@ -117,11 +117,11 @@ public class MallOrderAdapter {
createOrderDto.setThirdShopId(createOrderVo.getThirdShopId()); createOrderDto.setThirdShopId(createOrderVo.getThirdShopId());
createOrderDto.setShopName(createOrderVo.getStoreName()); createOrderDto.setShopName(createOrderVo.getStoreName());
createOrderDto.setUserId(createOrderVo.getUserId()); createOrderDto.setUserId(createOrderVo.getUserId());
// createOrderDto.setUserName(userDeliveryInfoDto.getReceiveUserName()); createOrderDto.setUserName(userDeliveryInfoDto.getReceiveUserName());
// createOrderDto.setPhone(userDeliveryInfoDto.getReceiveMobile()); createOrderDto.setPhone(userDeliveryInfoDto.getReceiveMobile());
// createOrderDto.setAddress(userDeliveryInfoDto.getReceiveAddress()); createOrderDto.setAddress(userDeliveryInfoDto.getReceiveAddress());
// createOrderDto.setLatitude(userDeliveryInfoDto.getUserLatitude()); createOrderDto.setLatitude(userDeliveryInfoDto.getUserLatitude());
// createOrderDto.setLongitude(userDeliveryInfoDto.getUserLongitude()); createOrderDto.setLongitude(userDeliveryInfoDto.getUserLongitude());
createOrderDto.setOrderType(QueryOrderType.TAKE_OUT); createOrderDto.setOrderType(QueryOrderType.TAKE_OUT);
createOrderDto.setPayType(QueryPayType.ONLINE_PAY); createOrderDto.setPayType(QueryPayType.ONLINE_PAY);
createOrderDto.setSource(OrderSourceType.SAASMALL.getCode()); createOrderDto.setSource(OrderSourceType.SAASMALL.getCode());
...@@ -135,8 +135,8 @@ public class MallOrderAdapter { ...@@ -135,8 +135,8 @@ public class MallOrderAdapter {
createOrderDto.setAmount(0L); createOrderDto.setAmount(0L);
createOrderDto.setBarCounter(createOrderVo.getTableNumber()); createOrderDto.setBarCounter(createOrderVo.getTableNumber());
createOrderDto.setProvince(createOrderVo.getProvince()); createOrderDto.setProvince(createOrderVo.getProvince());
// createOrderDto.setCity(userDeliveryInfoDto.getReceiveCity()); createOrderDto.setCity(userDeliveryInfoDto.getReceiveCity());
// createOrderDto.setRegion(userDeliveryInfoDto.getReceiveRegion()); createOrderDto.setRegion(userDeliveryInfoDto.getReceiveRegion());
createOrderDto.setMenuType(BusinessTypeEnum.SAAS_MALL.getName()); createOrderDto.setMenuType(BusinessTypeEnum.SAAS_MALL.getName());
return createOrderDto; return createOrderDto;
} }
......
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