置换卷

src/main/java/com/ctrip/fun/golf/api/GenericController.java

@@ -78,5 +78,4 @@ public abstract class GenericController<S extends GenericService, VO, ID extends
     }
 
     public abstract S getEntityService();
-
 }

src/main/java/com/ctrip/fun/golf/api/basic/VoucherController.java

@@ -178,40 +178,43 @@ public class VoucherController {
     @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;
-    }
+//    @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
+//    @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/api/order/AbstractOpOrderController.java

@@ -106,7 +106,7 @@ public abstract class AbstractOpOrderController<H extends AbstractOrderProcessBe
         Date day = new Date();
         Calendar rightNow = Calendar.getInstance();
         rightNow.setTime(day);
-        rightNow.add(Calendar.MONTH,-1);
+        rightNow.add(Calendar.DAY_OF_MONTH,-1);
         //订场
         if(orderBean.getOrderCategory() == 1){
         	if(orderBean.getPlayDate().compareTo(rightNow.getTime())<0){

src/main/java/com/ctrip/fun/golf/service/basic/VoucherService.java

@@ -820,8 +820,7 @@ public class VoucherService {
 		 UserToken userToken = this.userTokenDao.getUserTokenByToken(queryBean.getToken(),
 	                TokenTypeEnum.ACCESS.getKey());
 	     queryBean.setUid(userToken.getUserId());
-	     PagedResponseBean<VoucherGiftVo> queryListForMiniApps = voucherGiftDao.getVoucherGiftList(queryBean);
-	     return queryListForMiniApps;
+	     return voucherGiftDao.getVoucherGiftList(queryBean);
 	}
 	
 	// 确认置换

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

@@ -15,6 +15,7 @@ import java.util.UUID;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -54,6 +55,7 @@ import com.ctrip.fun.golf.dao.order.InsuranceInfoDao;
 import com.ctrip.fun.golf.dao.order.InsuranceProcessDao;
 import com.ctrip.fun.golf.dao.order.InvoiceinfoDao;
 import com.ctrip.fun.golf.dao.user.UserExtDao;
+import com.ctrip.fun.golf.dao.user.UserWorkerDao;
 import com.ctrip.fun.golf.domain.basic.Voucher;
 import com.ctrip.fun.golf.domain.basic.VoucherRule;
 import com.ctrip.fun.golf.domain.order.CustomerInfo;
@@ -63,6 +65,7 @@ import com.ctrip.fun.golf.domain.order.Invoiceinfo;
 import com.ctrip.fun.golf.domain.order.Order;
 import com.ctrip.fun.golf.domain.payment.WeiXinAtcion;
 import com.ctrip.fun.golf.domain.user.UserExt;
+import com.ctrip.fun.golf.domain.user.UserWorker;
 import com.ctrip.fun.golf.exceptions.OrderException;
 import com.ctrip.fun.golf.service.basic.VoucherService;
 import com.ctrip.fun.golf.service.payment.OrderPaymentService;
@@ -102,6 +105,9 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
 
     private UserExtService userExtService = null;
     
+    @Autowired
+    private UserWorkerDao userWorkerDao = null;
+    
     /**
      * 980
      */
@@ -409,10 +415,13 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
      */
     public H getOrderDetail(OrderQuery orderQuery) {
         Order order = getOrderDao().getOrderByOrderNo(orderQuery.getOrderNo());
-        if (!orderQuery.getUid().trim().equals(order.getUid().trim())) {
-            throw new OrderException(-100, "获取订单详情失败");
+        UserWorker userWorker = userWorkerDao.getSalesByUid(orderQuery.getUid());
+        if(userWorker == null){
+        	 if (!orderQuery.getUid().trim().equals(order.getUid().trim())) {
+                 throw new OrderException(-100, "获取订单详情失败");
+             }
         }
-
+       
         H abstractOrderBean = this.getAbstractOrderBean();
         abstractOrderBean.setOrderCategory(order.getOrderCategory());
         abstractOrderBean.setOrderNo(order.getOrderNo());
@@ -696,16 +705,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
             	order.setIsConfirm(2);
             	
             	getOrderDao().update(order);
-            	if(order.getOrderCategory() == 1){
-            		// 单订
-            		this.sendMessage(order,5);
-            	}else if(order.getOrderCategory() == 3){
-            		// 套餐
-            		this.sendMessage(order,51);
-            	}else if(order.getOrderCategory() == 14){
-            		// 赛事
-            		this.sendMessage(order,5);
-            	}
+          
             }else{
             	throw new OrderException(-2, "该订单不能进行确认");
             }
@@ -1849,4 +1849,12 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
 	public void setVoucherService(VoucherService voucherService) {
 		this.voucherService = voucherService;
 	}
+	
+	public UserWorkerDao getUserWorkerDao() {
+		return userWorkerDao;
+	}
+
+	public void setUserWorkerDao(UserWorkerDao userWorkerDao) {
+		this.userWorkerDao = userWorkerDao;
+	}
 }

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

@@ -13,6 +13,7 @@ import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import com.ctrip.fun.common.core.util.BeanConverter;
 import com.ctrip.fun.common.core.util.DateUtil;
@@ -64,6 +65,7 @@ import com.ctrip.fun.golf.dao.product.CourseResourceDao;
 import com.ctrip.fun.golf.dao.product.FlashSaleDao;
 import com.ctrip.fun.golf.dao.product.ResourcePriceDao;
 import com.ctrip.fun.golf.dao.user.UserExtDao;
+import com.ctrip.fun.golf.dao.user.UserWorkerDao;
 import com.ctrip.fun.golf.dao.user.VipMemberDiscountDao;
 import com.ctrip.fun.golf.domain.advert.CampaignBill;
 import com.ctrip.fun.golf.domain.assemble.AsmCourseresource;
@@ -79,6 +81,7 @@ import com.ctrip.fun.golf.domain.product.CourseResource;
 import com.ctrip.fun.golf.domain.product.FlashSale;
 import com.ctrip.fun.golf.domain.product.ResourcePrice;
 import com.ctrip.fun.golf.domain.user.UserExt;
+import com.ctrip.fun.golf.domain.user.UserWorker;
 import com.ctrip.fun.golf.domain.user.VipMemberDiscount;
 import com.ctrip.fun.golf.exceptions.OrderException;
 import com.ctrip.fun.golf.service.basic.OperationMessageService;
@@ -154,6 +157,9 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
     private OperationMessageService operationMessageService;
     
     private VipMemberDiscountDao vipmemberDiscountDao;
+    
+    @Autowired
+    private UserWorkerDao userWorkerDao = null;
 
     public Order findByResourceId(String uid, int resourceId, Date playDate) {
         List<OrderItem> orderItemList = orderItemDao.queryOrderItemLastest(resourceId, playDate);
@@ -174,7 +180,13 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
         PagedResponseBean<CourseOrderListItemBean> pagedResponseBean = new PagedResponseBean<CourseOrderListItemBean>();
         pagedResponseBean.setCount(0);
         try {
-            PagedEntityBean<CourseOrderListItemBean> pagedEntityBean = this.getOrderDao().queryCourseOrders(orderQuery);
+        	PagedEntityBean<CourseOrderListItemBean> pagedEntityBean = null;
+        	if(orderQuery.getOrderType() == 0){
+        		pagedEntityBean = this.getOrderDao().queryCourseOrders(orderQuery);
+        	}else if(orderQuery.getOrderType() == -1){
+        		UserWorker userWorker = userWorkerDao.getSalesByUid(orderQuery.getUid());
+        		pagedEntityBean = this.getOrderDao().queryHoldOrders(orderQuery,userWorker.getId());
+        	}   
             Collection<CourseOrderListItemBean> orderList = pagedEntityBean.getResult();
             if (null != orderList) {
                 for (CourseOrderListItemBean item : orderList) {
@@ -1388,6 +1400,14 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
 		this.vipmemberDiscountDao = vipmemberDiscountDao;
 	}
 
+	public UserWorkerDao getUserWorkerDao() {
+		return userWorkerDao;
+	}
+
+	public void setUserWorkerDao(UserWorkerDao userWorkerDao) {
+		this.userWorkerDao = userWorkerDao;
+	}
+	
 	@Override
 	protected void checkVourcherConditionBean(
 			MultipleCourseConditionBean multipleCourseConditionBean,

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

@@ -1729,7 +1729,7 @@ public class UserService {
         if (userExt == null) {
             return null;
         }
-       
+    
         UserBean userBean = new UserBean();
         BeanConverter.copyProperties(userBean, userExt);
         userBean.setBirth(userExt.getBirth());
@@ -1753,7 +1753,7 @@ public class UserService {
         if (vipGrade == 0) {
             vipGrade = userExt.getVipGrade() & VipGradeEnum.VIP1.getKey();
         }
-        
+      
         userBean.setVipGrade(updateUserIdentity(userExt));
         userBean.setVipGradeName(VipGradeEnum.valueOf(vipGrade).getValue());
         userBean.setVipGradeImgUrl(this.imageServer + "VipGrade" + vipGrade + ".png");
@@ -1806,6 +1806,12 @@ public class UserService {
         if(userWorker != null){
         	userBean.setUserWorkerId(userWorker.getId());
         }
+        UserWorker sales = userWorkerDao.getSalesByUid(userExt.getUid());
+        if(sales != null ){
+        	userBean.setIsSales(1);
+        }else{
+        	userBean.setIsSales(0);
+        }
         return userBean;
 
     }

src/main/resources/order.spring.xml

@@ -119,6 +119,7 @@
 		<property name="insuranceProcessService" ref="insuranceProcessService"></property>
 		<property name="userExtService" ref="userExtService"></property>
 		<property name="voucherService" ref="voucherService"></property>
+		<property name="userWorkerDao" ref="userWorkerDao"></property>
 	</bean>
 
 	<bean name="courseOrderService" class="com.ctrip.fun.golf.service.order.CourseOrderService" parent="abstractOrderService">
@@ -143,6 +144,7 @@
 		<property name="courseBaseNotifyUrlForWeiXinPay" value="${payment.courseBaseNotifyUrlForWeiXinPay}"></property>
 		<property name="operationMessageService" ref="operationMessageService"></property>
 		<property name="vipmemberDiscountDao" ref="vipmemberDiscountDao"></property>
+		<property name="userWorkerDao" ref="userWorkerDao"></property>
 	</bean>
 
 	<bean name="eventActivityOrderService" class="com.ctrip.fun.golf.service.order.EventActivityOrderService" parent="abstractOrderService">