退单

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

@@ -4,6 +4,9 @@
 package com.ctrip.fun.golf.api.order;
 package com.ctrip.fun.golf.api.order;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 import org.slf4j.Logger;
 import org.slf4j.Logger;
@@ -98,6 +101,30 @@ public abstract class AbstractOpOrderController<H extends AbstractOrderProcessBe
         Integer orderId = request.getBody();
         Integer orderId = request.getBody();
         Response<T> response = new Response<T>();
         Response<T> response = new Response<T>();
         T orderBean = (T) this.getOpOrderService().getOrderDtail(orderId);
         T orderBean = (T) this.getOpOrderService().getOrderDtail(orderId);
+        // 判断订单退款是否显示
+        SimpleDateFormat formatt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date day = new Date();
+        Calendar rightNow = Calendar.getInstance();
+        rightNow.setTime(day);
+        rightNow.add(Calendar.MONTH,-3);
+        //订场
+        if(orderBean.getOrderCategory() == 1){
+        	if(orderBean.getPlayDate().compareTo(rightNow.getTime())<0){
+            	orderBean.setCanRefund(1);
+            }else{
+            	orderBean.setCanRefund(2);
+            }
+        }
+        
+        if(orderBean.getOrderCategory() == 14){
+        	if(orderBean.getPlayDate().compareTo(rightNow.getTime())<0){
+            	orderBean.setCanRefund(1);
+            }else{
+            	orderBean.setCanRefund(2);
+            }
+        }
+        
+        
         response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
         response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
         response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
         response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
         response.setBody(orderBean);
         response.setBody(orderBean);

src/main/java/com/ctrip/fun/golf/domain/product/BuyVoucherActivity.java

@@ -245,7 +245,7 @@ public class BuyVoucherActivity implements java.io.Serializable {
 	public void setGrossPrice(BigDecimal grossPrice) {
 	public void setGrossPrice(BigDecimal grossPrice) {
 		this.grossPrice = grossPrice;
 		this.grossPrice = grossPrice;
 	}
 	}
-	
+	@Column(name = "regionCode")
 	public String getRegionCode() {
 	public String getRegionCode() {
 		return regionCode;
 		return regionCode;
 	}
 	}