Merge branch 'feature/20221125_收货人名称保存_wuping' of…

Merge branch 'feature/20221125_收货人名称保存_wuping' of https://gitlab.freemud.com/order-group-application/order-group

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

@@ -504,6 +504,7 @@ public class OrderAdapter {
         if (Objects.equals(createOrderVo.getOrderType(), CreateOrderType.TAKE_OUT.getCode())) {
 //            orderType = OrderTypeV1.TAKE_OUT.getCode();
             newOrderType = getNewOrderType(OrderTypeV1.TAKE_OUT, createOrderVo.getExpectTime(), createOrderVo.getBizType());
+            createOrderVo.setContactsName(userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveUserName() : "");
             receiveAddress = (userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveOfficeName() + "," + userDeliveryInfoDto.getReceiveAddress() : "");
         } else if (Objects.equals(createOrderVo.getOrderType(), CreateOrderType.COLLECT_GOODS.getCode())) {
             if (Objects.equals(createOrderVo.getReachStoreType(), OrderTypeV1.EAT_IN.getCode())) {
@@ -513,6 +514,7 @@ public class OrderAdapter {
                 newOrderType = getNewOrderType(OrderTypeV1.COLLECT_GOODS, createOrderVo.getExpectTime(), createOrderVo.getBizType());
 //                orderType = OrderTypeV1.COLLECT_GOODS.getCode();
             }
+            createOrderVo.setContactsName(createOrderVo.getUserName());
         } else if (Objects.equals(createOrderVo.getOrderType(), CreateOrderType.SAASMALL.getCode())) {
 //            orderType = OrderTypeV1.EAT_IN.getCode();
             newOrderType = OrderType.GENERAL_DINE_IN;