Skip to content

caosy / fun-golf-service

Go to a project
Commit ba53ed36 by zhangchen
Options

1.添加点击领券功能

parent 5fc80cb4
Inline Side-by-side
Showing with 38 additions and 2 deletions
src/main/java/com/ctrip/fun/golf/api/basic/VoucherController.java
...@@ -18,6 +18,7 @@ import com.ctrip.fun.common.vo.basic.VoucherItemDTO; ...@@ -18,6 +18,7 @@ import com.ctrip.fun.common.vo.basic.VoucherItemDTO;
import com.ctrip.fun.common.vo.basic.VoucherQueryDto; import com.ctrip.fun.common.vo.basic.VoucherQueryDto;
import com.ctrip.fun.common.vo.basic.VoucherQueryFormDTO; import com.ctrip.fun.common.vo.basic.VoucherQueryFormDTO;
import com.ctrip.fun.common.vo.basic.VoucherQueryRequestDTO; import com.ctrip.fun.common.vo.basic.VoucherQueryRequestDTO;
import com.ctrip.fun.common.vo.basic.VoucherRequestDto;
import com.ctrip.fun.common.vo.basic.VoucherShareLogBean; import com.ctrip.fun.common.vo.basic.VoucherShareLogBean;
import com.ctrip.fun.common.vo.basic.VoucherShareLogQuery; import com.ctrip.fun.common.vo.basic.VoucherShareLogQuery;
import com.ctrip.fun.golf.service.basic.VoucherService; import com.ctrip.fun.golf.service.basic.VoucherService;
...@@ -262,6 +263,20 @@ public class VoucherController { ...@@ -262,6 +263,20 @@ public class VoucherController {
return response; return response;
} }
@ResponseBody
@RequestMapping(value = "/findUserVoucherById", method = RequestMethod.POST)
public Response<Boolean> findUserVoucherById(@RequestBody Request<VoucherRequestDto> request) {
Response<Boolean> response = new Response<Boolean>();
Response<List<VoucherItemDTO>> responseList = voucherService.findUserVoucherById(request.getBody());
List<VoucherItemDTO> list = responseList.getBody();
if(list != null && list.size() > 0){
response.setBody(true);
} else {
response.setBody(false);
}
return response;
}
public VoucherService getVoucherService() { public VoucherService getVoucherService() {
return voucherService; return voucherService;
} }
......
src/main/java/com/ctrip/fun/golf/dao/basic/VoucherDao.java
...@@ -33,16 +33,15 @@ import com.ctrip.fun.common.vo.basic.VoucherItemDTO; ...@@ -33,16 +33,15 @@ import com.ctrip.fun.common.vo.basic.VoucherItemDTO;
import com.ctrip.fun.common.vo.basic.VoucherQueryDto; import com.ctrip.fun.common.vo.basic.VoucherQueryDto;
import com.ctrip.fun.common.vo.basic.VoucherQueryFormDTO; import com.ctrip.fun.common.vo.basic.VoucherQueryFormDTO;
import com.ctrip.fun.common.vo.basic.VoucherQueryRequestDTO; import com.ctrip.fun.common.vo.basic.VoucherQueryRequestDTO;
import com.ctrip.fun.common.vo.basic.VoucherRequestDto;
import com.ctrip.fun.common.vo.basic.VoucherRuleTypeEnum; import com.ctrip.fun.common.vo.basic.VoucherRuleTypeEnum;
import com.ctrip.fun.common.vo.basic.VoucherSourceEnum; import com.ctrip.fun.common.vo.basic.VoucherSourceEnum;
import com.ctrip.fun.common.vo.basic.VoucherTypeEnum; import com.ctrip.fun.common.vo.basic.VoucherTypeEnum;
import com.ctrip.fun.common.vo.basic.VourcherUsedEnum; import com.ctrip.fun.common.vo.basic.VourcherUsedEnum;
import com.ctrip.fun.common.vo.order.VourcherStatusEnum; import com.ctrip.fun.common.vo.order.VourcherStatusEnum;
import com.ctrip.fun.common.vo.product.ResourceTypeEnum;
import com.ctrip.fun.golf.dao.GenericHibernateDao; import com.ctrip.fun.golf.dao.GenericHibernateDao;
import com.ctrip.fun.golf.domain.basic.Voucher; import com.ctrip.fun.golf.domain.basic.Voucher;
import com.ctrip.fun.golf.domain.basic.VoucherRule; import com.ctrip.fun.golf.domain.basic.VoucherRule;
import com.ctrip.fun.golf.domain.basic.VoucherShareLog;
import com.ctrip.fun.golf.vo.PagedEntityBean; import com.ctrip.fun.golf.vo.PagedEntityBean;
import com.ctrip.fun.mall.vo.LabelValueBean; import com.ctrip.fun.mall.vo.LabelValueBean;
...@@ -956,4 +955,13 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> { ...@@ -956,4 +955,13 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> {
return (Long) criteria.setProjection(Projections.rowCount()).uniqueResult(); return (Long) criteria.setProjection(Projections.rowCount()).uniqueResult();
} }
public List<VoucherItemDTO> findUserVoucherById(VoucherRequestDto body) {
Criteria criteria = getCriteria();
criteria.add(Restrictions.eq("ruleId", body.getVoucherId()));
criteria.add(Restrictions.eq("uid", body.getUid()));
criteria.add(Restrictions.eq("source", 3));
List list = criteria.list();
return list;
}
} }
src/main/java/com/ctrip/fun/golf/service/basic/VoucherService.java
...@@ -42,6 +42,7 @@ import com.ctrip.fun.common.vo.basic.VoucherItemDTO; ...@@ -42,6 +42,7 @@ import com.ctrip.fun.common.vo.basic.VoucherItemDTO;
import com.ctrip.fun.common.vo.basic.VoucherQueryDto; import com.ctrip.fun.common.vo.basic.VoucherQueryDto;
import com.ctrip.fun.common.vo.basic.VoucherQueryFormDTO; import com.ctrip.fun.common.vo.basic.VoucherQueryFormDTO;
import com.ctrip.fun.common.vo.basic.VoucherQueryRequestDTO; import com.ctrip.fun.common.vo.basic.VoucherQueryRequestDTO;
import com.ctrip.fun.common.vo.basic.VoucherRequestDto;
import com.ctrip.fun.common.vo.basic.VoucherRuleMultiEnum; import com.ctrip.fun.common.vo.basic.VoucherRuleMultiEnum;
import com.ctrip.fun.common.vo.basic.VoucherShareLogBean; import com.ctrip.fun.common.vo.basic.VoucherShareLogBean;
import com.ctrip.fun.common.vo.basic.VoucherShareLogQuery; import com.ctrip.fun.common.vo.basic.VoucherShareLogQuery;
...@@ -1279,4 +1280,16 @@ public class VoucherService { ...@@ -1279,4 +1280,16 @@ public class VoucherService {
this.voucherGetLogDao = voucherGetLogDao; this.voucherGetLogDao = voucherGetLogDao;
} }
public Response<List<VoucherItemDTO>> findUserVoucherById(
VoucherRequestDto body) {
List<VoucherItemDTO> list = voucherDao.findUserVoucherById(body);
Response<List<VoucherItemDTO>> response = new Response<List<VoucherItemDTO>>();
response.setBody(list);
return response;
}
} }
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