华莱士更新

order-application-service/src/main/java/cn/freemud/adapter/MallOrderAdapter.java

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