餐补退款同时退餐补次数
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 5a3bb0c..755fdf3 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
@@ -98,8 +98,8 @@
}
//TODO:改 GroupID逻辑
- Integer groupid = req.getParagroupid();
- /* if (groupid == 0) {
+ /* Integer groupid = req.getParagroupid();
+ if (groupid == 0) {
groupid = 1;
}*/
TDevparaGroup group = null;
diff --git a/src/main/java/com/supwisdom/dlpay/restaurant/dao/TransDtlDao.java b/src/main/java/com/supwisdom/dlpay/restaurant/dao/TransDtlDao.java
index 45981ec..0afa697 100644
--- a/src/main/java/com/supwisdom/dlpay/restaurant/dao/TransDtlDao.java
+++ b/src/main/java/com/supwisdom/dlpay/restaurant/dao/TransDtlDao.java
@@ -47,18 +47,18 @@
TTransDtl getByTransdateAndTermidAndTermsqlno(String transdate,Integer termid,Integer termsqlno);
- Integer countByAccdateAndCustidAndRuleid(String accdate,String custid,Integer ruleid);
+ Integer countByAccdateAndCustidAndRuleidAndStatusAndRevflag(String accdate,String custid,Integer ruleid,String status,Integer revflag);
@Query(value = "select count(refno) from tb_transdtl where substr(accdate,1,6)=?1" +
- " and custid=?2 and ruleid=?3",nativeQuery = true)
+ " and custid=?2 and ruleid=?3 and status='success' and revflag=0",nativeQuery = true)
Integer countTrandtlByAccdateAndCustidAndRuleidWithMonth(String accdate,String custid,Integer ruleid);
@Query(value = "select count(refno) from tb_transdtl where substr(accdate,1,6)=?1" +
- " and custid=?2 and ruleid=?3 and substr(acctime,1,4) BETWEEN ?4 and ?5",nativeQuery = true)
+ " and custid=?2 and ruleid=?3 and substr(acctime,1,4) BETWEEN ?4 and ?5 and status='success' and revflag=0",nativeQuery = true)
Integer countTrandtlByAccdateAndCustidAndRuleidWithMonthAndPeriod(String accdate,String custid,Integer ruleid,String starttime,String endtime);
@Query(value = "select count(refno) from tb_transdtl where accdate=?1" +
- " and custid=?2 and ruleid=?3 and substr(acctime,1,4) BETWEEN ?4 and ?5",nativeQuery = true)
+ " and custid=?2 and ruleid=?3 and substr(acctime,1,4) BETWEEN ?4 and ?5 and status='success' and revflag=0",nativeQuery = true)
Integer countTrandtlByAccdateAndCustidAndRuleidWithPeriod(String accdate,String custid,Integer ruleid,String starttime,String endtime);
diff --git a/src/main/java/com/supwisdom/dlpay/restaurant/service/impl/TransDtlServiceImpl.java b/src/main/java/com/supwisdom/dlpay/restaurant/service/impl/TransDtlServiceImpl.java
index 00c5ad9..0706e61 100644
--- a/src/main/java/com/supwisdom/dlpay/restaurant/service/impl/TransDtlServiceImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/restaurant/service/impl/TransDtlServiceImpl.java
@@ -296,7 +296,7 @@
@Override
public Integer getDiscountLimitToday(String termdate, String custid, Integer ruleid) {
- return transDtlDao.countByAccdateAndCustidAndRuleid(termdate,custid,ruleid);
+ return transDtlDao.countByAccdateAndCustidAndRuleidAndStatusAndRevflag(termdate,custid,ruleid,RestaurantConstant.STATUS_TRANSDTL_SUCCESS,0);
}
@Override