add vipmember

src/main/java/com/ctrip/fun/golf/api/friend/FriendsController.java

@@ -62,16 +62,18 @@ public class FriendsController {
             ResponseFriendBean responseFriendBean = new ResponseFriendBean();
             Friend friend = this.friendService.get(friendId);
             UserExt userExt = userExtService.GetUserExtInfoByPhone(friend.getFriendPhone());
+            
             if(friend!=null){
                 responseFriendBean.setPlayerId(friend.getPlayerId());
                 responseFriendBean.setFriendId(friendId);
                 if(userExt!=null){
-//                	responseFriendBean.setVipGrade(userExt.getVipGrade());
-                	if(checkIfCommuneUser(userExt)){
+                	/*if(checkIfCommuneUser(userExt)){
                 		responseFriendBean.setVipGrade(VipGradeEnum.VIP2.getKey());
                 	}else{
                 		responseFriendBean.setVipGrade(VipGradeEnum.NONEVIP.getKey());
-                	}
+                	}*/
+                	int vipGrade = userExtService.updateUserIdentity(userExt);
+                	responseFriendBean.setVipGrade(vipGrade);
                 }
             }
             response.setBody(responseFriendBean);

src/main/java/com/ctrip/fun/golf/api/order/VipMemberOrderController.java

+/**
+ * Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
+ */
+package com.ctrip.fun.golf.api.order;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.ctrip.fun.common.vo.order.AbstractOrderListItemBean;
+import com.ctrip.fun.common.vo.order.VipMemberOrderBean;
+import com.ctrip.fun.golf.service.order.AbstractOrderService;
+import com.ctrip.fun.golf.service.order.VipMemberOrderService;
+
+/**
+ * @content
+ * @author csleng
+ * @date
+ */
+@Controller
+@RequestMapping(value = "/vipmemberOrder")
+public class VipMemberOrderController extends AbstractOrderController<VipMemberOrderBean, Object, AbstractOrderListItemBean> {
+
+    @Autowired
+    private VipMemberOrderService vipmemberOrderService;
+
+    @Override
+    protected AbstractOrderService<VipMemberOrderBean, Object> getOrderService() {
+        return vipmemberOrderService;
+    }
+
+}

src/main/java/com/ctrip/fun/golf/api/payment/VipMemberOrderNotifyController.java

+/**
+ * Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
+ */
+package com.ctrip.fun.golf.api.payment;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.ctrip.fun.golf.service.payment.AbstractNotifyService;
+import com.ctrip.fun.golf.service.payment.CommuneNotifyService;
+import com.ctrip.fun.golf.service.payment.VipMemberNotifyService;
+
+/**
+ * @author zgsong
+ * @version 1.0.0
+ */
+@Controller
+@RequestMapping(value = "/vipmemberOrder")
+public class VipMemberOrderNotifyController extends AbstractNotifyController {
+
+    @Autowired
+    private VipMemberNotifyService vipmemberNotifyService = null;
+
+    @Override
+    protected AbstractNotifyService getNotifyService() {
+        return vipmemberNotifyService;
+    }
+
+}

src/main/java/com/ctrip/fun/golf/dao/order/OrderDao.java

@@ -279,7 +279,7 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
     }
 
     @SuppressWarnings("unchecked")
-    public PagedEntityBean<Order> queryCommuneOrders(OrderQuery queryBean) {
+    public PagedEntityBean<Order> queryComOrders(OrderQuery queryBean) {
         PagedEntityBean<Order> pagedEntityBean = new PagedEntityBean<Order>();
         Criteria criteria = this.getCriteria();
         criteria.add(Restrictions.eq("orderCategory", queryBean.getOrderCategory()));

src/main/java/com/ctrip/fun/golf/dao/order/VipMemberOrderItemDao.java

+/**
+ * Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
+ */
+package com.ctrip.fun.golf.dao.order;
+
+import java.util.List;
+import com.ctrip.fun.golf.dao.GenericHibernateDao;
+import com.ctrip.fun.golf.domain.order.VipMemberOrderItem;
+
+/**
+ * @content 
+ * @author caosy
+ * @date
+ */
+public class VipMemberOrderItemDao extends GenericHibernateDao<VipMemberOrderItem, Integer> {
+
+    public List<VipMemberOrderItem> getByOrderId(Integer orderId) {
+        String hsql = "from VipMemberOrderItem t where t.orderId=" + orderId;
+		return this.getEntities(hsql);
+	}
+
+}

src/main/java/com/ctrip/fun/golf/dao/user/UserExtDao.java

@@ -110,6 +110,15 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
         Query query = getSession().createSQLQuery(sql.toString());
         query.executeUpdate();
     }
+    
+    public int updateVipMemberInfo(String uid, Date expireTime, int vipGrade) {
+        String sql = "UPDATE UserExt SET vipmemberExpireTime = :expireTime,vipGrade = :vipGrade  WHERE UID = :uid";
+        Query query = getSession().createQuery(sql);
+        query.setParameter("expireTime", expireTime);
+        query.setParameter("vipGrade", vipGrade);
+        query.setParameter("uid", uid);
+        return query.executeUpdate();
+    }
 
     public UserExt GetUserExtInfoByPhone(String phone) {
         String hsql = "from UserExt t where t.bindedMobilePhone = :phone";

src/main/java/com/ctrip/fun/golf/domain/order/VipMemberOrderItem.java

+package com.ctrip.fun.golf.domain.order;
+
+import static javax.persistence.GenerationType.IDENTITY;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * vip会员订单item
+ */
+@Entity
+@Table(name = "ord_vipmemberitem", catalog = "fundb")
+public class VipMemberOrderItem implements java.io.Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1264564068028019067L;
+
+	/**
+     * 主键id
+     */
+    @Id
+    @GeneratedValue(strategy = IDENTITY)
+    @Column(name = "id", unique = true)
+    private Integer id;
+
+    /**
+     * 关联orderId
+     */
+    @Column(name = "orderId")
+    private Integer orderId;
+
+    
+    /**
+     * vip卡类型
+     */
+    @Column(name = "vipmemberType")
+    private Integer vipmemberType;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+	public Integer getVipmemberType() {
+		return vipmemberType;
+	}
+
+	public void setVipmemberType(Integer vipmemberType) {
+		this.vipmemberType = vipmemberType;
+	}
+
+}

src/main/java/com/ctrip/fun/golf/domain/user/UserExt.java

@@ -279,7 +279,14 @@ public class UserExt implements java.io.Serializable {
     private Date communeAgainTime;
     /**加入公社的年数*/
     private Integer communeYears;
-    /**加入公社的年数*/
+    
+    /**vip会员到期时间*/
+    private Date vipmemberExpireTime;
+    
+    /**vip会员节省金额*/
+    private BigDecimal vipmemberSaveAmount;
+    
+    /**tee*/
     private Integer tee;
     
     
@@ -860,6 +867,24 @@ public class UserExt implements java.io.Serializable {
 	public void setCommuneYears(Integer communeYears) {
 		this.communeYears = communeYears;
 	}
+	
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "vipmemberExpireTime")
+	public Date getVipmemberExpireTime() {
+		return vipmemberExpireTime;
+	}
+
+	public void setVipmemberExpireTime(Date vipmemberExpireTime) {
+		this.vipmemberExpireTime = vipmemberExpireTime;
+	}
+
+	public BigDecimal getVipmemberSaveAmount() {
+		return vipmemberSaveAmount;
+	}
+
+	public void setVipmemberSaveAmount(BigDecimal vipmemberSaveAmount) {
+		this.vipmemberSaveAmount = vipmemberSaveAmount;
+	}
 
 	public Integer getTee() {
 		return tee;

src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java

@@ -279,7 +279,7 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
         PagedResponseBean<CommuneOrderListItemBean> pagedResponseBean = new PagedResponseBean<CommuneOrderListItemBean>();
         pagedResponseBean.setCount(0);
         try {
-            PagedEntityBean<Order> pagedEntityBean = this.getOrderDao().queryCommuneOrders(orderQuery);
+            PagedEntityBean<Order> pagedEntityBean = this.getOrderDao().queryComOrders(orderQuery);
             pagedResponseBean.setCount((int) pagedEntityBean.getCount());
             if (pagedEntityBean.getResult() == null) {
                 pagedResponseBean.setResult(null);

src/main/java/com/ctrip/fun/golf/service/payment/VipMemberNotifyService.java

+/**
+ * Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
+ */
+package com.ctrip.fun.golf.service.payment;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.util.CollectionUtils;
+
+import com.ctrip.fun.common.core.util.DateUtil;
+import com.ctrip.fun.common.vo.basic.VipGradeEnum;
+import com.ctrip.fun.common.vo.product.VipMemberTypeEnum;
+import com.ctrip.fun.golf.dao.order.VipMemberOrderItemDao;
+import com.ctrip.fun.golf.domain.order.Order;
+import com.ctrip.fun.golf.domain.order.VipMemberOrderItem;
+import com.ctrip.fun.golf.domain.user.UserExt;
+import com.ctrip.fun.golf.service.basic.OperationMessageService;
+import com.ctrip.fun.golf.service.order.VipMemberOrderService;
+
+public class VipMemberNotifyService extends AbstractNotifyService {
+
+    private VipMemberOrderService vipmemberOrderService = null;
+
+    private OperationMessageService operationMessageService;
+
+    private VipMemberOrderItemDao vipmemberOrderItemDao = null;
+
+
+    @Override
+    protected void doPaySuccess(Order order) {
+    	UserExt user = getUserExtDao().getByUid(order.getUid());
+    	setVipMemberInfo(user, getVipMemberType(order.getOrderId()));
+    	if(user.getVipmemberExpireTime() == null){
+    		//代表新用户
+    		sendMessage(order, 114);
+    	}else{
+    		//代表续费的
+    		sendMessage(order, 115);
+    	}
+    }
+    
+    private void setVipMemberInfo(UserExt user, int vipmemberType){
+    	Date now = new Date();
+    	Date expireTime = user.getVipmemberExpireTime();
+    	Date tmpTime;
+    	if(expireTime != null && DateUtil.getDistinceDay(expireTime, now) < 0){
+    		tmpTime = expireTime;
+    	}else{
+    		tmpTime = now;
+    	}
+    	if(vipmemberType == VipMemberTypeEnum.MONTHCARD.getValue()){
+    		//月卡
+//    		expireTime = DateUtil.addDays(tmpTime, VipMemberTypeEnum.MONTHCARD.getDays());
+    		expireTime = DateUtil.addDateField(tmpTime, VipMemberTypeEnum.MONTHCARD.getDays(), 1);
+    	}else if(vipmemberType == VipMemberTypeEnum.YEARCARD.getValue()){
+    		//年卡
+//    		expireTime = DateUtil.addDays(tmpTime, VipMemberTypeEnum.YEARCARD.getDays());
+    		expireTime = DateUtil.addDateField(tmpTime, VipMemberTypeEnum.YEARCARD.getDays(), 1);
+    	}
+    	int vipGrade = user.getVipGrade() | VipGradeEnum.VIP4.getKey();
+    	getUserExtDao().updateVipMemberInfo(user.getUid(), expireTime, vipGrade);
+    }
+    
+    
+    private int getVipMemberType(Integer orderId){
+    	 int type = VipMemberTypeEnum.MONTHCARD.getValue();
+    	 List<VipMemberOrderItem> orderItems = vipmemberOrderItemDao.getByOrderId(orderId);
+         if (!CollectionUtils.isEmpty(orderItems)) {
+        	 type = orderItems.get(0).getVipmemberType();
+         }
+    	return type;
+    	
+    }
+    @Override
+    protected void doPayFail(Order order) {
+        // do nothing
+    }
+
+    @Override
+    protected void sendMessage(Order order, int messageId) {
+        operationMessageService.executeSendMessageOfVipCommune(order, messageId);
+    }
+
+    @Override
+    protected void doSuccessRefund(Order order) {
+        // TODO Auto-generated method stub
+    }
+
+    @Override
+    protected void doFailRefund(Order order) {
+        // TODO Auto-generated method stub
+    }
+
+    /**
+     * @param order
+     * @see com.ctrip.fun.golf.service.payment.AbstractNotifyService#failToSuccess(com.ctrip.fun.golf.domain.order.Order)
+     */
+    @Override
+    protected void failToSuccess(Order order) {
+        // TODO Auto-generated method stub
+    }
+
+    public OperationMessageService getOperationMessageService() {
+        return operationMessageService;
+    }
+
+    public void setOperationMessageService(OperationMessageService operationMessageService) {
+        this.operationMessageService = operationMessageService;
+    }
+
+	public VipMemberOrderService getVipmemberOrderService() {
+		return vipmemberOrderService;
+	}
+
+	public void setVipmemberOrderService(VipMemberOrderService vipmemberOrderService) {
+		this.vipmemberOrderService = vipmemberOrderService;
+	}
+
+	public VipMemberOrderItemDao getVipmemberOrderItemDao() {
+		return vipmemberOrderItemDao;
+	}
+
+	public void setVipmemberOrderItemDao(VipMemberOrderItemDao vipmemberOrderItemDao) {
+		this.vipmemberOrderItemDao = vipmemberOrderItemDao;
+	}
+
+}

src/main/java/com/ctrip/fun/golf/service/user/UserExtService.java

 package com.ctrip.fun.golf.service.user;
 
+import java.util.Calendar;
 import java.util.Date;
 
 import org.slf4j.Logger;
@@ -7,6 +8,7 @@ import org.slf4j.LoggerFactory;
 
 import com.ctrip.fun.common.core.util.BeanConverter;
 import com.ctrip.fun.common.core.util.DateUtil;
+import com.ctrip.fun.common.vo.basic.VipGradeEnum;
 import com.ctrip.fun.common.vo.user.UserExtBean;
 import com.ctrip.fun.golf.dao.order.OrderDao;
 import com.ctrip.fun.golf.dao.user.UserExtDao;
@@ -89,6 +91,34 @@ public class UserExtService extends GenericService<UserExtDao, UserExt, Integer,
     public UserExt GetUserExtInfoByPhone(String bindedMobilePhone){
     	return this.userExtDao.GetUserExtInfoByPhone(bindedMobilePhone);
     }
+    
+    /**判断用户过期 add by caosy*/
+	public int updateUserIdentity(UserExt user) {
+		Integer vipGrade = user.getVipGrade();
+        //社员续费 
+        Date startTime = (user.getCommuneAgainTime() == null? user.getCommuneTime():user.getCommuneAgainTime());
+        if(startTime != null){
+        	Date outDate = DateUtil.addDateField(startTime,Calendar.YEAR, 1);
+        	long dayFromOutDate = DateUtil.getDistinceDay(new Date(), outDate);
+        	if (dayFromOutDate < 0) {
+        		// 代表已经过期, 进行消除身份
+        		vipGrade = (user.getVipGrade() & ~VipGradeEnum.VIP2.getKey());
+        	}
+        }
+        
+        //vip会员过期 
+        Date vipmemberExpireTime = user.getVipmemberExpireTime();
+        if(vipmemberExpireTime != null){
+        	long vipmemberExpireDays = DateUtil.getDistinceDay(new Date(), vipmemberExpireTime);
+        	if (vipmemberExpireDays < 0) {
+        		// 代表已经过期, 进行消除身份
+        		vipGrade = (user.getVipGrade() & ~VipGradeEnum.VIP4.getKey());
+        		user.setVipGrade(vipGrade);
+        	}
+        }
+        user.setVipGrade(vipGrade);
+        return vipGrade;
+	}
 
     public Integer updateBlockFlag(UserExt bean) {
         return userExtDao.updateBlockFlag(bean);

src/main/java/com/ctrip/fun/golf/service/user/UserService.java

@@ -1358,7 +1358,35 @@ public class UserService {
             this.basicUserDao.update(basicUser);
         }
     }
-
+    
+    /**判断用户过期 add by caosy*/
+	private int updateUserIdentity(UserExt user) {
+		Integer vipGrade = user.getVipGrade();
+        //社员续费 
+        Date startTime = (user.getCommuneAgainTime() == null? user.getCommuneTime():user.getCommuneAgainTime());
+        if(startTime != null){
+        	Date outDate = DateUtil.addDateField(startTime,Calendar.YEAR, 1);
+        	long dayFromOutDate = DateUtil.getDistinceDay(new Date(), outDate);
+        	if (dayFromOutDate < 0) {
+        		// 代表已经过期, 进行消除身份
+        		vipGrade = (user.getVipGrade() & ~VipGradeEnum.VIP2.getKey());
+        	}
+        }
+        
+        //vip会员过期 
+        Date vipmemberExpireTime = user.getVipmemberExpireTime();
+        if(vipmemberExpireTime != null){
+        	long vipmemberExpireDays = DateUtil.getDistinceDay(new Date(), vipmemberExpireTime);
+        	if (vipmemberExpireDays < 0) {
+        		// 代表已经过期, 进行消除身份
+        		vipGrade = (user.getVipGrade() & ~VipGradeEnum.VIP4.getKey());
+        		user.setVipGrade(vipGrade);
+        	}
+        }
+        user.setVipGrade(vipGrade);
+        return vipGrade;
+	}
+    
     /**
      * uid为空串是获取用信息失败。
      */
@@ -1389,11 +1417,14 @@ public class UserService {
         userBean.setUserGradeImgUrl(this.imageServer + "UserGrade" + userExt.getUserGrade()
                 + ".png");
         userBean.setVipGradeAll(userExt.getVipGrade());
-        int vipGrade = userExt.getVipGrade() & VipGradeEnum.VIP2.getKey();
+     /*   int vipGrade = userExt.getVipGrade() & VipGradeEnum.VIP2.getKey();
         if (vipGrade == 0) {
             vipGrade = userExt.getVipGrade() & VipGradeEnum.VIP1.getKey();
-        }
+        }*/
+        
+        int vipGrade = updateUserIdentity(userExt);
         userBean.setVipGrade(vipGrade);
+        vipGrade = userExt.getVipGrade() & VipGradeEnum.VIP2.getKey();
         userBean.setVipGradeName(VipGradeEnum.valueOf(vipGrade).getValue());
         userBean.setVipGradeImgUrl(this.imageServer + "VipGrade" + vipGrade + ".png");
         userBean.setUserName(userExt.getUserName());
@@ -1421,6 +1452,10 @@ public class UserService {
         //公社续费  add by caosy
         userBean.setCommuneExpireTime(DateUtil.addDateField(userExt.getCommuneAgainTime(), Calendar.YEAR, 1));
         userBean.setCommuneYears(userExt.getCommuneYears());
+        //vip会员 add by caosy
+        vipGrade = userExt.getVipGrade() & VipGradeEnum.VIP4.getKey();
+        userBean.setVipmemberImgUrl(this.imageServer + "VipGrade" + vipGrade + ".png");
+        
         userBean.setTee(userExt.getTee());
         
         userBean.setFamilyName(userExt.getFamilyName());

src/main/resources/debug/payment.properties

@@ -8,6 +8,7 @@ payment.courseBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/cou
 payment.tourBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/tourOrder
 payment.rechargeBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/rechargeOrder
 payment.communeBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/communeOrder
+payment.vipmemberBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/vipmemberOrder
 payment.eventActivityBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/eventActivityOrder
 payment.mallBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/mallOrder
 payment.privateKey=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKpQrSAzyJV0MfBN7qKvE8d73phdredNhF3cKm3IWKFlCWg/3alVWI6GE462rPc5A4T+shYcvzqhV5wSOS0QMfj9VfLPqUT+xggFcCQ48mbeX4Jy/N5QZB3RZuQu+YbmQT6f54h2sJvhqLurvE7sgW4qL7r6AaJfDsvYPjKSezYXAgMBAAECgYA32EY8Jd6iarwpMFSMEV4p7craKPVpv3gkkply79tn6EpCXZaf/HUSHpJxHCLw2Uf3JtBcAccOQXMJoMwQo5vOoMVl5nk+EZN//MB8Re8r/7GQV8E+myHdlntMjxOf38PGn9z8Ze0Q020fZwGjA6egBFcU/ld1lCcI0TAj3cZDcQJBANS9UOC3J5njhnuzACjQ1qTTXuv6hr2lbglr2za4Ju9xFJUkKXy2LBAp2LlakXZXDhf7lsqmwZg5BvOBK6DPl18CQQDM8tqqOr4LRJRhq2bqBx398IqtyoZpMshpzBXLr7bdhp7FR2N4AEoAGaa5hS5k3z5SYNLEGKFhRM+sFJBQjnRJAkBnq647I+YffxotM8jTGxpOjlbGhnqc9n4OB0p3evw2WRPfrhStmpUUd2AOy4zxb3EFzOvp66OSC9BQX9Uj86XfAkEAouGbgVDgOupNFvZ2+yWe43Ppc0eS3UZ72wFUjSXgKlzUECu1VOi95yh7xdOf1JFL4YKL30dH8psShUtuimc86QJAeBXASabJBcHAIisPkODvsciiz1pzm1WSuXRUxnuis0TRTRs7+2KEnWE4UV3jxehxkc1RAgteYosWXg5TWQgiUg==

src/main/resources/development/payment.properties

@@ -8,6 +8,7 @@ payment.courseBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/cou
 payment.tourBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/tourOrder
 payment.rechargeBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/rechargeOrder
 payment.communeBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/communeOrder
+payment.vipmemberBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/vipmemberOrder
 payment.eventActivityBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/eventActivityOrder
 payment.mallBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/mallOrder
 #payment.privateKey=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKpQrSAzyJV0MfBN7qKvE8d73phdredNhF3cKm3IWKFlCWg/3alVWI6GE462rPc5A4T+shYcvzqhV5wSOS0QMfj9VfLPqUT+xggFcCQ48mbeX4Jy/N5QZB3RZuQu+YbmQT6f54h2sJvhqLurvE7sgW4qL7r6AaJfDsvYPjKSezYXAgMBAAECgYA32EY8Jd6iarwpMFSMEV4p7craKPVpv3gkkply79tn6EpCXZaf/HUSHpJxHCLw2Uf3JtBcAccOQXMJoMwQo5vOoMVl5nk+EZN//MB8Re8r/7GQV8E+myHdlntMjxOf38PGn9z8Ze0Q020fZwGjA6egBFcU/ld1lCcI0TAj3cZDcQJBANS9UOC3J5njhnuzACjQ1qTTXuv6hr2lbglr2za4Ju9xFJUkKXy2LBAp2LlakXZXDhf7lsqmwZg5BvOBK6DPl18CQQDM8tqqOr4LRJRhq2bqBx398IqtyoZpMshpzBXLr7bdhp7FR2N4AEoAGaa5hS5k3z5SYNLEGKFhRM+sFJBQjnRJAkBnq647I+YffxotM8jTGxpOjlbGhnqc9n4OB0p3evw2WRPfrhStmpUUd2AOy4zxb3EFzOvp66OSC9BQX9Uj86XfAkEAouGbgVDgOupNFvZ2+yWe43Ppc0eS3UZ72wFUjSXgKlzUECu1VOi95yh7xdOf1JFL4YKL30dH8psShUtuimc86QJAeBXASabJBcHAIisPkODvsciiz1pzm1WSuXRUxnuis0TRTRs7+2KEnWE4UV3jxehxkc1RAgteYosWXg5TWQgiUg==

src/main/resources/hibernate.cfg.xml

@@ -151,6 +151,7 @@
 		<mapping class="com.ctrip.fun.golf.domain.order.TourOrderSupItem" />
 		<mapping class="com.ctrip.fun.golf.domain.order.RechargeOrderItem" />
 		<mapping class="com.ctrip.fun.golf.domain.order.CommuneOrderItem" />
+		<mapping class="com.ctrip.fun.golf.domain.order.VipMemberOrderItem" />
 		<mapping class="com.ctrip.fun.golf.domain.order.EventActivityOrderItem" />
 		<mapping class="com.ctrip.fun.golf.domain.client.ClientConfig" />
 		<mapping class="com.ctrip.fun.golf.domain.user.UserInvoiceTitle" />

src/main/resources/order.spring.xml

@@ -77,6 +77,10 @@
 		<property name="sessionFactory" ref="sessionFactory"></property>
 	</bean>
 	
+	<bean name="vipmemberOrderItemDao" class="com.ctrip.fun.golf.dao.order.VipMemberOrderItemDao">
+		<property name="sessionFactory" ref="sessionFactory"></property>
+	</bean>
+	
 	<bean name="insuranceInfoDao" class="com.ctrip.fun.golf.dao.order.InsuranceInfoDao">
 		<property name="sessionFactory" ref="sessionFactory"></property>
 	</bean>
@@ -192,6 +196,15 @@
   <property name="COMMUNE_AMOUNT2" value="${communeAmount2}"></property>
 	</bean>
 	
+	<bean name="vipmemberOrderService" class="com.ctrip.fun.golf.service.order.VipMemberOrderService" parent="abstractOrderService">
+		<property name="vipmemberOrderItemDao" ref="vipmemberOrderItemDao"></property>
+		<property name="clientConfigDao" ref="clientConfigDao"></property>
+		<property name="operationMessageService" ref="operationMessageService"></property>
+		<property name="jobUtil" ref="jobUtil"></property>
+		<property name="overTimeMinute" value="${payment.longOvertime}"></property>
+		<property name="vipmemberBaseNotifyUrl" value="${payment.vipmemberBaseNotifyUrl}"></property>
+	</bean>
+	
     <bean name="mallOrderService" class="com.ctrip.fun.mall.service.order.MallOrderService" parent="abstractOrderService">
         <property name="mallProductDao" ref="mallProductDao"></property>
         <property name="mallProductItemDao" ref="mallProductItemDao"></property>

src/main/resources/payment.properties

@@ -7,6 +7,7 @@ payment.courseBaseNotifyUrl=${payment.courseBaseNotifyUrl}
 payment.tourBaseNotifyUrl=${payment.tourBaseNotifyUrl}
 payment.rechargeBaseNotifyUrl=${payment.rechargeBaseNotifyUrl}
 payment.communeBaseNotifyUrl=${payment.communeBaseNotifyUrl}
+payment.vipmemberBaseNotifyUrl=${payment.vipmemberBaseNotifyUrl}
 payment.mallBaseNotifyUrl=${payment.mallBaseNotifyUrl}
 payment.eventActivityBaseNotifyUrl=${payment.eventActivityBaseNotifyUrl}
 payment.privateKey=${payment.privateKey}

src/main/resources/payment.spring.xml

@@ -107,6 +107,26 @@
 		<property name="communeInviteActivityService" ref="communeInviteActivityService"></property>
 	</bean>
 	
+	<bean name="vipmemberNotifyService" class="com.ctrip.fun.golf.service.payment.VipMemberNotifyService">
+		<property name="charset" value="utf-8"></property>
+		<property name="vipmemberOrderService" ref="vipmemberOrderService"></property>
+		<property name="orderDao" ref="orderDao"></property>
+		<property name="paymentService" ref="paymentService"></property>
+		<property name="paymentResponseDao" ref="paymentResponseDao"></property>
+		<property name="privateKey" value="${payment.privateKey}"></property>
+		<property name="publicKey" value="${payment.publicKey}"></property>
+		<property name="userExtDao" ref="userExtDao"></property>
+		<property name="userService" ref="userService"></property>
+		<property name="voucherDao" ref="voucherDao"></property>
+		<property name="voucherService" ref="voucherService"></property>
+		<property name="insuranceProcessService" ref="insuranceProcessService"></property>
+		<property name="operationMessageService" ref="operationMessageService"></property>
+        <property name="invoiceinfoDao" ref="invoiceinfoDao"></property>
+        <property name="userMemberIntegralLogDao" ref="userMemberIntegralLogDao"></property>
+		<property name="orderProcessLogDao" ref="orderProcessLogDao"></property>
+		<property name="vipmemberOrderItemDao" ref="vipmemberOrderItemDao"></property>
+	</bean>
+	
     <bean name="mallNotifyService" class="com.ctrip.fun.mall.service.payment.MallNotifyService">
         <property name="charset" value="utf-8"></property>
         <property name="orderDao" ref="orderDao"></property>

src/main/resources/production/payment.properties

@@ -10,6 +10,7 @@ payment.courseBaseNotifyUrl=http\://api.iwanoutdoor.com/fun-common-soa/notify/co
 payment.tourBaseNotifyUrl=http\://api.iwanoutdoor.com/fun-common-soa/notify/tourOrder
 payment.rechargeBaseNotifyUrl=http\://api.iwanoutdoor.com/fun-common-soa/notify/rechargeOrder
 payment.communeBaseNotifyUrl=http\://api.iwanoutdoor.com/fun-common-soa/notify/communeOrder
+payment.vipmemberBaseNotifyUrl=http\://api.iwanoutdoor.com/fun-common-soa/notify/vipmemberOrder
 payment.eventActivityBaseNotifyUrl=http\://api.iwanoutdoor.com/fun-common-soa/notify/eventActivityOrder
 payment.mallBaseNotifyUrl=http\://api.iwanoutdoor.com/fun-common-soa/notify/mallOrder
 payment.privateKey=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAKcptp51DHQ6jYuAfYBUkTyqkQoAGpwmoi69lmpsVU6r57KGpYV2lAoQBq/4gHW/9s5yTSg12ZRERZlhNxpxRyRfM4fFq6CCTnIAWtjq7t/q3CriitAH4QVqQH6UXauJf07Lugd1/oePzwooQ5X9tWWRfbN4TvRDJLKlAJcdO0qHAgMBAAECgYBJrbMWSJUCrcQxlqK6a4vQZ4WiGMWhyc12OI4RvkojcNWg9IQEPW2mucWYzjkgrUnFWM/1RzbtiOH8ZsL43rDx+lVKpl3haQW76ARXH3tgZgxwjcW+bVZrDqMdq+ScjxjaF4xMvq7uWh9S30da5s8NAQV63KCOx/jF7e4/0LVaMQJBAN1Zby637VHekCr7WGILEJwgzfnpk7j6TwzP7T50gpenfRtYPYu8XoJLRuWzgyATHSs45J+Ry/x0y3+UJjIYpCsCQQDBVMLSd6DD3LjkK85rVo/AVzrbfjor8LkxDh8E41MPwAWVdFgTzvCN6pfvZVHbwWjIOs/tSYIHsmu0P7SwmPkVAkAN9YbqdlT0FcoXu9QeEr6Qag0zVoSnZLm5gB9hEe3ubHSaVd1Dw7ReGSs2bzS0wB/Vyve4DHTFzgPLXudtv1oTAkAz/vHu3RG127U2WLnJkJxU5KEFy2slyjZkhSG+lM0QHVrjGUle+nckFAYM8rkTW28s+vRVI0H/g/MHpWKZZGsJAkAuxUzmbfpX9JRB2kFr6hUzRkCDLu60A494NoOhrxTs8KzPEa1OOYa2+SZB+ycUwBIlir7zrMkmOrZGgn7ewv1M

src/main/resources/test/payment.properties

@@ -8,6 +8,7 @@ payment.courseBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/cou
 payment.tourBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/tourOrder
 payment.rechargeBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/rechargeOrder
 payment.communeBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/communeOrder
+payment.vipmemberBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/vipmemberOrder
 payment.eventActivityBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/eventActivityOrder
 payment.mallBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/mallOrder
 #payment.privateKey=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKpQrSAzyJV0MfBN7qKvE8d73phdredNhF3cKm3IWKFlCWg/3alVWI6GE462rPc5A4T+shYcvzqhV5wSOS0QMfj9VfLPqUT+xggFcCQ48mbeX4Jy/N5QZB3RZuQu+YbmQT6f54h2sJvhqLurvE7sgW4qL7r6AaJfDsvYPjKSezYXAgMBAAECgYA32EY8Jd6iarwpMFSMEV4p7craKPVpv3gkkply79tn6EpCXZaf/HUSHpJxHCLw2Uf3JtBcAccOQXMJoMwQo5vOoMVl5nk+EZN//MB8Re8r/7GQV8E+myHdlntMjxOf38PGn9z8Ze0Q020fZwGjA6egBFcU/ld1lCcI0TAj3cZDcQJBANS9UOC3J5njhnuzACjQ1qTTXuv6hr2lbglr2za4Ju9xFJUkKXy2LBAp2LlakXZXDhf7lsqmwZg5BvOBK6DPl18CQQDM8tqqOr4LRJRhq2bqBx398IqtyoZpMshpzBXLr7bdhp7FR2N4AEoAGaa5hS5k3z5SYNLEGKFhRM+sFJBQjnRJAkBnq647I+YffxotM8jTGxpOjlbGhnqc9n4OB0p3evw2WRPfrhStmpUUd2AOy4zxb3EFzOvp66OSC9BQX9Uj86XfAkEAouGbgVDgOupNFvZ2+yWe43Ppc0eS3UZ72wFUjSXgKlzUECu1VOi95yh7xdOf1JFL4YKL30dH8psShUtuimc86QJAeBXASabJBcHAIisPkODvsciiz1pzm1WSuXRUxnuis0TRTRs7+2KEnWE4UV3jxehxkc1RAgteYosWXg5TWQgiUg==

src/main/resources/uat/payment.properties

@@ -8,6 +8,7 @@ payment.courseBaseNotifyUrl=http://10.8.55.46:8080/fun-common-soa/notify/courseO
 payment.tourBaseNotifyUrl=http://10.8.55.46:8080/fun-common-soa/notify/tourOrder
 payment.rechargeBaseNotifyUrl=http://10.8.55.46:8080/fun-common-soa/notify/rechargeOrder
 payment.communeBaseNotifyUrl=http://10.8.55.46:8080/fun-common-soa/notify/communeOrder
+payment.vipmemberBaseNotifyUrl=http://10.8.55.46:8080/fun-common-soa/notify/vipmemberOrder
 payment.eventActivityBaseNotifyUrl=http://10.8.55.46:8080/fun-common-soa/notify/eventActivityOrder
 payment.mallBaseNotifyUrl=http://10.8.55.46:8080/fun-common-soa/notify/mallOrder
 #payment.privateKey=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKpQrSAzyJV0MfBN7qKvE8d73phdredNhF3cKm3IWKFlCWg/3alVWI6GE462rPc5A4T+shYcvzqhV5wSOS0QMfj9VfLPqUT+xggFcCQ48mbeX4Jy/N5QZB3RZuQu+YbmQT6f54h2sJvhqLurvE7sgW4qL7r6AaJfDsvYPjKSezYXAgMBAAECgYA32EY8Jd6iarwpMFSMEV4p7craKPVpv3gkkply79tn6EpCXZaf/HUSHpJxHCLw2Uf3JtBcAccOQXMJoMwQo5vOoMVl5nk+EZN//MB8Re8r/7GQV8E+myHdlntMjxOf38PGn9z8Ze0Q020fZwGjA6egBFcU/ld1lCcI0TAj3cZDcQJBANS9UOC3J5njhnuzACjQ1qTTXuv6hr2lbglr2za4Ju9xFJUkKXy2LBAp2LlakXZXDhf7lsqmwZg5BvOBK6DPl18CQQDM8tqqOr4LRJRhq2bqBx398IqtyoZpMshpzBXLr7bdhp7FR2N4AEoAGaa5hS5k3z5SYNLEGKFhRM+sFJBQjnRJAkBnq647I+YffxotM8jTGxpOjlbGhnqc9n4OB0p3evw2WRPfrhStmpUUd2AOy4zxb3EFzOvp66OSC9BQX9Uj86XfAkEAouGbgVDgOupNFvZ2+yWe43Ppc0eS3UZ72wFUjSXgKlzUECu1VOi95yh7xdOf1JFL4YKL30dH8psShUtuimc86QJAeBXASabJBcHAIisPkODvsciiz1pzm1WSuXRUxnuis0TRTRs7+2KEnWE4UV3jxehxkc1RAgteYosWXg5TWQgiUg==