修改

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerCompInfoServiceImpl.java

@@ -119,6 +119,12 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
         if (hyCargoOwnerCompInfo != null) {
             this.deleteById(hyCargoOwnerCompInfo.getId());
         }
+        //删除代理货主信息
+        HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo = agentCargoOwnerInfoService.selectOne(new EntityWrapper<HyAgentCargoOwnerInfo>()
+        .eq("agent_common_id",hyCargoOwnerCompInfo.getCommonId()).eq("delete_flag","0"));
+        if (hyAgentCargoOwnerInfo != null){
+            agentCargoOwnerInfoService.deleteById(hyAgentCargoOwnerInfo.getId());
+        }
     }
 
     /**

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/OrderInfoMapper.xml

@@ -358,6 +358,14 @@
         case when o.invoicing = 1 then '已开' else '未开' end as invoicing,
         o.driver_contract_url as driverContractUrl,
         o.owner_contract_url as ownerContractUrl,
+        o.send_private as sendPrivate,
+        o.send_city as sendCity,
+        o.send_area as sendArea,
+        o.send_detailed_address as sendDetailedAddress,
+        o.unload_private as unloadPrivate,
+        o.unload_city as unloadCity,
+        o.unload_area as unloadArea,
+        o.unload_detailed_address as unloadDetailedAddress,
         o.order_status as orderStatus,
         o.order_status_key as orderStatusKey,
         o.cargo_owner_status as cargoOwnerStatus,