球场短信

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

@@ -107,13 +107,8 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
 			Sms sms = new Sms();
 			sms.setMessage(message);
 			sms.setStatus(SmsStatus.NO_SEND.getKey());
-			sms.setMessageId(System.currentTimeMillis());
-			if(messageId != 120){
-				sms.setMobileNo(order.getContactTel());
-			}else{
-				sms.setMobileNo("19821271996");
-			}
-			
+			sms.setMessageId(System.currentTimeMillis());			
+			sms.setMobileNo(order.getContactTel());
 			this.getSmsDao().save(sms);
 		}
 	}
@@ -250,23 +245,45 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
         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(messageId != 120){
+            	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());
+                    }
+                }
+            }else{
+            	// 发球场
+            	System.out.println("发球场 ================>"+ "发球场");
+				String[] split = order.getVoucherIDList().split(",");
+				for (int i = 0; i < split.length; i++) {
+					System.out.println("split[i] ================>"+ split[i]);
+            		Voucher voucher = voucherDao.findById(Integer.valueOf(split[i]));
+            		System.out.println("voucher ================>"+ voucher);
+                	if(voucher.getVoucherType() == 2){
+                		message = message.replace("[realName]", voucher.getRealName() + "").replace("[PlayDate]", DateUtil.getDateStrC(orderItems.get(0).getPlayDate()));
+                		message = message.replace("[PlayTime]", orderItems.get(0).getStartTime());
+        				message = message.replace("[ProductName]", orderItems.get(0).getProductName());
+        				System.out.println("message ================>"+ message);
+                	} 
                 }
             }
+            
         }
         if (message != null) {
             Sms sms = new Sms();
             sms.setMessage(message);
             sms.setStatus(SmsStatus.NO_SEND.getKey());
             sms.setMessageId(System.currentTimeMillis());
-            sms.setMobileNo(order.getContactTel());
+            if(messageId == 120){
+            	sms.setMobileNo("19821271996");
+            }else{
+            	sms.setMobileNo(order.getContactTel());
+            }   
             this.getSmsDao().save(sms);
         }
     }

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

@@ -82,17 +82,16 @@ public class EventActivityNotifyService extends AbstractNotifyService {
     protected void doPaySuccess(Order order) {
         eventCustomerInfoService.updateEventCustomerInfosByOrderId(order.getOrderId(), true);
         this.sendMessage(order, 100);
-        if(order.getVoucherIDList() != null){
+        if(order.getVoucherIDList() != null && !("").equals(order.getVoucherIDList())){
         	System.out.println("order.getVoucherIDList() ================>"+ order.getVoucherIDList());
-        	String[] split = order.getVoucherIDList().split(",");
-        	for (int i = 0; i < split.length; i++) { 
-        		System.out.println("split[i] ================>"+ split[i]);
-        		Voucher voucher = voucherService.getVoucherById(Integer.valueOf(split[i]));
-        		System.out.println("voucher1 ================>"+ voucher);
-            	if(voucher.getVoucherType() == 2){
-            		this.sendMessage(order, 120);
-            	} 
-            }
+        	for(String usedVoucherId: order.getVoucherIDList().split(",")){
+	    		System.out.println("usedVoucherId ================>"+ usedVoucherId);
+	    		Voucher voucher = this.voucherService.getVoucherById(Integer.parseInt(usedVoucherId));
+	    		System.out.println("voucher ================>"+ voucher);
+	    		if(voucher.getVoucherType() == 2){
+	        		this.sendMessage(order, 120);
+	        	} 
+        	}
         }
     }
 
@@ -216,5 +215,13 @@ public class EventActivityNotifyService extends AbstractNotifyService {
     public void setEventCustomerInfoService(EventCustomerInfoService eventCustomerInfoService) {
         this.eventCustomerInfoService = eventCustomerInfoService;
     }
+    
+    public VoucherService getVoucherService() {
+        return voucherService;
+    }
+
+    public void setVoucherService(VoucherService voucherService) {
+        this.voucherService = voucherService;
+    }
 
 }