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

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

order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java

@@ -8,6 +8,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -54,7 +55,7 @@ public class DeliverySdkAdapter {
         deliveryOrderRequestDto.setStorePhone(storeInfo.getPhone());
         deliveryOrderRequestDto.setStoreName(order.getShopName());
         deliveryOrderRequestDto.setCityName(storeInfo.getCity());
-        deliveryOrderRequestDto.setReceiverName(order.getContactsName());
+        deliveryOrderRequestDto.setReceiverName(StringUtils.isNotEmpty(order.getContactsName()) ? order.getContactsName() : order.getUserName());
         deliveryOrderRequestDto.setReceiverPrimaryPhone(order.getPhone());
         deliveryOrderRequestDto.setReceiverAddress(order.getAddress());
         deliveryOrderRequestDto.setReceiverLng(BigDecimal.valueOf(order.getLongitude()));