xiugai

YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -633,6 +633,9 @@ public class ElectronicMembershipCardController {
         if(infoMap !=null && infoMap.containsKey("orderNo") && infoMap.get("orderNo") !=null){
             m.put("orderNo", infoMap.get("orderNo").toString());
         }
+        if(infoMap !=null && infoMap.containsKey("oilPersonnel") && infoMap.get("oilPersonnel") !=null){
+            m.put("oilPersonnel", infoMap.get("oilPersonnel").toString());
+        }
         if(infoMap !=null && infoMap.containsKey("amt") && infoMap.get("amt") !=null){
             m.put("amt", infoMap.get("amt").toString());
         }
@@ -751,8 +754,13 @@ public class ElectronicMembershipCardController {
         String amtP = "";
         String mobilePhoneP = "";
         String payWayP = "";
+        String oilPersonnelP = "";
         String sn;  //打印机编号
 
+        if(StringUtils.isNotBlank(infoMap.get("oilPersonnel").toString())){
+            oilPersonnelP =infoMap.get("oilPersonnel").toString();
+        }
+
         if(StringUtils.isNotBlank(infoMap.get("orderNo").toString())){
             orderNoP =infoMap.get("orderNo").toString();
         }
@@ -837,6 +845,7 @@ public class ElectronicMembershipCardController {
         }
         content1 += "支付： "+amtP+" 元<BR>";
         content1 += "手机号： "+mobilePhoneP+" <BR>";
+        content1 += "加油员："+oilPersonnelP+"<BR>";
         content1 += "<BR>";
         //content1 += "--------------------------------<BR>";
         //content1 += "<BR>";
@@ -862,6 +871,7 @@ public class ElectronicMembershipCardController {
         }
         content2 += "支付： "+amtP+" 元<BR>";
         content2 += "手机号： "+mobilePhoneP+" <BR>";
+        content2 += "加油员："+oilPersonnelP+"<BR>";
         content2 += "<BR>";
         //获取打印机编号
         //sn = "921611605";     //测试打印机 sn：921611605 key：72338zma

YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -832,6 +832,9 @@ public class PayController {
         if(payOrder.getIntegral() !=null){
             m.put("integral", payOrder.getIntegral());
         }
+        if(infoMap !=null && infoMap.containsKey("oilPersonnel") && infoMap.get("oilPersonnel") !=null){
+            m.put("oilPersonnel", infoMap.get("oilPersonnel").toString());
+        }
         if(infoMap !=null && infoMap.containsKey("orderNo") && infoMap.get("orderNo") !=null){
             m.put("orderNo", infoMap.get("orderNo").toString());
         }
@@ -961,8 +964,12 @@ public class PayController {
         String amtP = "";
         String mobilePhoneP = "";
         String payWayP = "";
+        String oilPersonnelP = "";
         String sn;  //打印机编号
 
+        if(StringUtils.isNotBlank(infoMap.get("oilPersonnel").toString())){
+            oilPersonnelP =infoMap.get("oilPersonnel").toString();
+        }
         if(StringUtils.isNotBlank(infoMap.get("orderNo").toString())){
             orderNoP =infoMap.get("orderNo").toString();
         }
@@ -1041,6 +1048,7 @@ public class PayController {
         content1 += "付款时间："+payDateP+" <BR>";
         content1 += "油站："+stationNameP+"  <BR>";
         content1 += "油枪："+oilGunP+"号枪<BR>";
+        content1 += "加油员："+oilPersonnelP+"<BR>";
         if(infoMap.containsKey("oilType") && !infoMap.get("oilType").toString().equals("3")){
             content1 += "油品： "+oilNameP+"  <BR>";
             content1 += "油量： "+orderLitersP+"  升<BR>";
@@ -1051,6 +1059,7 @@ public class PayController {
         }
         content1 += "支付： "+amtP+" 元<BR>";
         content1 += "手机号： "+mobilePhoneP+" <BR>";
+        content1 += "加油员："+oilPersonnelP+"<BR>";
         content1 += "<BR>";
         //content1 += "--------------------------------<BR>";
         //content1 += "<BR>";
@@ -1076,6 +1085,7 @@ public class PayController {
         }
         content2 += "支付： "+amtP+" 元<BR>";
         content2 += "手机号： "+mobilePhoneP+" <BR>";
+        content2 += "加油员："+oilPersonnelP+"<BR>";
         content2 += "<BR>";
         //获取打印机编号
         //sn = "921611605";     //测试打印机 sn：921611605 key：72338zma

YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -1046,6 +1046,7 @@
         A.created_date          AS createdDate,
         A.pay_date              AS payDate,
         A.consumer_id           AS consumerId,
+        A.oil_personnel         AS oilPersonnel,
         B.user_type 			AS userType,
         B.registe_date          AS registeDate,
         B.blog_openid           AS blogOpenid,