报表修改
diff --git a/src/main/java/com/supwisdom/dlpay/api/service/impl/PosPayServiceImpl.java b/src/main/java/com/supwisdom/dlpay/api/service/impl/PosPayServiceImpl.java
index 19af93c..fa0face 100644
--- a/src/main/java/com/supwisdom/dlpay/api/service/impl/PosPayServiceImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/api/service/impl/PosPayServiceImpl.java
@@ -831,8 +831,8 @@
HttpConnectionUtil util = new HttpConnectionUtil();
Map<String,String> map=new HashMap<>();
- map.put("devphyid",device.getDevphyid());
- map.put("source","restaurant");
+ map.put("devphyid",device.getDevphyid()); //设备物理id
+ map.put("source","restaurant"); //来源
Gson gson=new Gson();
String result=util.sendByPostJson(auditsysurl.getParaval()+"/beat",gson.toJson(map));
logger.info(result);
diff --git a/src/main/java/com/supwisdom/dlpay/restaurant/service/impl/CustReportServiceImpl.java b/src/main/java/com/supwisdom/dlpay/restaurant/service/impl/CustReportServiceImpl.java
index 7659754..3e21a6a 100644
--- a/src/main/java/com/supwisdom/dlpay/restaurant/service/impl/CustReportServiceImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/restaurant/service/impl/CustReportServiceImpl.java
@@ -127,7 +127,7 @@
tot.setD_normalamt(tot.getD_normalamt()+b.getD_normalamt());
tot.setD_normalcnt(tot.getD_normalcnt()+b.getD_normalcnt());
tot.setTotdiscountamt(tot.getTotdiscountamt()+b.getTotdiscountamt());
- tot.setTotdiscountcnt(tot.getTotnormalcnt()+b.getTotdiscountcnt());
+ tot.setTotdiscountcnt(tot.getTotdiscountcnt()+b.getTotdiscountcnt());
tot.setTotfeeamt(tot.getTotfeeamt()+b.getTotfeeamt());
tot.setTotnormalamt(tot.getTotnormalamt()+b.getTotnormalamt());
tot.setTotnormalcnt(tot.getTotnormalcnt()+b.getTotnormalcnt());