墙盒申请的时候添加收货信息

src/main/java/com/boco/nbd/wios/manage/controller/WallboxApplyController.java

@@ -91,6 +91,7 @@ public class WallboxApplyController {
         wa.setOrderId(orderId);
         wa.setOrderId(orderId);
         wa.setIfEmergency(ifEmergency);
         wa.setIfEmergency(ifEmergency);
         wa.setCreateAccount(tokenService.getUser().getUserId());
         wa.setCreateAccount(tokenService.getUser().getUserId());
+        wa.setReceiverWarehouseId(receiverWarehouseId);
         wallboxApplyService.insertWallboxApply(wa);
         wallboxApplyService.insertWallboxApply(wa);
         return new BaseResponse<>(true);
         return new BaseResponse<>(true);
 
 

src/main/java/com/boco/nbd/wios/manage/service/impl/WallboxApplyService.java

@@ -2,10 +2,7 @@ package com.boco.nbd.wios.manage.service.impl;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
-import com.boco.nbd.wios.manage.entity.bo.Order;
-import com.boco.nbd.wios.manage.entity.bo.OrderInstall;
-import com.boco.nbd.wios.manage.entity.bo.SupplierStaff;
-import com.boco.nbd.wios.manage.entity.bo.WallboxApply;
+import com.boco.nbd.wios.manage.entity.bo.*;
 import com.boco.nbd.wios.manage.entity.dto.WallboxApplyBatchCheckDTO;
 import com.boco.nbd.wios.manage.entity.dto.WallboxApplyBatchCheckDTO;
 import com.boco.nbd.wios.manage.entity.dto.WallboxApplyCheckDTO;
 import com.boco.nbd.wios.manage.entity.dto.WallboxApplyCheckDTO;
 import com.boco.nbd.wios.manage.entity.dto.WallboxApplyDetailQueryDTO;
 import com.boco.nbd.wios.manage.entity.dto.WallboxApplyDetailQueryDTO;
@@ -14,6 +11,7 @@ import com.boco.nbd.wios.manage.entity.vo.WallboxApplyDetailVO;
 import com.boco.nbd.wios.manage.entity.vo.WallboxApplyInstallInfoVO;
 import com.boco.nbd.wios.manage.entity.vo.WallboxApplyInstallInfoVO;
 import com.boco.nbd.wios.manage.entity.vo.WallboxApplyInstallListVO;
 import com.boco.nbd.wios.manage.entity.vo.WallboxApplyInstallListVO;
 import com.boco.nbd.wios.manage.mapper.def.*;
 import com.boco.nbd.wios.manage.mapper.def.*;
+import com.boco.nbd.wios.manage.mapper.extdb.WarehouseMapperEx;
 import com.ihidea.core.support.exception.ServiceException;
 import com.ihidea.core.support.exception.ServiceException;
 import com.ihidea.core.support.session.SessionInfo;
 import com.ihidea.core.support.session.SessionInfo;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
@@ -21,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
@@ -49,6 +48,8 @@ public class WallboxApplyService {
     private SupplierDao supplierDao;
     private SupplierDao supplierDao;
     @Autowired
     @Autowired
     private SupplierStaffDao supplierStaffDao;
     private SupplierStaffDao supplierStaffDao;
+    @Autowired
+    private WarehouseMapperEx warehouseMapperEx;
 
 
     private final Long CHECK_STATUS_REJECT = 3L;
     private final Long CHECK_STATUS_REJECT = 3L;
 
 
@@ -132,6 +133,12 @@ public class WallboxApplyService {
             throw new ServiceException("订单数据异常，缺失墙盒信息，请联系系统管理员");
             throw new ServiceException("订单数据异常，缺失墙盒信息，请联系系统管理员");
         }
         }
         //获取收货仓库信息
         //获取收货仓库信息
+        WarehouseDetail warehouseDetail = warehouseMapperEx.warehouseDetailById(req.getReceiverWarehouseId());
+        if (!StringUtils.isEmpty(warehouseDetail)){
+            req.setReceiver(warehouseDetail.getReceivePeople());
+            req.setReceiverPhone(warehouseDetail.getReceivePhone());
+            req.setReceiverWarehouseName(warehouseDetail.getName());
+        }
         req.setWallboxItemId(order.getWallboxModel());
         req.setWallboxItemId(order.getWallboxModel());
         req.setWallboxModel(order.getWallboxModel() == null ? "" : order.getWallboxModel());
         req.setWallboxModel(order.getWallboxModel() == null ? "" : order.getWallboxModel());
         req.setOutOrderId(order.getOutOrderId());
         req.setOutOrderId(order.getOutOrderId());

src/main/resources/mybatis/mapper/def/common/WallboxApplyMapper.xml

@@ -273,6 +273,10 @@
             <if test="createdTime != null">created_time,</if>
             <if test="createdTime != null">created_time,</if>
             <if test="modifyAccount != null">modify_account,</if>
             <if test="modifyAccount != null">modify_account,</if>
             <if test="modifyTime != null">modify_time,</if>
             <if test="modifyTime != null">modify_time,</if>
+            <if test="receiver != null">receiver,</if>
+            <if test="receiverPhone != null">receiver_phone,</if>
+            <if test="receiverWarehouseId != null">receiver_warehouse_id,</if>
+            <if test="receiverWarehouseName != null">receiver_warehouse_name,</if>
         </trim>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null and orderId != ''">#{orderId},</if>
             <if test="orderId != null and orderId != ''">#{orderId},</if>
@@ -299,6 +303,10 @@
             <if test="createdTime != null">#{createdTime},</if>
             <if test="createdTime != null">#{createdTime},</if>
             <if test="modifyAccount != null">#{modifyAccount},</if>
             <if test="modifyAccount != null">#{modifyAccount},</if>
             <if test="modifyTime != null">#{modifyTime},</if>
             <if test="modifyTime != null">#{modifyTime},</if>
+            <if test="receiver != null">#{receiver},</if>
+            <if test="receiverPhone != null">#{receiverPhone},</if>
+            <if test="receiverWarehouseId != null">#{receiverWarehouseId},</if>
+            <if test="receiverWarehouseName != null">#{receiverWarehouseName},</if>
         </trim>
         </trim>
     </insert>
     </insert>