显示端

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

@@ -56,6 +56,9 @@ public class BuyVoucherActivityDao extends GenericHibernateDao<BuyVoucherActivit
         if (null != queryBean.getVoucherType()&& !"".equals(queryBean.getVoucherType()) && 0 != queryBean.getVoucherType()) {
             criteria.add(Restrictions.eq("voucherType", queryBean.getVoucherType()));
         } 
+        if (null != queryBean.getShowPaths()&& !"".equals(queryBean.getShowPaths()) && 0 != queryBean.getShowPaths()) {
+            criteria.add(Restrictions.eq("showPaths", queryBean.getShowPaths()));
+        } 
         criteria.setFirstResult(queryBean.getPagerOffset());
         criteria.setMaxResults(queryBean.getPagerPerPage());
         if (queryBean.getSortDirection().equals(SortDirectionEnum.ASC)) {

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

@@ -50,7 +50,7 @@ public class BuyVoucherActivity implements java.io.Serializable {
 	private BigDecimal grossPrice;// 毛利价
 	private String regionCode;  //区域   0-全区域,100-上海 ，110-广州，120-北京
 	private Integer voucherType;//卷类型 1 -正常卷 2-体验卷需要身份证
-	
+	private Integer showPaths; //显示途径  1-App 2-小程序 3-全部
 	
 
 	@Id
@@ -265,4 +265,13 @@ public class BuyVoucherActivity implements java.io.Serializable {
 	public void setVoucherType(Integer voucherType) {
 		this.voucherType = voucherType;
 	}
+	
+	@Column(name = "showPaths")
+	public Integer getShowPaths() {
+		return showPaths;
+	}
+
+	public void setShowPaths(Integer showPaths) {
+		this.showPaths = showPaths;
+	}
 }

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

@@ -53,6 +53,36 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
     private MallMerchantDao mallMerchantDao = null;
     private VoucherDao voucherDao = null;
     
+    
+    /**
+     * 发送赛事活动订单的短信
+     */
+    public void executeSendMessageOfEventActivityOrderToUser(Order order, int messageId) {
+        List<EventActivityOrderItem> orderItems = this.getEventActivityOrderItemDao().getOrderItemByOrderId(order.getOrderId());
+        String message = null;
+        if (orderItems != null && orderItems.size() >= 0) {
+            OperationMessage operationMessage = this.getOperationMessageDao().findById(messageId);
+            message = operationMessage.getMessage();            
+        	message = message.replace("[OrderNo]", order.getOrderNo() + "").replace("[PlayDate]", DateUtil.getDateStrC(orderItems.get(0).getPlayDate()));
+            message = message.replace("[PlayTime]", orderItems.get(0).getStartTime());
+            message = message.replace("[ProductName]", orderItems.get(0).getProductName());
+            message = message.replace("[Quantity]", orderItems.get(0).getQuantity() + "");
+            if (messageId == 102) {
+                if (operationMessage != null) {
+                    message = message.replace("[TotalAmount]", order.getTotalAmount().toPlainString());
+                    message = message.replace("[RefundAmount]", order.getLaunchRefundAmount().toPlainString());
+                }
+            }            
+        }
+        if (message != null) {
+            Sms sms = new Sms();
+            sms.setMessage(message);
+            sms.setStatus(SmsStatus.NO_SEND.getKey());
+            sms.setMessageId(System.currentTimeMillis());
+            sms.setMobileNo(order.getContactTel());   
+            this.getSmsDao().save(sms);
+        }
+    }
 
     /**
      * 体验卷发往球场

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

@@ -326,7 +326,6 @@ public class EventActivityOrderService extends
 	    		Voucher voucher = this.getVoucherDao().findById(Integer.parseInt(usedVoucherId));
 	    		if(voucher.getVoucherType() == 2){
 	        		this.sendMessage(order, 120);
-	        		this.sendMessage(order, 100);
 	        	} 
         	}
         }
@@ -345,6 +344,7 @@ public class EventActivityOrderService extends
     	}else{
     		// 发往球场 
     		operationMessageService.executeSendMessageOfCourseOrderToCourt(order, messageId);
+    		operationMessageService.executeSendMessageOfEventActivityOrderToUser(order,100);
     	}
         
     }