f-6.7.1

src/main/java/com/ctrip/fun/golf/.gitignore

+/dao

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

@@ -70,7 +70,7 @@ public class CommuneOrderController extends AbstractOrderController<CommuneOrder
     @SuppressWarnings("unchecked")
     @ResponseBody
     @RequestMapping(value = "/voucherPlaceOrderForMiniApp", method = RequestMethod.POST)
-    public ResponseMp<JSONObject> voucherPlaceOrderForMiniApp(@RequestBody Request<CommuneOrderBean> request) {
+    public ResponseMp<JSONObject> voucherPlaceOrderForMiniApp(@RequestBody Request<CommuneOrderBean> request) throws Exception {
     	ResponseMp<JSONObject> response = new ResponseMp<JSONObject>();
         JSONObject jSONObject;
 		jSONObject = communeOrderService.voucherPlaceOrderForMiniApp(request.getBody());

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

@@ -90,6 +90,9 @@ public class CommuneOrderItem implements java.io.Serializable {
     @Column(name = "recommendUid")
     private String recommendUid;
     
+    @Column(name = "userWorkerId")
+    private Integer userWorkerId;
+
     public Integer getId() {
         return id;
     }
@@ -186,6 +189,13 @@ public class CommuneOrderItem implements java.io.Serializable {
 		this.recommendUid = recommendUid;
 	}
     
+	public Integer getUserWorkerId() {
+		return userWorkerId;
+	}
+
+	public void setUserWorkerId(Integer userWorkerId) {
+		this.userWorkerId = userWorkerId;
+	}
     
 
 }

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

@@ -198,32 +198,48 @@ public class Order extends AbstractOrder implements java.io.Serializable {
 	 */
 	private String userType;
 
-    /**订单总的立减金额*/
+	/** 订单总的立减金额 */
 	private BigDecimal vipmemberDiscount;
 
-    /**订单总的随机立减折扣*/
+	/** 订单总的随机立减折扣 */
 	private BigDecimal vipmemberDiscountRate;
 
-    //关联订单发票表id
+	// 关联订单发票表id
 	private Integer invoiceId;
 
-    //可开发票时间---赛事和单定场订单在打球之后；其它的规则待定
+	// 可开发票时间---赛事和单定场订单在打球之后；其它的规则待定
 	private Date canInvoiceDate;
 
 	
 
-
 	public Order() {
 	}
 
-    public Order(BigDecimal actualAmount, BigDecimal adjustAmount, BigDecimal amount, int confirmType, String contactAddress, String contactEmail, String contactMobile, String contactName,
-            String contactTel, String ctripCardNo, String currency, BigDecimal discountAmount, BigDecimal exchangeRate, String externalNo, int firstRiskStatus,
-            BigDecimal limitedEmoneyAmount, BigDecimal onPayAmount, Date orderDate, String orderName, long orderNo, String orderStatus, int orderType, int orderUserStatus, String payMode,
-            BigDecimal prePayAmount, BigDecimal prePayCardAmount, int processStatus, String remark, int riskCheckStatus, int secondRiskStatus, String tempOrderNo, BigDecimal tmoney,
-            BigDecimal totalAmount, String uid, BigDecimal unlimitedEmoneyAmount, Date dataChangeLastTime, int orderSource, BigDecimal preAuthAmount, BigDecimal deductByPreAuthAmount,
-            int orderCategory, BigDecimal guaranteeAmount, BigDecimal deductByGuaranteeAmount, BigDecimal prePayCardRefundAmount, BigDecimal launchRefundAmount, BigDecimal refundAmount,
-            String applyFailReason, String refundFailReason, String deductByGuaranteeFailReason, String deductByPreAuthFailReason, String releasePreAuthFailReason, int isThird,
-            BigDecimal voucherAmount, BigDecimal voucherRefundAmount, int prePayCardDeductFlag, String voucherIDList, int voucherCount, String paymentRequestID, BigDecimal giftCardAmount) {
+	public Order(BigDecimal actualAmount, BigDecimal adjustAmount,
+			BigDecimal amount, int confirmType, String contactAddress,
+			String contactEmail, String contactMobile, String contactName,
+			String contactTel, String ctripCardNo, String currency,
+			BigDecimal discountAmount, BigDecimal exchangeRate,
+			String externalNo, int firstRiskStatus,
+			BigDecimal limitedEmoneyAmount, BigDecimal onPayAmount,
+			Date orderDate, String orderName, long orderNo, String orderStatus,
+			int orderType, int orderUserStatus, String payMode,
+			BigDecimal prePayAmount, BigDecimal prePayCardAmount,
+			int processStatus, String remark, int riskCheckStatus,
+			int secondRiskStatus, String tempOrderNo, BigDecimal tmoney,
+			BigDecimal totalAmount, String uid,
+			BigDecimal unlimitedEmoneyAmount, Date dataChangeLastTime,
+			int orderSource, BigDecimal preAuthAmount,
+			BigDecimal deductByPreAuthAmount, int orderCategory,
+			BigDecimal guaranteeAmount, BigDecimal deductByGuaranteeAmount,
+			BigDecimal prePayCardRefundAmount, BigDecimal launchRefundAmount,
+			BigDecimal refundAmount, String applyFailReason,
+			String refundFailReason, String deductByGuaranteeFailReason,
+			String deductByPreAuthFailReason, String releasePreAuthFailReason,
+			int isThird, BigDecimal voucherAmount,
+			BigDecimal voucherRefundAmount, int prePayCardDeductFlag,
+			String voucherIDList, int voucherCount, String paymentRequestID,
+			BigDecimal giftCardAmount) {
 		this.actualAmount = actualAmount;
 		this.adjustAmount = adjustAmount;
 		this.amount = amount;
@@ -284,16 +300,35 @@ public class Order extends AbstractOrder implements java.io.Serializable {
 		this.setPaymentRequestID(paymentRequestID);
 	}
 
-    public Order(BigDecimal actualAmount, BigDecimal adjustAmount, BigDecimal amount, int confirmType, String contactAddress, String contactEmail, String contactMobile, String contactName,
-            String contactTel, String ctripCardNo, String currency, BigDecimal discountAmount, BigDecimal exchangeRate, String externalNo, Date finishDate, int firstRiskStatus,
-            BigDecimal limitedEmoneyAmount, BigDecimal onPayAmount, Date orderDate, String orderName, long orderNo, String orderStatus, int orderType, int orderUserStatus, String payMode,
-            BigDecimal prePayAmount, BigDecimal prePayCardAmount, int processStatus, Date provConfirmTime, String remark, int riskCheckStatus, int secondRiskStatus, String tempOrderNo,
-            BigDecimal tmoney, BigDecimal totalAmount, String uid, BigDecimal unlimitedEmoneyAmount, Date dataChangeLastTime, int orderSource, BigDecimal preAuthAmount,
-            BigDecimal deductByPreAuthAmount, Date payDate, int orderCategory, BigDecimal guaranteeAmount, BigDecimal deductByGuaranteeAmount, BigDecimal prePayCardRefundAmount,
-            BigDecimal launchRefundAmount, BigDecimal refundAmount, Date applyTime, Date launchRefundTime, Date refundTime, Date launchDeductByGuaranteeTime, Date deductByGuaranteeTime,
-            Date launchDeductByPreAuthTime, Date deductByPreAuthTime, String applyFailReason, String refundFailReason, String deductByGuaranteeFailReason, String deductByPreAuthFailReason,
-            String releasePreAuthFailReason, Date launchReleasePreAuthTime, Date releasePreAuthTime, int isThird, BigDecimal voucherAmount, BigDecimal voucherRefundAmount,
-            int prePayCardDeductFlag, String voucherIDList, int voucherCount, String paymentRequestID, BigDecimal giftCardAmount) {
+	public Order(BigDecimal actualAmount, BigDecimal adjustAmount,
+			BigDecimal amount, int confirmType, String contactAddress,
+			String contactEmail, String contactMobile, String contactName,
+			String contactTel, String ctripCardNo, String currency,
+			BigDecimal discountAmount, BigDecimal exchangeRate,
+			String externalNo, Date finishDate, int firstRiskStatus,
+			BigDecimal limitedEmoneyAmount, BigDecimal onPayAmount,
+			Date orderDate, String orderName, long orderNo, String orderStatus,
+			int orderType, int orderUserStatus, String payMode,
+			BigDecimal prePayAmount, BigDecimal prePayCardAmount,
+			int processStatus, Date provConfirmTime, String remark,
+			int riskCheckStatus, int secondRiskStatus, String tempOrderNo,
+			BigDecimal tmoney, BigDecimal totalAmount, String uid,
+			BigDecimal unlimitedEmoneyAmount, Date dataChangeLastTime,
+			int orderSource, BigDecimal preAuthAmount,
+			BigDecimal deductByPreAuthAmount, Date payDate, int orderCategory,
+			BigDecimal guaranteeAmount, BigDecimal deductByGuaranteeAmount,
+			BigDecimal prePayCardRefundAmount, BigDecimal launchRefundAmount,
+			BigDecimal refundAmount, Date applyTime, Date launchRefundTime,
+			Date refundTime, Date launchDeductByGuaranteeTime,
+			Date deductByGuaranteeTime, Date launchDeductByPreAuthTime,
+			Date deductByPreAuthTime, String applyFailReason,
+			String refundFailReason, String deductByGuaranteeFailReason,
+			String deductByPreAuthFailReason, String releasePreAuthFailReason,
+			Date launchReleasePreAuthTime, Date releasePreAuthTime,
+			int isThird, BigDecimal voucherAmount,
+			BigDecimal voucherRefundAmount, int prePayCardDeductFlag,
+			String voucherIDList, int voucherCount, String paymentRequestID,
+			BigDecimal giftCardAmount) {
 		this.actualAmount = actualAmount;
 		this.adjustAmount = adjustAmount;
 		this.amount = amount;
@@ -888,7 +923,8 @@ public class Order extends AbstractOrder implements java.io.Serializable {
 		return this.deductByGuaranteeFailReason;
 	}
 
-    public void setDeductByGuaranteeFailReason(String deductByGuaranteeFailReason) {
+	public void setDeductByGuaranteeFailReason(
+			String deductByGuaranteeFailReason) {
 		this.deductByGuaranteeFailReason = deductByGuaranteeFailReason;
 	}
 
@@ -1027,9 +1063,15 @@ public class Order extends AbstractOrder implements java.io.Serializable {
 	 */
 	@Transient
 	public boolean isPaied() {
-        OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(this.orderType, this.payMode, this.confirmType, this.processStatus, false);
-        if (orderStatusEnum == OrderStatusEnum.PARTIAL_REFUND || orderStatusEnum == OrderStatusEnum.WAITING_DEAL || orderStatusEnum == OrderStatusEnum.WAITING_PAY_PARTY
-                || orderStatusEnum == OrderStatusEnum.WAITING_PAY_CASH || orderStatusEnum == OrderStatusEnum.WAITING_PAY || orderStatusEnum == OrderStatusEnum.WAITING_DEAL_CASH
+		OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(
+				this.orderType, this.payMode, this.confirmType,
+				this.processStatus, false);
+		if (orderStatusEnum == OrderStatusEnum.PARTIAL_REFUND
+				|| orderStatusEnum == OrderStatusEnum.WAITING_DEAL
+				|| orderStatusEnum == OrderStatusEnum.WAITING_PAY_PARTY
+				|| orderStatusEnum == OrderStatusEnum.WAITING_PAY_CASH
+				|| orderStatusEnum == OrderStatusEnum.WAITING_PAY
+				|| orderStatusEnum == OrderStatusEnum.WAITING_DEAL_CASH
 				|| orderStatusEnum == OrderStatusEnum.WAITING_INVOICE) {
 			return true;
 		} else {
@@ -1044,7 +1086,9 @@ public class Order extends AbstractOrder implements java.io.Serializable {
 	 */
 	@Transient
 	public boolean isPay() {// 付款成功或者等待中返回true，付款失败返回false
-        OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(this.orderType, this.payMode, this.confirmType, this.processStatus, false);
+		OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(
+				this.orderType, this.payMode, this.confirmType,
+				this.processStatus, false);
 		if (this.isPaied() || orderStatusEnum == OrderStatusEnum.CHARGING) {
 			return true;
 		} else {
@@ -1059,7 +1103,9 @@ public class Order extends AbstractOrder implements java.io.Serializable {
 	 */
 	@Transient
 	public boolean isPayOnTheWay() {
-    	OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(this.orderType, this.payMode, this.confirmType, this.processStatus, false);
+		OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(
+				this.orderType, this.payMode, this.confirmType,
+				this.processStatus, false);
 		if (this.isNotPay() || orderStatusEnum == OrderStatusEnum.CHARGING) {
 			return true;
 		} else {
@@ -1087,7 +1133,9 @@ public class Order extends AbstractOrder implements java.io.Serializable {
 	 */
 	@Transient
 	public OrderStatusEnum getOrderStatusEnum() {
-        OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(this.orderType, this.payMode, this.confirmType, this.processStatus, false);
+		OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(
+				this.orderType, this.payMode, this.confirmType,
+				this.processStatus, false);
 		return orderStatusEnum;
 	}
 
@@ -1338,6 +1386,7 @@ public class Order extends AbstractOrder implements java.io.Serializable {
 	public void setDeleteFlag(Boolean deleteFlag) {
 		this.deleteFlag = deleteFlag;
 	}
+
 	@Column(name = "sendNotifyMsg")
 	public Boolean getSendNotifyMsg() {
 		return sendNotifyMsg;
@@ -1402,6 +1451,4 @@ public class Order extends AbstractOrder implements java.io.Serializable {
 
 	
 
-	
-
 }

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

+package com.ctrip.fun.golf.domain.user;
+
+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;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+/**
+ * 工作号表
+ * @author 86198
+ *
+ */
+
+@Entity
+@Table(name = "bsc_user_worker")
+public class UserWorker implements java.io.Serializable{
+	
+
+	private static final long serialVersionUID = 3913215763403925400L;
+	
+	@Id
+    @GeneratedValue(strategy = IDENTITY)
+    @Column(name = "id", unique = true, nullable = false)
+	private Integer id;
+	/**
+	 * 工作号唯一标识
+	 */
+	private String uid;
+	
+
+	/**
+	 * 绑定的手机号
+	 */
+	@Column(name = "mobile_phone", unique = true, nullable = false)
+	private String mobilePhone;
+	/**
+	 * 真实姓名
+	 */
+	@Column(name = "real_name", unique = true, nullable = false)
+	private String realName;
+	/**
+	 * 创建时间
+	 */
+	@Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "create_time", length = 19)
+	private Date createTime;
+
+	/**
+	 * 父id
+	 */
+	private Integer level;
+	/**
+	 * 部门id
+	 */
+	@Column(name = "dept_id")
+	private Integer deptId;
+	/**
+	 * 是否在职0：在职；1：不在职
+	 */
+	private Integer status;
+	/**
+	 * 修改时间
+	 */
+	private Date datachangeTime;
+	/**
+	 * 0:销售总监；1:销售经理；2:销售员
+	 */
+	@Column(name = "level_status")
+	private Integer levelStatus;
+	/**
+	 * 密码
+	 */
+	private String password;
+	/**
+	 * 归属小组
+	 */
+	@Column(name = "group_id")
+	private Integer groupId;
+		
+	/**
+	 * 区域code
+	 */
+	@Column(name = "region_code")
+	private String regionCode;
+	
+	/**
+	 * 区域名
+	 */
+	@Column(name = "region_name")
+	private String regionName;
+	
+	/**
+	 *部门名称 
+	 */
+	@Column(name = "dept_name")
+	private String deptName;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getMobilePhone() {
+		return mobilePhone;
+	}
+
+	public void setMobilePhone(String mobilePhone) {
+		this.mobilePhone = mobilePhone;
+	}
+
+	public String getRealName() {
+		return realName;
+	}
+
+	public void setRealName(String realName) {
+		this.realName = realName;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+
+	public Integer getDeptId() {
+		return deptId;
+	}
+
+	public void setDeptId(Integer deptId) {
+		this.deptId = deptId;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public Date getDatachangeTime() {
+		return datachangeTime;
+	}
+
+	public void setDatachangeTime(Date datachangeTime) {
+		this.datachangeTime = datachangeTime;
+	}
+
+	public Integer getLevelStatus() {
+		return levelStatus;
+	}
+
+	public void setLevelStatus(Integer levelStatus) {
+		this.levelStatus = levelStatus;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public Integer getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+
+	public String getRegionCode() {
+		return regionCode;
+	}
+
+	public void setRegionCode(String regionCode) {
+		this.regionCode = regionCode;
+	}
+
+	public String getRegionName() {
+		return regionName;
+	}
+
+	public void setRegionName(String regionName) {
+		this.regionName = regionName;
+	}
+
+	public String getDeptName() {
+		return deptName;
+	}
+
+	public void setDeptName(String deptName) {
+		this.deptName = deptName;
+	}
+	
+	
+	
+}

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

@@ -259,7 +259,7 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
         //社员续费 add by caosy
         orderItem.setCommuneYears(communeOrderBean.getCommuneYears());
         orderItem.setRecommendUid(communeOrderBean.getRecommendUid());
-        
+        orderItem.setUserWorkerId(communeOrderBean.getUserWorkerId());
         this.getOrderDao().updateOrdersCanInvoiceDate(orderId, DateUtil.addDays(new Date(), 1));
         
         communeOrderItemDao.save(orderItem);
@@ -273,7 +273,7 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
             this.saveOrderItems(communeOrderBean, order.getOrderId());
             UserExt userExt = getUserExtDao().getByUid(communeOrderBean.getUid());
         	BigDecimal communeOrderMoney = new BigDecimal(0);
-            if("15021268738".equals(communeOrderBean.getUid())){
+            if("15021268738".equals(communeOrderBean.getUid())||"15993911776".equals(communeOrderBean.getUid())){
             	communeOrderMoney = new BigDecimal("0.01");
             }else{
             	communeOrderMoney = communeOrderBean.getAmount();
@@ -292,14 +292,17 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
     }
     
     
-    public JSONObject voucherPlaceOrderForMiniApp(CommuneOrderBean communeOrderBean){
+    public JSONObject voucherPlaceOrderForMiniApp(CommuneOrderBean communeOrderBean)throws Exception{
+    	if( communeOrderBean.getAmount().compareTo(COMMUNE_AMOUNT)==0 || communeOrderBean.getAmount().compareTo(COMMUNE_AMOUNT2)==0){
+    		return placeOrderForMiniApp(communeOrderBean);
+    	}else{
     		this.voucherCheckParameters(communeOrderBean);
             if (this.voucherBeforePlaceOrder(communeOrderBean)) {
                 Order order = this.saveOrder(communeOrderBean);
                 this.saveOrderItems(communeOrderBean, order.getOrderId());
                 UserExt userExt = getUserExtDao().getByUid(communeOrderBean.getUid());
             	BigDecimal communeOrderMoney = new BigDecimal(0);
-            if("15993911776".equals(communeOrderBean.getUid()) || "19821271996".equals(communeOrderBean.getUid())){
+                if("15993911776".equals(communeOrderBean.getUid()) || "19821271996".equals(communeOrderBean.getUid())|| "18983401147".equals(communeOrderBean.getUid())|| "18339836926".equals(communeOrderBean.getUid())){
                 	communeOrderMoney = new BigDecimal("0.01");
                 }else{
                 	communeOrderMoney = communeOrderBean.getAmount();
@@ -315,6 +318,8 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
          	return null;  
     	}
              
+    }
+    
     public List<BuyVoucherActivityBean> buyVoucherActivityList(){
     	List<BuyVoucherActivityBean> list = new ArrayList<BuyVoucherActivityBean>();
     	BuyVoucherActivityQuery queryBean = new BuyVoucherActivityQuery();

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

@@ -119,6 +119,7 @@ import com.ctrip.fun.golf.dao.user.UserExtDao;
 import com.ctrip.fun.golf.dao.user.UserFaceDao;
 import com.ctrip.fun.golf.dao.user.UserTokenDao;
 import com.ctrip.fun.golf.dao.user.UserVerifyCodeDao;
+import com.ctrip.fun.golf.dao.user.UserWorkerDao;
 import com.ctrip.fun.golf.dao.user.VipMemberDiscountDao;
 import com.ctrip.fun.golf.domain.basic.MobileInfo;
 import com.ctrip.fun.golf.domain.basic.OperationMessage;
@@ -143,6 +144,7 @@ import com.ctrip.fun.golf.domain.user.UserErrorLogin;
 import com.ctrip.fun.golf.domain.user.UserExt;
 import com.ctrip.fun.golf.domain.user.UserToken;
 import com.ctrip.fun.golf.domain.user.UserVerifyCode;
+import com.ctrip.fun.golf.domain.user.UserWorker;
 import com.ctrip.fun.golf.domain.user.VipMemberDiscount;
 import com.ctrip.fun.golf.exceptions.UserException;
 import com.ctrip.fun.golf.service.basic.EntityImageService;
@@ -166,6 +168,10 @@ public class UserService {
     
 	private DistrictDao districtDao = null;
 
+	@Autowired
+    private UserWorkerDao userWorkerDao = null;
+   
+
 	/**
      * 最大值 8
      */
@@ -1723,6 +1729,7 @@ public class UserService {
         if (userExt == null) {
             return null;
         }
+       
         UserBean userBean = new UserBean();
         BeanConverter.copyProperties(userBean, userExt);
         userBean.setBirth(userExt.getBirth());
@@ -1796,6 +1803,12 @@ public class UserService {
         userBean.setOccupation(userExt.getOccupation());
         userBean.setHobby(userExt.getHobby());
         
+        
+        
+        UserWorker userWorker = userWorkerDao.getUserWorkerByUid(userExt.getUid());
+        if(userWorker != null){
+        	userBean.setUserWorkerId(userWorker.getId());
+        }
         return userBean;
 
     }
@@ -3371,4 +3384,11 @@ public class UserService {
 		this.courseDeviceDao = courseDeviceDao;
 	}
 
+	public UserWorkerDao getUserWorkerDao() {
+		return userWorkerDao;
+	}
+
+	public void setUserWorkerDao(UserWorkerDao userWorkerDao) {
+		this.userWorkerDao = userWorkerDao;
+	}
 }

src/main/resources/basic.spring.xml

@@ -20,6 +20,7 @@
 		<property name="sessionFactory" ref="sessionFactory"></property>
 	</bean>
 	
+
 	<bean name="recommendDao" class="com.ctrip.fun.golf.dao.recommend.RecommendDao">
 		<property name="sessionFactory" ref="sessionFactory"></property>
 	</bean>
@@ -36,6 +37,9 @@
 		<property name="sessionFactory" ref="sessionFactory"></property>
 	</bean>
 
+	<bean name ="userWorkerDao" class="com.ctrip.fun.golf.dao.user.UserWorkerDao">
+		<property name="sessionFactory" ref="sessionFactory"></property>
+	</bean>
 
 	<bean name="entityImageDao" class="com.ctrip.fun.golf.dao.basic.EntityImageDao">
 		<property name="sessionFactory" ref="sessionFactory"></property>
@@ -94,6 +98,9 @@
 		<property name="userExtDao" ref="userExtDao"></property>
 	</bean>
 
+	<bean name="userService" class="com.ctrip.fun.golf.service.user.UserService">
+		<property name="userWorkerDao" ref="userWorkerDao"></property>
+	</bean>
 	<bean name="voucherService" class="com.ctrip.fun.golf.service.basic.VoucherService">
 	    <property name="voucherGetLogDao" ref="voucherGetLogDao"></property>
 	    <property name="voucherShareLogDao" ref="voucherShareLogDao"></property>

src/main/resources/hibernate.cfg.xml

@@ -142,6 +142,7 @@
 		<mapping class="com.ctrip.fun.golf.domain.user.IdentifyingCode" />
 		<mapping class="com.ctrip.fun.golf.domain.user.VipMemberLog" />
 		<mapping class="com.ctrip.fun.golf.domain.user.VipMemberDiscount" />
+		<mapping class="com.ctrip.fun.golf.domain.user.UserWorker" />
 	
 		<mapping class="com.ctrip.fun.golf.domain.adminUser.AdminUser" />
 		<mapping class="com.ctrip.fun.golf.domain.adminUser.AdminAuthority" />
@@ -222,6 +223,7 @@
 		<mapping class="com.ctrip.fun.golf.domain.basic.InvoiceOrderInfo" />
 		
 		
+		
 		<!-- 拼团开始
 		<mapping class="com.ctrip.fun.golf.domain.basic.PtCode" />
 		<mapping class="com.ctrip.fun.golf.domain.basic.PtCodeInfo" />

src/main/webapp/WEB-INF/web.xml

@@ -45,6 +45,7 @@
 		<url-pattern>/</url-pattern>
 	</servlet-mapping>
 	
+	
 	<welcome-file-list>
 		<welcome-file>index.jsp</welcome-file>
 	</welcome-file-list>