提交代码

3 years ago · 5505f5d260
parent 3920c7e322
commit 5505f5d260
3 changed files with 12 additions and 2 deletions
--- a/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
--- a/hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java
+++ b/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) {
--- a/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java