小票机修改

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

@@ -907,7 +907,7 @@ public class PayController {
         if(infoMap.containsKey("oilName") && infoMap.get("oilName") !=null ){
             oilNameP =infoMap.get("oilName").toString();
         }
-        if(infoMap.containsKey("oilType") && infoMap.get("oilType").equals("1")) {
+        if(!infoMap.containsKey("oilType") && infoMap.get("oilType").equals("3")) {
             //加油升数
             if (infoMap.containsKey("orderLiters") && infoMap.get("orderLiters") != null) {
                 orderLitersP = infoMap.get("orderLiters") + "";
@@ -919,7 +919,7 @@ public class PayController {
             if(infoMap.containsKey("discountAmt") && infoMap.get("discountAmt") !=null ){
                 discountAmtP =infoMap.get("discountAmt")+"";
             }
-        }else if(infoMap.containsKey("oilType") && infoMap.get("oilType").equals("2")) {
+        }else {
             orderLitersP ="0.00";
             oilPirceP = "0.00";
             discountAmtP ="0.00";
@@ -937,10 +937,13 @@ public class PayController {
             //手机号中间四位****代替
             mobilePhoneP = phone.substring(0, 3) + "****" + phone.substring(7, phone.length());
         }
-        if(infoMap.containsKey("payWay") && infoMap.get("payWay") !=null ){
-            if(infoMap.get("payWay").equals("02") || infoMap.get("payWay").equals("03")){
+        if(infoMap.containsKey("payType") && infoMap.get("payType") !=null ){
+            if(infoMap.get("payType").equals("wx")){
                 payWayP ="微信";
+            }else {
+                payWayP ="电子卡";
             }
+
         }
 
         content1 = "<CB>支付小票--顾客联</CB><BR>";