Commit 8accaa96 by zhangchen

1.添加字段,跳转页面

parent 306e64c5
......@@ -862,7 +862,7 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> {
public PagedResponseBean<VoucherItemDTO> queryListForMiniApps(VoucherQueryDto queryBean) {
StringBuilder sb = new StringBuilder(
"select SQL_CALC_FOUND_ROWS v.Id AS id,v.Type AS type,v.Amount AS amount,v.StartUseDate AS startUseDate,v.EndUseDate AS endUseDate,v.Used AS used,v.UseDate AS useDate,rule.remark AS remark,rule.description AS description,v.UID AS uid,v.Source AS source,v.ruleId AS ruleId,v.shared,v.isShare,v.userLimit from bsc_voucher v LEFT JOIN bsc_voucher_rule rule on (v.ruleId=rule.id) where 1=1 ");
"select SQL_CALC_FOUND_ROWS v.Id AS id,v.Type AS type,v.Amount AS amount,v.StartUseDate AS startUseDate,v.EndUseDate AS endUseDate,v.Used AS used,v.UseDate AS useDate,rule.remark AS remark,rule.description AS description,v.UID AS uid,v.Source AS source,v.ruleId AS ruleId,v.shared,v.isShare,v.userLimit,rule.conditionJson from bsc_voucher v LEFT JOIN bsc_voucher_rule rule on (v.ruleId=rule.id) where 1=1 ");
if (queryBean.getUsed() != null) {
if(queryBean.getUsed()==0){
sb.append("and Used=0 ");
......
......@@ -29,7 +29,9 @@ import com.ctrip.fun.common.vo.ResponseStatusEnum;
import com.ctrip.fun.common.vo.basic.AbstractRuleConditionBean;
import com.ctrip.fun.common.vo.basic.ConditionMultipleElement;
import com.ctrip.fun.common.vo.basic.CourseRuleConditionBaseBean;
import com.ctrip.fun.common.vo.basic.CourseRuleConditionBean;
import com.ctrip.fun.common.vo.basic.EventActivityRuleConditionBaseBean;
import com.ctrip.fun.common.vo.basic.EventActivityRuleConditionBean;
import com.ctrip.fun.common.vo.basic.MallProductRuleConditionBaseBean;
import com.ctrip.fun.common.vo.basic.MallProductRuleConditionBean;
import com.ctrip.fun.common.vo.basic.MultipleCourseConditionBean;
......@@ -57,6 +59,7 @@ import com.ctrip.fun.golf.dao.basic.VoucherShareLogDao;
import com.ctrip.fun.golf.dao.client.ClientConfigDao;
import com.ctrip.fun.golf.dao.order.EventActivityOrderItemDao;
import com.ctrip.fun.golf.dao.order.OrderDao;
import com.ctrip.fun.golf.dao.product.CourseProductDao;
import com.ctrip.fun.golf.dao.product.CourseResourceDao;
import com.ctrip.fun.golf.dao.tour.TourBasicDao;
import com.ctrip.fun.golf.dao.user.UserExtDao;
......@@ -68,6 +71,7 @@ import com.ctrip.fun.golf.domain.basic.VoucherGetLog;
import com.ctrip.fun.golf.domain.basic.VoucherRule;
import com.ctrip.fun.golf.domain.basic.VoucherShareLog;
import com.ctrip.fun.golf.domain.client.ClientConfig;
import com.ctrip.fun.golf.domain.product.CourseProduct;
import com.ctrip.fun.golf.domain.product.CourseResource;
import com.ctrip.fun.golf.domain.tour.TourBasic;
import com.ctrip.fun.golf.domain.user.UserExt;
......@@ -95,6 +99,9 @@ public class VoucherService {
private TourBasicDao tourBasicDao;
@Autowired
private CourseProductDao courseProductDao;
@Autowired
private ClientConfigDao clientConfigDao = null;
@Autowired
private UserExtDao userExtDao = null;
......@@ -744,7 +751,31 @@ public class VoucherService {
UserToken userToken = this.userTokenDao.getUserTokenByToken(queryBean.getToken(),
TokenTypeEnum.ACCESS.getKey());
queryBean.setUid(userToken.getUserId());
return voucherDao.queryListForMiniApps(queryBean);
PagedResponseBean<VoucherItemDTO> queryListForMiniApps = voucherDao.queryListForMiniApps(queryBean);
if(!queryListForMiniApps.getResult().isEmpty()){
for(VoucherItemDTO voucherItemDTO : queryListForMiniApps.getResult()){
if(!StringUtils.isEmpty(voucherItemDTO.getConditionJson()) && VoucherTypeEnum.COURSE.getValue() == voucherItemDTO.getType()){
String conditionJson = voucherItemDTO.getConditionJson();
VoucherTypeEnum voucherTypeEnum = VoucherTypeEnum.valueOf(voucherItemDTO.getType());
if (conditionJson != null) {
if(voucherItemDTO.getMultiple()==0){
if (voucherTypeEnum != null && voucherTypeEnum.isCourseRuleConditionBean()) {
AbstractRuleConditionBean ruleConditionBean = JsonUtil.readValue(
conditionJson, CourseRuleConditionBean.class);
if(!StringUtils.isEmpty(ruleConditionBean.getValue())){
CourseProduct courseProduct = courseProductDao.findById(Integer.parseInt(ruleConditionBean.getValue()));
voucherItemDTO.setCourseID(courseProduct.getCourseId().toString());
}
}
}
}
}
}
}
return queryListForMiniApps;
}
//小程序查询券的分享记录
......
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