墙盒申请详情中加物流信息

src/main/java/com/boco/nbd/wios/manage/entity/vo/WallboxApplyInstallInfoVO.java

@@ -111,6 +111,41 @@ public class WallboxApplyInstallInfoVO {
      */
     @ApiModelProperty(value = "物流服务商名称")
     private String logisticCompany;
+    /**
+     * 物流单号
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "物流单号")
+    private String logisticOrder;
+    /**
+     * 收货人
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "收货人")
+    private String receiver;
+    /**
+     * 收货人电话
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "收货人电话")
+    private String receiverPhone;
+    /**
+     * 发货人
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "发货人")
+    private String sender;
+    /**
+     * 发货人电话
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "发货人电话")
+    private String senderPhone;
 
 
 }

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

@@ -188,12 +188,19 @@
                t_wallbox_apply.modify_time,
                t_order.shipno     as tracking_number,
                t_order.status     as install_status,
-               tc.name as wallboxModelName
+               tc.name as wallboxModelName,
+               td.logistic_order logisticOrder,
+               td.receiver receiver,
+               td.receiver_phone receiverPhone,
+               td.sender sender,
+               td.sender_phone senderPhone,
+               '德邦物流' as logisticCompany
         FROM t_wallbox_apply
                  LEFT JOIN t_order ON t_wallbox_apply.order_id = t_order.id
                  left join t_region reg on reg.id = t_wallbox_apply.region_id
                  left join wb_account on wb_account.id = t_wallbox_apply.check_account
                  left join t_oem_cascade tc on tc.id = t_wallbox_apply.wallbox_model
+                 left join t_delivery td on td.install_order = t_wallbox_apply.order_id
         where t_wallbox_apply.id = #{id}
     </select>
     <select id="getInfoByOrderId" parameterType="String"
@@ -224,12 +231,19 @@
                t_wallbox_apply.modify_time,
                t_order.shipno     as tracking_number,
                t_order.status     as install_status,
-               tc.name as wallboxModelName
+               tc.name as wallboxModelName,
+               td.logistic_order logisticOrder,
+               td.receiver receiver,
+               td.receiver_phone receiverPhone,
+               td.sender sender,
+               td.sender_phone senderPhone,
+               '德邦物流' as logisticCompany
         FROM t_wallbox_apply
                  LEFT JOIN t_order ON t_wallbox_apply.order_id = t_order.id
                  left join t_region reg on reg.id = t_wallbox_apply.region_id
                  left join wb_account on wb_account.id = t_wallbox_apply.check_account
                  left join t_oem_cascade tc on tc.id = t_wallbox_apply.wallbox_model
+                 left join t_delivery td on td.install_order = t_wallbox_apply.order_id
         where t_wallbox_apply.order_id = #{orderId}
     </select>