修改

YijiaRestful/src/main/java/com/platform/yijia/dao/PayOrderMapper.java

@@ -17,7 +17,7 @@ public interface PayOrderMapper {
     List<Map> selectOilPriceAdjust(Map<String, Object> map);
 
     /***
-     * 根据油品名称和油站查询油枪编号和价格
+     * 根据油品名称和油站查询油枪编号,油站名称,价格,加油员
      * @param map
      * @return
      */
@@ -111,4 +111,4 @@ public interface PayOrderMapper {
      * @mbg.generated
      */
     int updateByPrimaryKey(PayOrder record);
-}
+}

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

@@ -51,16 +51,16 @@ public class PayOrderServiceImpl implements PayOrderService {
         }else if(StringUtils.isNotBlank(payOrderRequest.getUserType())&& payOrderRequest.getUserType().equals("2")){
             payOrder.setPayWay("03");
         }
-        payOrder.setPayDate(new Date());    //支付时间
-        payOrder.setOilPersonnel(payOrderRequest.getOilPersonnel());       //加油员
-        payOrder.setCreatedDate(new Date());    //创建时间
-        payOrder.setOrderType(payOrderRequest.getOrderType());//订单类型
+        payOrder.setPayDate(new Date());                        //支付时间
+        payOrder.setCreatedDate(new Date());                    //创建时间
+        payOrder.setOrderType(payOrderRequest.getOrderType());  //订单类型
         //根据油站和油枪获取油枪编号和价格
         HashMap<String, Object> params = new HashMap<>();
         params.put("oilGunId", payOrderRequest.getOilGun());
         params.put("stationId", payOrderRequest.getStationId());
-        Map mapOilGunNoAndOilPrice = payOrderMapper.selectOilGunNoAndOilPrice(params);
-        payOrder.setOilGun(mapOilGunNoAndOilPrice.get("oliGunNo").toString());         //存入油枪号
+        Map mapResult = payOrderMapper.selectOilGunNoAndOilPrice(params);
+        payOrder.setOilGun(mapResult.get("oliGunNo").toString());                   //存入油枪号
+        payOrder.setOilPersonnel(mapResult.get("personnelName").toString());       //加油员
 
         //根据油品名称和油站id获取当前油品调价信息
         params.put("oilName", payOrderRequest.getOilName());
@@ -74,7 +74,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                 }
             }
         }else {     //若没有油价调整时则使用原始油价计算加油升数
-            String oilPrice = mapOilGunNoAndOilPrice.get("oilPrice").toString();    //原始价格
+            String oilPrice = mapResult.get("oilPrice").toString();    //原始价格
             payOrder.setOrderLiters(recKonOrderLiters(amt, oilPrice, 2));     //计算油价升数存放
         }
         //数据落地