提交代码

hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java

@@ -247,6 +247,16 @@ public class HighOrderController {
                     }
 
                     if (highOrder.getIsTyAgent() != null && highOrder.getIsTyAgent().equals(true)) {
+                        // 查询加油站
+                        HighTyAgentOilStation oilStation = tyAgentOilStationService.getDetailByOilStationId(childOrder.getGoodsId());
+                        if (oilStation != null) {
+                            childOrder.setGasSalesmanId(oilStation.getTySalesmanId());
+                            childOrder.setGasSalesmanName(oilStation.getTySalesmanName());
+                            childOrder.setGasAgentId(oilStation.getTyAgentId());
+                            childOrder.setGasAgentName(oilStation.getTyAgentName());
+                            childOrder.setGasOrgId(oilStation.getOrganizationId());
+                            childOrder.setGasOrgName(oilStation.getOrganizationName());
+                        }
                         // 价格
                         HighTyAgentPrice priceRate = tyAgentPriceService.getDetail(2, childOrder.getGoodsId(), childOrder.getGasOilNo());
                         if (priceRate == null) {