Commit de9f879d by caosy

回调查询

parent 1fb362a7
...@@ -1023,6 +1023,15 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> { ...@@ -1023,6 +1023,15 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> {
return (Long) criteria.setProjection(Projections.rowCount()).uniqueResult(); return (Long) criteria.setProjection(Projections.rowCount()).uniqueResult();
} }
// 根据订单uid id ruleId 查询发放劵张数
public long getSendCountByOrderIdRuleId(String uid,String orderId,Integer ruleId) {
Criteria criteria = getCriteria();
criteria.add(Restrictions.eq("uid", uid));
criteria.add(Restrictions.eq("sourceRemark", orderId));
criteria.add(Restrictions.eq("ruleId", ruleId));
return (Long) criteria.setProjection(Projections.rowCount()).uniqueResult();
}
public List<VoucherItemDTO> findUserVoucherById(VoucherRequestDto body) { public List<VoucherItemDTO> findUserVoucherById(VoucherRequestDto body) {
Criteria criteria = getCriteria(); Criteria criteria = getCriteria();
criteria.add(Restrictions.eq("ruleId", body.getVoucherId())); criteria.add(Restrictions.eq("ruleId", body.getVoucherId()));
......
...@@ -1287,10 +1287,11 @@ public class VoucherService { ...@@ -1287,10 +1287,11 @@ public class VoucherService {
if(sendBeginTime.getTime()<now.getTime()&&now.getTime()<sendEndTime.getTime()){ if(sendBeginTime.getTime()<now.getTime()&&now.getTime()<sendEndTime.getTime()){
String[] ids = jsobj.getString("id").split(","); String[] ids = jsobj.getString("id").split(",");
for(String id:ids){ for(String id:ids){
long sendNumber = voucherDao.getSendCountByOrderIdRuleId(uid,orderId, Integer.valueOf(id));
if(sendNumber == 0){
// 无限卷 // 无限卷
if(isUsedSend(id) && activityId != null){ if(isUsedSend(id) && activityId != null){
// 是否是第一次购买 // 是否是第一次购买
int orderNumber = orderDao.queryVoucherPayedOrder(uid, activityId); int orderNumber = orderDao.queryVoucherPayedOrder(uid, activityId);
VoucherRule roucherRule = voucherRuleDao.findById(Integer.parseInt(id)); VoucherRule roucherRule = voucherRuleDao.findById(Integer.parseInt(id));
if(orderNumber > 1){ if(orderNumber > 1){
...@@ -1323,7 +1324,7 @@ public class VoucherService { ...@@ -1323,7 +1324,7 @@ public class VoucherService {
voucherDao.save(voucher); voucherDao.save(voucher);
} }
} }
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment