From c52de7958fbec01b9301e75f98dbdddf7fb81f4a Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Sun, 10 Dec 2023 01:59:50 +0800
Subject: [PATCH] fix

---
 .../bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java | 6 +++++-
 .../src/main/resources/mapper/OrderInfoMapper.xml           | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java
index 449b41a..05e2eeb 100644
--- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java
@@ -3,6 +3,7 @@ package com.bonus.zlpt.order.service.impl;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import com.bonus.zlpt.common.core.domain.order.dto.FileInfoDto;
 import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo;
@@ -90,7 +91,10 @@ public class OrderInfoServiceImpl implements IOrderInfoService
         orderInfo.setCode(UUID.randomUUID().toString());
         orderInfo.setTime(dateFormat.format(new Date()));
         DevInfoVo devInfoVo = orderInfoMapper.getDevInfoVo(orderInfo.getMaId());
-        orderInfo.setSupplier(String.valueOf(devInfoVo.getOwnCo()));
+        if (Objects.nonNull(devInfoVo)) {
+            orderInfo.setSupplier(String.valueOf(devInfoVo.getOwnCo()));
+            orderInfo.setPhone(devInfoVo.getAuthPhone());
+        }
         orderInfo.setOrderStatus(ORDER_STATUS_INIT);
         orderInfoMapper.insertOrderInfo(orderInfo);
         Long orderId = orderInfoMapper.selectLastInsertId();
diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
index 4ea3a88..24ebe1b 100644
--- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
+++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
@@ -214,8 +214,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getDevInfoVo" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">
-        select d.*
+        select d.*, co.auth_phone, co.company_name
         from ma_dev_info d
+                 left join bm_company_info co on d.own_co = co.company_id
         where d.ma_id = #{maId}
     </select>