Merge branch 'f-6.6.7' of 192.168.10.6:caosy/fun-golf-service into f-6.6.7

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

 package com.ctrip.fun.golf.api.order;
 
 import java.io.Serializable;
+import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -16,6 +17,8 @@ import com.ctrip.fun.common.vo.order.EventActivityOrderListBean;
 import com.ctrip.fun.common.vo.order.EventActivityOrderListExcelBean;
 import com.ctrip.fun.common.vo.order.EventActivityOrderProcessBean;
 import com.ctrip.fun.common.vo.order.OpEventActivityOrderBean;
+import com.ctrip.fun.common.vo.order.OpOrderQuery;
+import com.ctrip.fun.common.vo.product.CourseResourceBean;
 import com.ctrip.fun.golf.service.order.AbstractOpOrderService;
 import com.ctrip.fun.golf.service.order.OpEventActivityOrderService;
 
@@ -57,7 +60,7 @@ public class OpEventActivityOrderController extends
      */
     @ResponseBody
     @RequestMapping(value = "/confirmEventActivityOrderResourceTeeTime", method = RequestMethod.POST)
-    public Response<Serializable> confirmEventActivityOrderResourceTeeTime(@RequestBody Request<EventActivityOrderProcessBean> request) {
+    public Response<Serializable> confirmEventActivityOrderResourceTeeTime(@RequestBody Request<EventActivityOrderProcessBean> request ) {
         EventActivityOrderProcessBean orderProcessBean = request.getBody();
         opEventActivityOrderService.confirmEventActivityOrderResourceTeeTime(orderProcessBean);
         Response<Serializable> response = new Response<Serializable>();
@@ -65,5 +68,23 @@ public class OpEventActivityOrderController extends
         response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
         return response;
     }
+    
+    /**
+     * 后台为客户调整订单teeTime时加载当日所有可用资源的teeTime和库存信息
+     * 
+     * @param request
+     * @return Response<Serializable> Response<Serializable>
+     */
+    @ResponseBody
+    @RequestMapping(value = "/loadPlayDateEventActivityResource", method = RequestMethod.POST)
+    public Response<List<CourseResourceBean>> loadPlayDateEventActivityResource(@RequestBody Request<OpEventActivityOrderBean> request) {
+    	OpEventActivityOrderBean OpEventActivityOrderBean = request.getBody();
+    	List<CourseResourceBean> list = opEventActivityOrderService.loadPlayDateEventActivityResource(OpEventActivityOrderBean.getProductId(),OpEventActivityOrderBean.getPlayDate());
+        Response<List<CourseResourceBean>> response = new Response<List<CourseResourceBean>>();
+        response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
+        response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
+        response.setBody(list);
+        return response;
+    }
 
 }

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

@@ -47,6 +47,8 @@ public class OrderExcelDao extends GenericHibernateDao<OrderListExcel, Integer>
             + ",od.finComment"
             + ",od.prePayCardAmount"
             + ",od.voucherAmount"
+            + ",od.voucherRefundAmount"
+            + ",od.prePayCardRefundAmount"
             + ",od.refundAmount"
             + ",od.outTradeId"
             + ",od.offlinePayType"

src/main/java/com/ctrip/fun/golf/dao/product/CourseResourceDao.java

 package com.ctrip.fun.golf.dao.product;
 
+import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.hibernate.Criteria;
 import org.hibernate.Query;
@@ -13,11 +16,16 @@ import org.hibernate.criterion.MatchMode;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
+import org.hibernate.transform.Transformers;
 
+import com.ctrip.fun.common.core.util.BeanConverter;
 import com.ctrip.fun.common.core.util.DateUtil;
 import com.ctrip.fun.common.core.util.StringUtils;
+import com.ctrip.fun.common.vo.PagedResponseBean;
 import com.ctrip.fun.common.vo.SortDirectionEnum;
+import com.ctrip.fun.common.vo.order.EventActivityOrderListBean;
 import com.ctrip.fun.common.vo.product.CourseResourceBatchBean;
+import com.ctrip.fun.common.vo.product.CourseResourceBean;
 import com.ctrip.fun.common.vo.product.CourseResourcePaymentBean;
 import com.ctrip.fun.common.vo.product.CourseResourceQuery;
 import com.ctrip.fun.common.vo.product.CourseResourceStatusBean;
