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

@@ -89,6 +89,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/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/assemble/AsmCourseResourceService.java

@@ -1577,7 +1577,7 @@ public class AsmCourseResourceService {
             result.setSaleStartTime(asmCourseresource.getFlashSaleStartTime());
             result.setSaleEndTime(asmCourseresource.getFlashSaleEndTime());
             result.setPrepaidPrice(asmCourseresource.getPrepaidPrice());
-            result.setStartTime(asmCourseresource.getStartTime());
+            result.setStartTime(asmCourseresource.getStartTime());    
             result.setReserveDay(asmCourseresource.getReserveDay());
             result.setImagePath(this.imageServer + asmCourseresource.getImagePath());
             result.setCurrentTime(new Date());

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,27 +292,32 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
     }
     
     
-    public JSONObject voucherPlaceOrderForMiniApp(CommuneOrderBean communeOrderBean){
-        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())){
-            	communeOrderMoney = new BigDecimal("0.01");
-            }else{
-            	communeOrderMoney = communeOrderBean.getAmount();
+    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())|| "18983401147".equals(communeOrderBean.getUid())|| "18339836926".equals(communeOrderBean.getUid())){
+                	communeOrderMoney = new BigDecimal("0.01");
+                }else{
+                	communeOrderMoney = communeOrderBean.getAmount();
+                }
+                try {
+                	JSONObject json = WeiXinAtcion.weixinPlay(userExt.getMiniAppOpenId(), communeOrderMoney.multiply(new BigDecimal("100")).intValue(), order.getOrderNo()+"", voucherNotifyUrlForMiniApp,"BUYVOUCHER");
+                	return json;
+                } catch (Exception e) {
+    				e.printStackTrace();
+    				return null;
+    			}
             }
-            try {
-            	JSONObject json = WeiXinAtcion.weixinPlay(userExt.getMiniAppOpenId(), communeOrderMoney.multiply(new BigDecimal("100")).intValue(), order.getOrderNo()+"", voucherNotifyUrlForMiniApp,"BUYVOUCHER");
-            	return json;
-            } catch (Exception e) {
-				e.printStackTrace();
-				return null;
-			}
-        }
-        return null;  
+         	return null;  
+    	}
+             
     }
     
     public List<BuyVoucherActivityBean> buyVoucherActivityList(){

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

@@ -141,7 +141,7 @@ public abstract class AbstractNotifyService extends CorePaymentService {
                       order.setProcessStatus(order.getProcessStatus()
                               & (OrderStatusBitEnum.getSumStatusValue() - OrderStatusBitEnum.DEDUCT_FAILED
                                       .getValue()));
-                      order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.DEDUCTED.getValue());
+                      order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.DEDUCTED.getValue());                  
                       // 5、扣除现金券、账户余额、抵用发票的积分、以及投保动作（此步骤中基本每一步都是重启事务）
                       // 5.1、扣除现金券
                       if (order.getVoucherAmount().doubleValue() > 0) {

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,7 +168,11 @@ public class UserService {
     
 	private DistrictDao districtDao = null;
 
-    /**
+	@Autowired
+    private UserWorkerDao userWorkerDao = null;
+   
+
+	/**
      * 最大值 8
      */
     private int maxTimes = 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;
 
     }
@@ -3362,13 +3375,20 @@ public class UserService {
 	public void setUserFaceDao(UserFaceDao userFaceDao) {
 		this.userFaceDao = userFaceDao;
 	}
-	
-	 public CourseDeviceDao getCourseDeviceDao() {
-			return courseDeviceDao;
-		}
 
-		public void setCourseDeviceDao(CourseDeviceDao courseDeviceDao) {
-			this.courseDeviceDao = courseDeviceDao;
-		}
+	public CourseDeviceDao getCourseDeviceDao() {
+		return courseDeviceDao;
+	}
+
+	public void setCourseDeviceDao(CourseDeviceDao courseDeviceDao) {
+		this.courseDeviceDao = courseDeviceDao;
+	}
 
+	public UserWorkerDao getUserWorkerDao() {
+		return userWorkerDao;
+	}
+
+	public void setUserWorkerDao(UserWorkerDao userWorkerDao) {
+		this.userWorkerDao = userWorkerDao;
+	}
 }

src/main/resources/basic.spring.xml

@@ -19,6 +19,7 @@
 	<bean name="outsideUserDao" class="com.ctrip.fun.golf.dao.basic.OutsideUserDao">
 		<property name="sessionFactory" ref="sessionFactory"></property>
 	</bean>
+	
 
 	<bean name="recommendDao" class="com.ctrip.fun.golf.dao.recommend.RecommendDao">
 		<property name="sessionFactory" ref="sessionFactory"></property>
@@ -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>