Skip to content

caosy / fun-golf-service

Go to a project
Commit b7fe6454 by caosy
Options

过期会员购买限制

parent 7ff4e2f6
Inline Side-by-side
Showing with 44 additions and 620 deletions
src/main/java/com/ctrip/fun/golf/api/basic/VoucherController.java
......@@ -14,8 +14,6 @@ import com.ctrip.fun.common.vo.Request;
import com.ctrip.fun.common.vo.Response;
import com.ctrip.fun.common.vo.ResponseStatusEnum;
import com.ctrip.fun.common.vo.basic.VoucherGetLogBean;
import com.ctrip.fun.common.vo.basic.VoucherGiftQuery;
import com.ctrip.fun.common.vo.basic.VoucherGiftVo;
import com.ctrip.fun.common.vo.basic.VoucherItemDTO;
import com.ctrip.fun.common.vo.basic.VoucherQueryDto;
import com.ctrip.fun.common.vo.basic.VoucherQueryFormDTO;
......@@ -170,51 +168,6 @@ public class VoucherController {
return response;
}
/**
* 置换卷 列表
* @param request
* @return
*/
@ResponseBody
@RequestMapping(value = "/getVoucherGiftList", method = RequestMethod.POST)
public Response<PagedResponseBean<VoucherGiftVo>> getVoucherGiftList(@RequestBody Request<VoucherGiftQuery> request) {
Response<PagedResponseBean<VoucherGiftVo>> response = new Response<PagedResponseBean<VoucherGiftVo>>();
System.out.println("getVoucherGiftList1===> service" );
PagedResponseBean<VoucherGiftVo> result = voucherService.getVoucherGiftList(request.getBody());
response.setBody(result);
response.setStatusEnum(ResponseStatusEnum.SUCCESS);
return response;
}
/**
* 确认置换
* @param request
* @return
*/
// @ResponseBody
// @RequestMapping(value = "/voucherGiftAffirm", method = RequestMethod.POST)
// public Response<?> voucherGiftAffirm(@RequestBody Request<VoucherGiftQuery> request) {
// Response<?> response = new Response<>();
// response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
// voucherService.voucherGiftAffirm(request.getBody());
// return response;
// }
/**
* 取消置换
* @param request
* @return
*/
// @ResponseBody
// @RequestMapping(value = "/voucherGiftCancel", method = RequestMethod.POST)
// public Response<?> voucherGiftCancel(@RequestBody Request<VoucherGiftQuery> request) {
// Response<?> response = new Response<>();
// response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
// voucherService.voucherGiftCancel(request.getBody());
// return response;
// }
@ResponseBody
......
src/main/java/com/ctrip/fun/golf/dao/basic/VoucherDao.java
......@@ -30,8 +30,6 @@ import com.ctrip.fun.common.vo.SortDirectionEnum;
import com.ctrip.fun.common.vo.basic.SmsStatus;
import com.ctrip.fun.common.vo.basic.SmsType;
import com.ctrip.fun.common.vo.basic.UserGradeAndVipGradeEnum;
import com.ctrip.fun.common.vo.basic.VoucherGiftQuery;
import com.ctrip.fun.common.vo.basic.VoucherGiftVo;
import com.ctrip.fun.common.vo.basic.VoucherItemDTO;
import com.ctrip.fun.common.vo.basic.VoucherQueryDto;
import com.ctrip.fun.common.vo.basic.VoucherQueryFormDTO;
......
src/main/java/com/ctrip/fun/golf/dao/basic/VoucherGiftDao.java deleted 100644 → 0
package com.ctrip.fun.golf.dao.basic;
import java.math.BigInteger;
import java.sql.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.criterion.CriteriaSpecification;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ctrip.fun.common.core.util.BeanConverter;
import com.ctrip.fun.common.core.util.StringUtils;
import com.ctrip.fun.common.vo.PagedResponseBean;
import com.ctrip.fun.common.vo.basic.VoucherGiftQuery;
import com.ctrip.fun.common.vo.basic.VoucherGiftVo;
import com.ctrip.fun.golf.dao.GenericHibernateDao;
import com.ctrip.fun.golf.domain.basic.VoucherGift;
public class VoucherGiftDao extends GenericHibernateDao<VoucherGift, Integer>{
private static Logger logger = LoggerFactory.getLogger(VoucherGiftDao.class);
@SuppressWarnings("unchecked")
public PagedResponseBean<VoucherGiftVo> getVoucherGiftList(VoucherGiftQuery queryBean){
StringBuilder sb = new StringBuilder(
"select SQL_CALC_FOUND_ROWS bvg.id as id , bvg.gift_rule_name as giftRuleName ,bvg.gift_rule_id as giftRuleId ,bvg.`status` as status ,bvg.number as number from bsc_voucher_gift as bvg where 1=1 ");
if (StringUtils.hasText(queryBean.getUid())) {
sb.append(" and bvg.client_uid='").append(queryBean.getUid()).append("'");
}
if (queryBean.getStatus() >= 0 && queryBean.getStatus() != 2 ) {
sb.append(" and bvg.`status` = '").append(queryBean.getStatus()).append("'");
}else if(queryBean.getStatus() == 2){
sb.append(" and (bvg.`status` = 2 or bvg.`status` = 3 )").append(" ");
}
sb.append(" order by bvg.id desc");
Session session = this.getSession() ;
Query query = session.createSQLQuery(sb.toString());
query.setFirstResult(queryBean.getPagerOffset());
query.setMaxResults(queryBean.getPagerPerPage());
Query queryCount = session.createSQLQuery(" SELECT FOUND_ROWS() ");
query.setResultTransformer(CriteriaSpecification.ALIAS_TO_ENTITY_MAP);
List<Map<String, Object>> queryResult = query.list();
int count = ((BigInteger) queryCount.uniqueResult()).intValue();
List<VoucherGiftVo> result = new LinkedList<VoucherGiftVo>();
for (Map<String, Object> map : queryResult) {
VoucherGiftVo voucher = new VoucherGiftVo();
BeanConverter.populate(voucher, map);
result.add(voucher);
}
PagedResponseBean<VoucherGiftVo> pagedResponseBean = new PagedResponseBean<VoucherGiftVo>();
pagedResponseBean.setCount(count);
pagedResponseBean.setResult(result);
return pagedResponseBean;
}
public int updateVoucherGiftCancel(Integer id,Integer status) {
String sql = "UPDATE VoucherGift SET status = "+ status +" ,cancel_time = NOW() WHERE id = "
+ id;
Query query = getSession().createQuery(sql);
return query.executeUpdate();
}
public int updateVoucherGiftAffirm(Integer id,Integer status) {
String sql = "UPDATE VoucherGift SET status = "+ status +" ,affirm_time = NOW() WHERE id = "
+ id;
Query query = getSession().createQuery(sql);
return query.executeUpdate();
}
}
src/main/java/com/ctrip/fun/golf/dao/basic/VoucherGiftRuleDao.java deleted 100644 → 0
package com.ctrip.fun.golf.dao.basic;
import com.ctrip.fun.golf.dao.GenericHibernateDao;
import com.ctrip.fun.golf.domain.basic.VoucherGift;
import com.ctrip.fun.golf.domain.basic.VoucherGiftRule;
public class VoucherGiftRuleDao extends GenericHibernateDao<VoucherGiftRule, Integer>{
}
src/main/java/com/ctrip/fun/golf/dao/product/BuyVoucherActivityDao.java
......@@ -67,6 +67,9 @@ public class BuyVoucherActivityDao extends GenericHibernateDao<BuyVoucherActivit
criteria.add(Restrictions.eq("voucherType", queryBean.getVoucherType()));
}
if (null != queryBean.getOverdueCanBuy()&& !"".equals(queryBean.getOverdueCanBuy()) && 0 != queryBean.getOverdueCanBuy()) {
criteria.add(Restrictions.eq("overdueCanBuy", queryBean.getOverdueCanBuy()));
}
criteria.setFirstResult(queryBean.getPagerOffset());
criteria.setMaxResults(queryBean.getPagerPerPage());
if (queryBean.getSortDirection().equals(SortDirectionEnum.ASC)) {
......
src/main/java/com/ctrip/fun/golf/dao/user/UserWorkerDao.java
......@@ -35,7 +35,8 @@ public class UserWorkerDao extends GenericHibernateDao<UserWorker, Serializable>
Criteria criteria = this.getCriteria();
criteria.add(Restrictions.eq("uid", uid));
criteria.add(Restrictions.eq("status",0));
criteria.add(Restrictions.eq("status",0));
criteria.add(Restrictions.eq("deptId",1));
List<UserWorker> list = criteria.list();
if(list != null && list.size() > 0){
return list.get(0);
......
src/main/java/com/ctrip/fun/golf/domain/basic/VoucherGift.java deleted 100644 → 0
package com.ctrip.fun.golf.domain.basic;
import static javax.persistence.GenerationType.IDENTITY;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
@Entity
@Table(name = "bsc_voucher_gift", catalog = "fundb")
public class VoucherGift implements java.io.Serializable{
/**
*
*/
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private Integer id;
/**
* 置换规则id
*/
private Integer giftRuleId;
/**
* 置换规则名称
*/
private String giftRuleName;
/**
* 置换张数
*/
private Integer number;
/**
* 状态 0 销售提交 1 客户确认 2 客户取消 3销售取消
*/
private Integer status;
/**
* 客户uid
*/
private String clientUid;
/**
* 销售工作号id
*/
private Integer userWorkerId;
/**
* 销售提交时间
*/
private Date createdTime;
/**
* 客户确认时间
*/
private Date affirmTime;
/**
* 取消时间
*/
private Date cancelTime;
@Id
@GeneratedValue(strategy = IDENTITY)
@Column(name = "id", unique = true, nullable = false)
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
@Column(name = "gift_rule_id")
public Integer getGiftRuleId() {
return giftRuleId;
}
public void setGiftRuleId(Integer giftRuleId) {
this.giftRuleId = giftRuleId;
}
@Column(name = "gift_rule_name")
public String getGiftRuleName() {
return giftRuleName;
}
public void setGiftRuleName(String giftRuleName) {
this.giftRuleName = giftRuleName;
}
@Column(name = "number")
public Integer getNumber() {
return number;
}
public void setNumber(Integer number) {
this.number = number;
}
@Column(name = "status")
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
@Column(name = "client_uid")
public String getClientUid() {
return clientUid;
}
public void setClientUid(String clientUid) {
this.clientUid = clientUid;
}
@Column(name = "user_worker_id")
public Integer getUserWorkerId() {
return userWorkerId;
}
public void setUserWorkerId(Integer userWorkerId) {
this.userWorkerId = userWorkerId;
}
@Column(name = "created_time")
public Date getCreatedTime() {
return createdTime;
}
public void setCreatedTime(Date createdTime) {
this.createdTime = createdTime;
}
@Column(name = "affirm_time")
public Date getAffirmTime() {
return affirmTime;
}
public void setAffirmTime(Date affirmTime) {
this.affirmTime = affirmTime;
}
@Column(name = "cancel_time")
public Date getCancelTime() {
return cancelTime;
}
public void setCancelTime(Date cancelTime) {
this.cancelTime = cancelTime;
}
}
src/main/java/com/ctrip/fun/golf/domain/basic/VoucherGiftRule.java deleted 100644 → 0
package com.ctrip.fun.golf.domain.basic;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
@Entity
@Table(name = "bsc_voucher_gift_rule")
public class VoucherGiftRule {
/**
* 主键
*/
private Integer id;
/**
* 换卷规则名称
*/
private String giftName;
/**
* 开始时间
*/
private Date startTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 被换的卷规则id
*/
private Integer fromRuleId;
/**
*换成的卷规则id
*/
private Integer toRuleId;
/**
* 规则状态 0 暂停 1 开始
*/
private Integer status;
/**
* 被换的劵名称
*/
private String fromRuleName;
/**
*换成的卷名称
*/
private String toRuleName;
/**
* 劵来源 0 不限 1 线上 2 线下
*/
private Integer source;
/**
* 是否已审核通过 0初始值 1 审核通过 2未通过
*/
private Integer isPass;
/**
* 审核时间
*/
private Date passTime;
/**
* 审核人
*/
private String passName;
/**
* 创建时间
*/
private Date createdTime;
/**
* 创建人
*/
private String createdName;
@Id
@Column(name = "id", unique = true, nullable = false)
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
@Column(name = "gift_name")
public String getGiftName() {
return giftName;
}
public void setGiftName(String giftName) {
this.giftName = giftName;
}
@Column(name = "start_time")
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
@Column(name = "end_time")
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
@Column(name = "from_rule_id")
public Integer getFromRuleId() {
return fromRuleId;
}
public void setFromRuleId(Integer fromRuleId) {
this.fromRuleId = fromRuleId;
}
@Column(name = "to_rule_id")
public Integer getToRuleId() {
return toRuleId;
}
public void setToRuleId(Integer toRuleId) {
this.toRuleId = toRuleId;
}
@Column(name = "status")
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
@Column(name = "from_rule_name")
public String getFromRuleName() {
return fromRuleName;
}
public void setFromRuleName(String fromRuleName) {
this.fromRuleName = fromRuleName;
}
@Column(name = "to_rule_name")
public String getToRuleName() {
return toRuleName;
}
public void setToRuleName(String toRuleName) {
this.toRuleName = toRuleName;
}
@Column(name = "source")
public Integer getSource() {
return source;
}
public void setSource(Integer source) {
this.source = source;
}
@Column(name = "is_pass")
public Integer getIsPass() {
return isPass;
}
public void setIsPass(Integer isPass) {
this.isPass = isPass;
}
@Column(name = "pass_time")
public Date getPassTime() {
return passTime;
}
public void setPassTime(Date passTime) {
this.passTime = passTime;
}
@Column(name = "pass_name")
public String getPassName() {
return passName;
}
public void setPassName(String passName) {
this.passName = passName;
}
@Column(name = "created_time")
public Date getCreatedTime() {
return createdTime;
}
public void setCreatedTime(Date createdTime) {
this.createdTime = createdTime;
}
@Column(name = "created_name")
public String getCreatedName() {
return createdName;
}
public void setCreatedName(String createdName) {
this.createdName = createdName;
}
}
src/main/java/com/ctrip/fun/golf/domain/product/BuyVoucherActivity.java
......@@ -52,6 +52,7 @@ public class BuyVoucherActivity implements java.io.Serializable {
private String regionCode; //区域 0-全区域,100-上海 ，110-广州，120-北京
private Integer voucherType;//卷类型 1 -正常卷 2-体验卷需要身份证
private Integer showPaths; //显示途径 1-App 2-小程序 3-全部
private Integer overdueCanBuy; //过期会员购买 1-不可以 2-可以
@Id
@GeneratedValue(strategy = IDENTITY)
......@@ -283,4 +284,12 @@ public class BuyVoucherActivity implements java.io.Serializable {
public void setRealPrice(BigDecimal realPrice) {
this.realPrice = realPrice;
}
public Integer getOverdueCanBuy() {
return overdueCanBuy;
}
public void setOverdueCanBuy(Integer overdueCanBuy) {
this.overdueCanBuy = overdueCanBuy;
}
}
src/main/java/com/ctrip/fun/golf/domain/user/UserExt.java
......@@ -360,7 +360,15 @@ public class UserExt implements java.io.Serializable {
private String faceImage;//社员身份人脸照片
/**
* 超级会员开始时间
*/
private Date svipStartTime;
/**
* 超级会员结束时间
*/
private Date svipEndTime;
@Id
@GeneratedValue(strategy = IDENTITY)
......@@ -1039,4 +1047,19 @@ public class UserExt implements java.io.Serializable {
this.hasMPRegisterVoucher = hasMPRegisterVoucher;
}
public Date getSvipStartTime() {
return svipStartTime;
}
public void setSvipStartTime(Date svipStartTime) {
this.svipStartTime = svipStartTime;
}
public Date getSvipEndTime() {
return svipEndTime;
}
public void setSvipEndTime(Date svipEndTime) {
this.svipEndTime = svipEndTime;
}
}
src/main/java/com/ctrip/fun/golf/service/basic/VoucherService.java
......@@ -39,8 +39,6 @@ import com.ctrip.fun.common.vo.basic.MultipleCourseConditionBean;
import com.ctrip.fun.common.vo.basic.SmsStatus;
import com.ctrip.fun.common.vo.basic.SmsType;
import com.ctrip.fun.common.vo.basic.VoucherGetLogBean;
import com.ctrip.fun.common.vo.basic.VoucherGiftQuery;
import com.ctrip.fun.common.vo.basic.VoucherGiftVo;
import com.ctrip.fun.common.vo.basic.VoucherItemDTO;
import com.ctrip.fun.common.vo.basic.VoucherQueryDto;
import com.ctrip.fun.common.vo.basic.VoucherQueryFormDTO;
......@@ -59,8 +57,6 @@ import com.ctrip.fun.golf.dao.basic.OperationMessageDao;
import com.ctrip.fun.golf.dao.basic.SmsDao;
import com.ctrip.fun.golf.dao.basic.VoucherDao;
import com.ctrip.fun.golf.dao.basic.VoucherGetLogDao;
import com.ctrip.fun.golf.dao.basic.VoucherGiftDao;
import com.ctrip.fun.golf.dao.basic.VoucherGiftRuleDao;
import com.ctrip.fun.golf.dao.basic.VoucherRuleDao;
import com.ctrip.fun.golf.dao.basic.VoucherShareLogDao;
import com.ctrip.fun.golf.dao.client.ClientConfigDao;
......@@ -75,8 +71,6 @@ import com.ctrip.fun.golf.domain.basic.OperationMessage;
import com.ctrip.fun.golf.domain.basic.Sms;
import com.ctrip.fun.golf.domain.basic.Voucher;
import com.ctrip.fun.golf.domain.basic.VoucherGetLog;
import com.ctrip.fun.golf.domain.basic.VoucherGift;
import com.ctrip.fun.golf.domain.basic.VoucherGiftRule;
import com.ctrip.fun.golf.domain.basic.VoucherRule;
import com.ctrip.fun.golf.domain.basic.VoucherShareLog;
import com.ctrip.fun.golf.domain.client.ClientConfig;
......@@ -107,8 +101,6 @@ public class VoucherService {
private EventActivityOrderItemDao eventActivityOrderItemDao = null;
private OrderDao orderDao = null;
private TourBasicDao tourBasicDao;
private VoucherGiftDao voucherGiftDao = null;
private VoucherGiftRuleDao voucherGiftRuleDao = null;
@Autowired
private CourseProductDao courseProductDao;
......@@ -815,54 +807,7 @@ public class VoucherService {
return queryListForMiniApps;
}
// 查询置换劵列表
public PagedResponseBean<VoucherGiftVo> getVoucherGiftList(VoucherGiftQuery queryBean) {
UserToken userToken = this.userTokenDao.getUserTokenByToken(queryBean.getToken(),
TokenTypeEnum.ACCESS.getKey());
queryBean.setUid(userToken.getUserId());
return voucherGiftDao.getVoucherGiftList(queryBean);
}
// 确认置换
public void voucherGiftAffirm(VoucherGiftQuery voucherGiftQuery) {
VoucherGift voucherGift = this.voucherGiftDao.findById(voucherGiftQuery.getId());
VoucherGiftRule voucherGiftRule = this.voucherGiftRuleDao.findById(voucherGift.getGiftRuleId());
List<Voucher> voucherList = this.voucherDao.getUserRuleCount(voucherGiftRule.getFromRuleId(), voucherGift.getClientUid());
if(voucherGift.getStatus() != 0){
throw new VoucherException(-2, "不可确认置换");
}
if(voucherList.size() < voucherGift.getNumber()){
throw new VoucherException(-2, "置换卷数量不足");
}
// 置换劵
//1.1 删除劵
for(int i=0 ;i<voucherGift.getNumber(); i++ ){
Voucher voucher = voucherList.get(i);
String voucherId = String.valueOf(voucher.getId());
//删除劵
voucherDao.deleteVoucher(voucherGift.getClientUid(), voucher.getId(), "置换劵删除");
//发劵
this.sendVoucherForGiftByConfig(voucherGiftRule.getToRuleId(), voucherGift.getClientUid(),voucherId,true,"","","");
}
//更新确认状态
voucherGiftDao.updateVoucherGiftAffirm(voucherGift.getId(),1);
}
/**
* 取消置换
* @param voucherGiftQuery
*/
public void voucherGiftCancel(VoucherGiftQuery voucherGiftQuery) {
VoucherGift voucherGift = voucherGiftDao.findById(voucherGiftQuery.getId());
if(voucherGift.getStatus() != 0){
throw new VoucherException(-2, "不可取消置换");
}
voucherGiftDao.updateVoucherGiftCancel(voucherGiftQuery.getId(),2);
}
//小程序查询券的分享记录
public PagedResponseBean<VoucherShareLogBean> queryVoucherShareLogListForMiniApps(VoucherShareLogQuery query) {
......@@ -1406,21 +1351,6 @@ public class VoucherService {
return response;
}
public VoucherGiftDao getVoucherGiftDao() {
return voucherGiftDao;
}
public void setVoucherGiftDao(VoucherGiftDao voucherGiftDao) {
this.voucherGiftDao = voucherGiftDao;
}
public VoucherGiftRuleDao getVoucherGiftRuleDao() {
return voucherGiftRuleDao;
}
public void setVoucherGiftRuleDao(VoucherGiftRuleDao voucherGiftRuleDao) {
this.voucherGiftRuleDao = voucherGiftRuleDao;
}
......
src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java
......@@ -244,6 +244,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
return order;
}
// 走携程
public Response<PlaceOrderResponseBean> placeOrder(H abstractOrderBean) throws Exception{
this.checkParameters(abstractOrderBean);
......@@ -260,6 +261,8 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
return null;
}
//小程序
public Response<JSONObject> placeOrderWeiXinPay(H abstractOrderBean) throws Exception{
this.checkParameters(abstractOrderBean);
if (this.beforePlaceOrder(abstractOrderBean)) {
......@@ -1126,7 +1129,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
return result;
}
/**
* 提交订单进入支付流程
*
......@@ -1329,7 +1332,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
return response;
}
}
/**
* 提交部分预付或预付的订单
*
......
src/main/java/com/ctrip/fun/golf/service/user/UserService.java
......@@ -1762,7 +1762,8 @@ public class UserService {
userBean.setZip(userExt.getZip());
userBean.setVoucherNum(this.voucherDao.queryVoucherCountForCanUse(userExt.getUid(), false));
userBean.setVoucherNumNew(this.voucherDao.queryVoucherCountForCanUse(userExt.getUid(), true));
userBean.setSvipEndTime(userExt.getSvipEndTime());
userBean.setSvipStartTime(userExt.getSvipStartTime());
String imagePath = setImagePath(userQuery.getImageSize(), userBean.getExtID());
if (StringUtils.isEmpty(imagePath)) {
imagePath = userExt.getHeadImgUrl();
......
src/main/resources/basic.spring.xml
......@@ -12,14 +12,6 @@
<property name="sessionFactory" ref="sessionFactory"></property>
</bean>
<bean name="voucherGiftDao" class="com.ctrip.fun.golf.dao.basic.VoucherGiftDao">
<property name="sessionFactory" ref="sessionFactory"></property>
</bean>
<bean name="voucherGiftRuleDao" class="com.ctrip.fun.golf.dao.basic.VoucherGiftRuleDao">
<property name="sessionFactory" ref="sessionFactory"></property>
</bean>
<bean name="voucherRuleDao" class="com.ctrip.fun.golf.dao.basic.VoucherRuleDao">
<property name="sessionFactory" ref="sessionFactory"></property>
</bean>
......@@ -122,8 +114,6 @@
<property name="eventActivityOrderItemDao" ref="eventActivityOrderItemDao"></property>
<property name="remindExpireVoucherDay" value="${remindExpireVoucherDay}"></property>
<property name="tourBasicDao" ref="tourBasicDao"></property>
<property name="voucherGiftDao" ref="voucherGiftDao"></property>
<property name="voucherGiftRuleDao" ref="voucherGiftRuleDao"></property>
</bean>
<bean name="voucherRuleService" class="com.ctrip.fun.golf.service.basic.VoucherRuleService">
......
src/main/resources/hibernate.cfg.xml
......@@ -24,8 +24,6 @@
<mapping class="com.ctrip.fun.golf.domain.basic.PrePayCardProcessLog"/>
<mapping class="com.ctrip.fun.golf.domain.basic.Voucher"/>
<mapping class="com.ctrip.fun.golf.domain.basic.VoucherRule"/>
<mapping class="com.ctrip.fun.golf.domain.basic.VoucherGift"/>
<mapping class="com.ctrip.fun.golf.domain.basic.VoucherGiftRule"/>
<mapping class="com.ctrip.fun.golf.domain.basic.OperationMessage" />
<mapping class="com.ctrip.fun.golf.domain.recommend.RecommendLogs" />
<mapping class="com.ctrip.fun.golf.domain.operation.Logging" />
......
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