Browse Source

非油品小票修改

jk-GitHub-coder 4 years ago
parent
commit
4584fc9b8c

+ 16 - 8
YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -774,11 +774,15 @@ public class PayController {
                             content1 += "订单号:"+orderNoP+"  <BR>";
                             content1 += "时间:"+createdDateP+" <BR>";
                             content1 += "油站:"+stationNameP+"  <BR>";
-                            content1 += "油品: "+oilNameP+"  <BR>";
-                            content1 += "油量: "+orderLitersP+"  升<BR>";
-                            content1 += "单价: "+oilPirceP+" L/元<BR>";
+                            if(infoMap.containsKey("orderType") && infoMap.get("orderType").equals("1")){
+                                content1 += "油品: "+oilNameP+"  <BR>";
+                                content1 += "油量: "+orderLitersP+"  升<BR>";
+                                content1 += "单价: "+oilPirceP+" L/元<BR>";
+                            }
                             content1 += "<BOLD><B>原价: "+receivableAmtP+" 元</B></BOLD><BR>";
-                            content1 += "优惠: "+discountAmtP+" 元<BR>";
+                            if(infoMap.containsKey("orderType") && infoMap.get("orderType").equals("1")){
+                                content1 += "优惠: "+discountAmtP+" 元<BR>";
+                            }
                             content1 += "支付: "+amtP+" 元<BR>";
                             content1 += "支付方式: "+payWayP+" <BR>";
                             content1 += "<BR>";
@@ -789,11 +793,15 @@ public class PayController {
                             content2 += "订单号:"+orderNoP+" <BR>";
                             content2 += "时间:"+createdDateP+"<BR>";
                             content2 += "油站:"+stationNameP+" <BR>";
-                            content2 += "油品: "+oilNameP+" <BR>";
-                            content2 += "油量: "+orderLitersP+" 升<BR>";
-                            content2 += "单价: "+oilPirceP+" L/元<BR>";
+                            if(infoMap.containsKey("orderType") && infoMap.get("orderType").equals("1")){
+                                content2 += "油品: "+oilNameP+" <BR>";
+                                content2 += "油量: "+orderLitersP+" 升<BR>";
+                                content2 += "单价: "+oilPirceP+" L/元<BR>";
+                            }
                             content2 += "<BOLD><B>原价: "+receivableAmtP+" 元</B></BOLD><BR>";
-                            content2 += "优惠: "+discountAmtP+" 元<BR>";
+                            if(infoMap.containsKey("orderType") && infoMap.get("orderType").equals("1")){
+                                content2 += "优惠: "+discountAmtP+" 元<BR>";
+                            }
                             content2 += "支付: "+amtP+" 元<BR>";
                             content2 += "手机号: "+mobilePhoneP+" <BR>";
                             content2 += "支付方式: "+payWayP+" <BR>";