新增券添加操作人及app-->现金券--解决显示未删除券

src/main/java/com/ctrip/fun/golf/dao/basic/VoucherDao.java

@@ -563,7 +563,7 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> {
     public PagedResponseBean<VoucherItemDTO> queryListForOrder(VoucherQueryDto queryBean) {
     public PagedResponseBean<VoucherItemDTO> queryListForOrder(VoucherQueryDto queryBean) {
         StringBuilder sb = new StringBuilder(
         StringBuilder sb = new StringBuilder(
                 "select SQL_CALC_FOUND_ROWS v.Id as id,v.No as no,v.Type as type,v.Amount as amount,v.StartUseDate as startUseDate,v.EndUseDate as endUseDate,v.Used as used,v.UseDate as useDate,v.OrderNo as orderNo,v.UID as uid,v.Source as source,v.ruleId as ruleId,exclusive,canUseAmount,fullCutAmount  from bsc_voucher v where 1=1 ");
                 "select SQL_CALC_FOUND_ROWS v.Id as id,v.No as no,v.Type as type,v.Amount as amount,v.StartUseDate as startUseDate,v.EndUseDate as endUseDate,v.Used as used,v.UseDate as useDate,v.OrderNo as orderNo,v.UID as uid,v.Source as source,v.ruleId as ruleId,exclusive,canUseAmount,fullCutAmount  from bsc_voucher v where 1=1 ");
-        sb.append(" and Used=0 and DATE_FORMAT(StartUseDate, '%Y-%m-%d') <= DATE_FORMAT(now(), '%Y-%m-%d') and DATE_FORMAT(EndUseDate, '%Y-%m-%d') >= DATE_FORMAT(now(), '%Y-%m-%d')  ");
+        sb.append(" and Used=0 and deleteStatus = 0 and DATE_FORMAT(StartUseDate, '%Y-%m-%d') <= DATE_FORMAT(now(), '%Y-%m-%d') and DATE_FORMAT(EndUseDate, '%Y-%m-%d') >= DATE_FORMAT(now(), '%Y-%m-%d')  ");
         if (queryBean.getPlayDate() != null) {
         if (queryBean.getPlayDate() != null) {
             sb.append(" and DATE_FORMAT(StartUseDate, '%Y-%m-%d') <= '")
             sb.append(" and DATE_FORMAT(StartUseDate, '%Y-%m-%d') <= '")
                     .append(DateUtil.getDateStr(queryBean.getPlayDate())).append("'");
                     .append(DateUtil.getDateStr(queryBean.getPlayDate())).append("'");
@@ -686,11 +686,11 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> {
                 insertSql.append(",'" + voucherRule.getExclusive() + "'");
                 insertSql.append(",'" + voucherRule.getExclusive() + "'");
                 insertSql.append(",'" + voucherRule.getCanUseAmount() + "'");
                 insertSql.append(",'" + voucherRule.getCanUseAmount() + "'");
                 insertSql.append(",'" + voucherRule.getFullCutAmount() + "'");
                 insertSql.append(",'" + voucherRule.getFullCutAmount() + "'");
-                if(!"".equals(voucherRule.getOperater()) && voucherRule.getOperater()!=null){
-                	insertSql.append(",'"+voucherRule.getOperater()+"'");
-                }else{
+//                if(!"".equals(voucherRule.getOperater()) && voucherRule.getOperater().equals(loginUserName)){
+//                	insertSql.append(",'"+voucherRule.getOperater()+"'");
+//                }else{
                 	insertSql.append(",'"+loginUserName+"'");
                 	insertSql.append(",'"+loginUserName+"'");
-                }
+                //}
                 insertSql.append(",'" + voucherRule.getShared() + "'),");
                 insertSql.append(",'" + voucherRule.getShared() + "'),");
             }
             }
 
 

src/main/java/com/ctrip/fun/golf/service/basic/VoucherRuleService.java

@@ -129,7 +129,7 @@ public class VoucherRuleService extends
                 if (voucherRule.getSendToUserValue() != null) {
                 if (voucherRule.getSendToUserValue() != null) {
                     String[] uids = voucherRule.getSendToUserValue().split(",");
                     String[] uids = voucherRule.getSendToUserValue().split(",");
                     voucherDao.sendVoucherToSpecificUsers(voucherRule,
                     voucherDao.sendVoucherToSpecificUsers(voucherRule,
-                            voucherRule.getSendToUserValue(), uids.length,"",0);
+                            voucherRule.getSendToUserValue(), uids.length,voucherRule.getOperater(),0);
                 }
                 }
             } else if (voucherRule.getSendToUserType() == VoucherRuleSendToUserTypeEnum.REDEEM_CODE
             } else if (voucherRule.getSendToUserType() == VoucherRuleSendToUserTypeEnum.REDEEM_CODE
                     .getValue()) {
                     .getValue()) {