@@ -211,10 +219,43 @@ public class CourseResourceDao extends GenericHibernateDao<CourseResource, Integ
     			+ productId + " and cr.teeTime="+teetime
     			+ " and cr.status != "
     			+ CourseResourceStatusEnum.INVALID.getValue()
-    			+ " and cr.id = rp.ResourceID " + " and rp.priceDate = \"" + dateStr + "\"" + " and rp.communePrice="+communePrice+" and rp.communeGuestPrice="+guestPrice;
+    			+ " and cr.id = rp.ResourceID " + " and rp.priceDate = \'" + dateStr + "\'" + " and rp.communePrice="+communePrice+" and rp.communeGuestPrice="+guestPrice;
     	List<Integer> list = this.getSession().createSQLQuery(sql).list();
     	return list;
     }
+    
+    
+    public List<CourseResourceBean> loadPlayDateEventActivityResource(int productId, Date playDate) {
+    	String dateStr = DateUtil.getDateStr(playDate);
+    	String sql = "SELECT cr.id id,cr.teeTime,ri.Size inventorySize,ri.Used usedInventory FROM prd_courseResource cr LEFT JOIN prd_resourceprice rp ON cr.id = rp.ResourceID LEFT JOIN prd_resourceinventory ri ON rp.ResourceID = ri.ResourceID"
+    			+ " WHERE cr. STATUS != 9 AND ri.ResourceCategory = \'1\' AND cr.ProductID = \'" + productId +"\'"+"AND rp.priceDate = \'"+dateStr+"\'"
+    			+ "AND ri.TheDate = \'" + dateStr + "\'";
+    	
+    	Session session = this.getSession();
+    	Query query = session.createSQLQuery(sql);
+    	query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
+    	List<Map<String, Object>> list = query.list();	
+        List<CourseResourceBean> result = new ArrayList<CourseResourceBean>();
+        if (list != null) {
+            for (Map<String, Object> map : list) {
+            	CourseResourceBean courseResourceBean = new CourseResourceBean();
+                BeanConverter.populate(courseResourceBean, map);
+                result.add(courseResourceBean);
+            }
+        }
+    	return result;
+    }
+    
+
+/*
+ SELECT cr.id,ri.Size,ri.Used FROM prd_courseResource cr LEFT JOIN prd_resourceprice rp ON cr.id = rp.ResourceID LEFT JOIN prd_resourceinventory ri ON rp.ResourceID = ri.ResourceID
+WHERE
+	cr. STATUS != 9
+AND ri.ResourceCategory = '1'
+AND cr.ProductID = '2959'
+AND rp.priceDate = '2018-05-12'
+AND ri.TheDate='2018-05-12'
+    */
 
     public List<ResourcePriceUnion> queryResourcePriceUnionByProductId(int productId, Date date) {
         String dateStr = DateUtil.getDateStr(date);

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

@@ -130,9 +130,17 @@ public class OrderListExcel {
     private BigDecimal voucherAmount;
 
     /**
-     * 退款金额
+     * 在线支付退款金额
      */
     private BigDecimal refundAmount;
+    /**
+     * 优惠券退款金额
+     */
+    private BigDecimal voucherRefundAmount;
+    /**
+     * 余额退款金额
+     */
+    private BigDecimal prePayCardRefundAmount;
 
     /**
      * 预存款金额
@@ -658,6 +666,22 @@ public class OrderListExcel {
 		this.channel2 = channel2;
 	}
 
+	public BigDecimal getVoucherRefundAmount() {
+		return voucherRefundAmount;
+	}
+
+	public void setVoucherRefundAmount(BigDecimal voucherRefundAmount) {
+		this.voucherRefundAmount = voucherRefundAmount;
+	}
+
+	public BigDecimal getPrePayCardRefundAmount() {
+		return prePayCardRefundAmount;
+	}
+
+	public void setPrePayCardRefundAmount(BigDecimal prePayCardRefundAmount) {
+		this.prePayCardRefundAmount = prePayCardRefundAmount;
+	}
+
     
     
 

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

@@ -1082,6 +1082,8 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
         bean.setVoucherAmount(xsl.getVoucherAmount());
         bean.setFinComment(xsl.getFinComment());
         bean.setRefundAmount(xsl.getRefundAmount());
+        bean.setPrePayCardRefundAmount(xsl.getPrePayCardRefundAmount());
+        bean.setVoucherRefundAmount(xsl.getVoucherRefundAmount());
         bean.setDepositAmount(xsl.getDepositAmount());
         bean.setQuantity(xsl.getQuantity());
         bean.setOutTradeId(xsl.getOutTradeId());

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

@@ -41,6 +41,7 @@ import com.ctrip.fun.common.vo.order.OrderStatusEnum;
 import com.ctrip.fun.common.vo.order.PrepayAmtOperateTypeEnum;
 import com.ctrip.fun.common.vo.payment.PayOrderOperateResponseBean;
 import com.ctrip.fun.common.vo.payment.PaymentOperateBean;
+import com.ctrip.fun.common.vo.product.CourseResourceBean;
 import com.ctrip.fun.common.vo.product.ProductPaymentTypeEnum;
 import com.ctrip.fun.common.vo.product.ResourceCategoryEnum;
 import com.ctrip.fun.common.vo.product.ResourceInventoryQuery;
@@ -75,12 +76,10 @@ import com.ctrip.fun.golf.domain.order.EventActivityOrderListExcel;
 import com.ctrip.fun.golf.domain.order.Invoiceinfo;
 import com.ctrip.fun.golf.domain.order.Order;
 import com.ctrip.fun.golf.domain.order.OrderAssignment;
-import com.ctrip.fun.golf.domain.order.OrderItem;
 import com.ctrip.fun.golf.domain.order.OrderPayinfo;
 import com.ctrip.fun.golf.domain.order.OrderProcessLog;
 import com.ctrip.fun.golf.domain.product.CourseProduct;
 import com.ctrip.fun.golf.domain.product.CourseResource;
-import com.ctrip.fun.golf.domain.product.ResourceInventory;
 import com.ctrip.fun.golf.domain.product.ResourcePrice;
 import com.ctrip.fun.golf.domain.user.UserExt;
 import com.ctrip.fun.golf.exceptions.OrderException;
@@ -125,6 +124,8 @@ public class OpEventActivityOrderService
     private ResourcePriceDao resourcePriceDao = null;
 
     private AsmCourseResourceDao asmCourseResourceDao = null;
+    
+    private CourseResourceDao courseResourceDao = null;
 
     private ResourceOpInfoDao resourceOpInfoDao = null;
 
@@ -1052,8 +1053,16 @@ public class OpEventActivityOrderService
     public void setAsmCourseResourceDao(AsmCourseResourceDao asmCourseResourceDao) {
         this.asmCourseResourceDao = asmCourseResourceDao;
     }
+    
+    public CourseResourceDao getCourseResourceDao() {
+		return courseResourceDao;
+	}
+
+	public void setCourseResourceDao(CourseResourceDao courseResourceDao) {
+		this.courseResourceDao = courseResourceDao;
+	}
 
-    public ResourceOpInfoDao getResourceOpInfoDao() {
+	public ResourceOpInfoDao getResourceOpInfoDao() {
         return resourceOpInfoDao;
     }
 
@@ -1253,4 +1262,15 @@ public class OpEventActivityOrderService
     	this.changeResource(orderProcessBean);
     }
 
+    /**
+     * 后台为客户调整订单teeTime时加载当日所有可用资源的teeTime和库存信息
+     * @param productId
+     * @param playDate
+     * @return
+     */
+	public List<CourseResourceBean> loadPlayDateEventActivityResource(Integer productId, Date playDate) {
+		List<CourseResourceBean> list = courseResourceDao.loadPlayDateEventActivityResource(productId, playDate);
+		return list;
+	}
+
 }

src/main/resources/order.spring.xml

@@ -311,6 +311,7 @@
         <property name="asmCourseResourceDao" ref="asmCourseResourceDao"></property>
         <property name="resourceOpInfoDao" ref="resourceOpInfoDao"></property>
         <property name="courseProductDao" ref="courseProductDao"></property>
+        <property name="courseResourceDao" ref="courseResourceDao"></property>
         <property name="eventCustomerInfoService" ref="eventCustomerInfoService"></property>
     </bean>