|
@@ -596,7 +596,7 @@ public class PayController {
|
|
//等于1表示次要业务:LNG集团平台加气(可能会出现); 插入油站余额记录
|
|
//等于1表示次要业务:LNG集团平台加气(可能会出现); 插入油站余额记录
|
|
StationBalanceChange stationBalanceChange = new StationBalanceChange();
|
|
StationBalanceChange stationBalanceChange = new StationBalanceChange();
|
|
stationBalanceChange.setStationId(stationInfos.getStationId());
|
|
stationBalanceChange.setStationId(stationInfos.getStationId());
|
|
- stationBalanceChange.setAmt(Double.valueOf(infoMap.get("driverAmt").toString()));
|
|
|
|
|
|
+ stationBalanceChange.setAmt(Double.valueOf(infoMap.get("sellAmt").toString()));
|
|
stationBalanceChange.setCreateTime(new SimpleDateFormat("yyyy-MM-dd hh-mm-ss").parse(infoMap.get("payDate").toString()));
|
|
stationBalanceChange.setCreateTime(new SimpleDateFormat("yyyy-MM-dd hh-mm-ss").parse(infoMap.get("payDate").toString()));
|
|
stationBalanceChange.setType("-");
|
|
stationBalanceChange.setType("-");
|
|
stationBalanceChange.setOrderNo(ordNo);
|
|
stationBalanceChange.setOrderNo(ordNo);
|
|
@@ -674,12 +674,17 @@ public class PayController {
|
|
logger.info("小票机打印方式");
|
|
logger.info("小票机打印方式");
|
|
infoMap.put("sn", stationDeviceManagerList.get(0).getDeviceNo());
|
|
infoMap.put("sn", stationDeviceManagerList.get(0).getDeviceNo());
|
|
infoMap.put("printSetting", stationInfos.getPrintSetting());
|
|
infoMap.put("printSetting", stationInfos.getPrintSetting());
|
|
|
|
+ infoMap.put("isLngFlagGroup", stationInfos.getIsLngFlagGroup());
|
|
this.printReceipt(infoMap);
|
|
this.printReceipt(infoMap);
|
|
break;
|
|
break;
|
|
case "2":
|
|
case "2":
|
|
logger.info("POS机打印方式");
|
|
logger.info("POS机打印方式");
|
|
payOrder.setIntegral(String.valueOf(integral));
|
|
payOrder.setIntegral(String.valueOf(integral));
|
|
payOrder.setPrintSetting(stationInfos.getPrintSetting());
|
|
payOrder.setPrintSetting(stationInfos.getPrintSetting());
|
|
|
|
+ payOrder.setIsLngFlagGroup(stationInfos.getIsLngFlagGroup());
|
|
|
|
+ if(stationInfos.getIsLngFlagGroup() !=null && stationInfos.getIsLngFlagGroup().equals("1")){
|
|
|
|
+ payOrder.setSellAmt(Double.valueOf(infoMap.get("sellAmt").toString()));
|
|
|
|
+ }
|
|
if(stationDeviceManagerList.get(0).getPosFanoutExchange() !=null && stationDeviceManagerList.get(0).getPosQueue() !=null){
|
|
if(stationDeviceManagerList.get(0).getPosFanoutExchange() !=null && stationDeviceManagerList.get(0).getPosQueue() !=null){
|
|
logger.info("POS设备交换机信息:" + stationDeviceManagerList.get(0).getPosFanoutExchange());
|
|
logger.info("POS设备交换机信息:" + stationDeviceManagerList.get(0).getPosFanoutExchange());
|
|
payOrder.setPosFanoutExchange(stationDeviceManagerList.get(0).getPosFanoutExchange());
|
|
payOrder.setPosFanoutExchange(stationDeviceManagerList.get(0).getPosFanoutExchange());
|
|
@@ -829,15 +834,22 @@ public class PayController {
|
|
if(infoMap !=null && infoMap.containsKey("orderNo") && infoMap.get("orderNo") !=null){
|
|
if(infoMap !=null && infoMap.containsKey("orderNo") && infoMap.get("orderNo") !=null){
|
|
m.put("orderNo", infoMap.get("orderNo").toString());
|
|
m.put("orderNo", infoMap.get("orderNo").toString());
|
|
}
|
|
}
|
|
- if(infoMap !=null && infoMap.containsKey("amt") && infoMap.get("amt") !=null){
|
|
|
|
- m.put("amt", infoMap.get("amt").toString());
|
|
|
|
- }
|
|
|
|
|
|
+ //if(infoMap !=null && infoMap.containsKey("amt") && infoMap.get("amt") !=null){
|
|
|
|
+ if(payOrder.getIsLngFlagGroup() !=null && payOrder.getIsLngFlagGroup().equals("1")){
|
|
|
|
+ m.put("amt", infoMap.get("sellAmt").toString());
|
|
|
|
+ m.put("discountAmt", infoMap.get("sellDiscountAmt").toString());
|
|
|
|
+ }else {
|
|
|
|
+ m.put("amt", infoMap.get("amt").toString());
|
|
|
|
+ m.put("discountAmt", infoMap.get("discountAmt").toString());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ //}
|
|
if(infoMap !=null && infoMap.containsKey("receivableAmt") && infoMap.get("receivableAmt") !=null){
|
|
if(infoMap !=null && infoMap.containsKey("receivableAmt") && infoMap.get("receivableAmt") !=null){
|
|
m.put("receivableAmt", infoMap.get("receivableAmt").toString());
|
|
m.put("receivableAmt", infoMap.get("receivableAmt").toString());
|
|
}
|
|
}
|
|
- if(infoMap !=null && infoMap.containsKey("discountAmt") && infoMap.get("discountAmt") !=null){
|
|
|
|
- m.put("discountAmt", infoMap.get("discountAmt").toString());
|
|
|
|
- }
|
|
|
|
|
|
+// if(infoMap !=null && infoMap.containsKey("discountAmt") && infoMap.get("discountAmt") !=null){
|
|
|
|
+// m.put("discountAmt", infoMap.get("discountAmt").toString());
|
|
|
|
+// }
|
|
if(infoMap !=null && infoMap.containsKey("oilName") && infoMap.get("oilName") !=null){
|
|
if(infoMap !=null && infoMap.containsKey("oilName") && infoMap.get("oilName") !=null){
|
|
m.put("oilName", infoMap.get("oilName").toString());
|
|
m.put("oilName", infoMap.get("oilName").toString());
|
|
}
|
|
}
|
|
@@ -981,7 +993,9 @@ public class PayController {
|
|
if (infoMap.containsKey("oilPirce") && infoMap.get("oilPirce") != null) {
|
|
if (infoMap.containsKey("oilPirce") && infoMap.get("oilPirce") != null) {
|
|
oilPirceP = infoMap.get("oilPirce") + "";
|
|
oilPirceP = infoMap.get("oilPirce") + "";
|
|
}
|
|
}
|
|
- if(infoMap.containsKey("discountAmt") && infoMap.get("discountAmt") !=null ){
|
|
|
|
|
|
+ if(infoMap.containsKey("isLngFlagGroup") && infoMap.get("isLngFlagGroup") !=null && infoMap.get("isLngFlagGroup").toString().equals("1")){
|
|
|
|
+ discountAmtP =infoMap.get("sellDiscountAmt")+"";
|
|
|
|
+ }else {
|
|
discountAmtP =infoMap.get("discountAmt")+"";
|
|
discountAmtP =infoMap.get("discountAmt")+"";
|
|
}
|
|
}
|
|
receiptNameP = "油品订单";
|
|
receiptNameP = "油品订单";
|
|
@@ -996,7 +1010,9 @@ public class PayController {
|
|
receivableAmtP =infoMap.get("receivableAmt")+"";
|
|
receivableAmtP =infoMap.get("receivableAmt")+"";
|
|
}
|
|
}
|
|
|
|
|
|
- if(infoMap.containsKey("amt") && infoMap.get("amt") !=null ){
|
|
|
|
|
|
+ if(infoMap.containsKey("isLngFlagGroup") && infoMap.get("isLngFlagGroup") !=null && infoMap.get("isLngFlagGroup").toString().equals("1")){
|
|
|
|
+ amtP =infoMap.get("sellAmt")+"";
|
|
|
|
+ }else {
|
|
amtP =infoMap.get("amt")+"";
|
|
amtP =infoMap.get("amt")+"";
|
|
}
|
|
}
|
|
if(infoMap.containsKey("mobilePhone") && infoMap.get("mobilePhone") !=null ){
|
|
if(infoMap.containsKey("mobilePhone") && infoMap.get("mobilePhone") !=null ){
|