修改

YijiaRestful/src/main/java/com/platform/yijia/service/impl/PayOrderServiceImpl.java

@@ -72,29 +72,30 @@ public class PayOrderServiceImpl implements PayOrderService {
         payOrder.setCreatedDate(new Date());                    //创建时间
         payOrder.setOrderType(payOrderRequest.getOrderType());  //订单类型
         payOrder.setOilGun(payOrderRequest.getOilGun());        //油枪号
-        //订单类型等于1时表示油品
-        if(payOrderRequest.getOrderType().equals("1")){
-            //根据油站和油枪获取加油员和油品价格 油站名称
-            HashMap<String, Object> params = new HashMap<>();
-            params.put("oliGunNo", payOrderRequest.getOilGun());
-            params.put("stationId", payOrderRequest.getStationId());
-            String oilPersonnel = "";
-            //使用list原因：一个枪号对应多个加油员场景
-            List<Map> mapResultList = payOrderMapper.selectPersonelName(params);
-            if(mapResultList != null && mapResultList.size() > 0){
-                for (Map per : mapResultList){
-                    if(per.containsKey("personelName") && per.get("personelName").toString() !=null && per.get("personelName").toString() !=""){
-                        oilPersonnel += per.get("personelName").toString() +",";
-                    }
-                }
-                if(oilPersonnel !=""){
-                    payOrder.setOilPersonnel(oilPersonnel.substring(0, oilPersonnel.length()-1));   //加油员
-                }
-                if(mapResultList.get(0).containsKey("stationName") && mapResultList.get(0).get("stationName").toString() !="" && mapResultList.get(0).get("stationName").toString() !=null ){
-                    payOrder.setStationName(mapResultList.get(0).get("stationName").toString());        //油站名称
+
+        //根据油站和油枪获取加油员和油品价格 油站名称
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("oliGunNo", payOrderRequest.getOilGun());
+        params.put("stationId", payOrderRequest.getStationId());
+        String oilPersonnel = "";
+        //使用list原因：一个枪号对应多个加油员场景
+        List<Map> mapResultList = payOrderMapper.selectPersonelName(params);
+        if(mapResultList != null && mapResultList.size() > 0){
+            for (Map per : mapResultList){
+                if(per.containsKey("personelName") && per.get("personelName").toString() !=null && per.get("personelName").toString() !=""){
+                    oilPersonnel += per.get("personelName").toString() +",";
                 }
             }
+            if(oilPersonnel !=""){
+                payOrder.setOilPersonnel(oilPersonnel.substring(0, oilPersonnel.length()-1));   //加油员
+            }
+            if(mapResultList.get(0).containsKey("stationName") && mapResultList.get(0).get("stationName").toString() !="" && mapResultList.get(0).get("stationName").toString() !=null ){
+                payOrder.setStationName(mapResultList.get(0).get("stationName").toString());        //油站名称
+            }
+        }
 
+        //订单类型等于1时表示油品
+        if(payOrderRequest.getOrderType().equals("1")){
             Double receivableAmt = payOrderRequest.getReceivableAmt();  //获取应收金额
             payOrder.setReceivableAmt(receivableAmt);
             Double oilPrice = payOrderRequest.getOilPrice();            //获取油价