球场短信

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

@@ -62,46 +62,25 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
 		if (orderItems != null && orderItems.size() >= 0) {
 			OperationMessage operationMessage = this.getOperationMessageDao().findById(messageId);
 			message = operationMessage.getMessage();
-			if(messageId != 120){
-				message = message.replace("[OrderNo]", order.getOrderNo() + "").replace("[PlayDate]", DateUtil.getDateStrC(orderItems.get(0).getPlayDate()));
-				if (orderItems.get(0).getRealPlayTime() != null && !"".equals(orderItems.get(0).getRealPlayTime())) {
-					message = message.replace("[PlayTime]", orderItems.get(0).getRealPlayTime());
-				} else {
-					message = message.replace("[PlayTime]", DateUtil.int2TeeTime(Integer.parseInt(orderItems.get(0).getTeeTime())));
-				}
-				message = message.replace("[ProductName]", orderItems.get(0).getProductName());
-				message = message.replace("[Quantity]", orderItems.get(0).getQuantity() + "");
-				if (messageId == 6) {
-					if (operationMessage != null) {
+		
+			message = message.replace("[OrderNo]", order.getOrderNo() + "").replace("[PlayDate]", DateUtil.getDateStrC(orderItems.get(0).getPlayDate()));
+			if (orderItems.get(0).getRealPlayTime() != null && !"".equals(orderItems.get(0).getRealPlayTime())) {
+				message = message.replace("[PlayTime]", orderItems.get(0).getRealPlayTime());
+			} else {
+				message = message.replace("[PlayTime]", DateUtil.int2TeeTime(Integer.parseInt(orderItems.get(0).getTeeTime())));
+			}
+			message = message.replace("[ProductName]", orderItems.get(0).getProductName());
+			message = message.replace("[Quantity]", orderItems.get(0).getQuantity() + "");
+			if (messageId == 6) {
+				if (operationMessage != null) {
 //						message = message.replace("[TotalAmount]", order.getTotalAmount().toPlainString());
-						message = message.replace("[TotalAmount]", order.getTotalAmount().subtract(order.getVipmemberDiscount()).toPlainString());
-						message = message.replace("[RefundAmount]", order.getLaunchRefundAmount().toPlainString());
-					}
-				} else if (messageId == 7 || messageId == 5) {
-
+					message = message.replace("[TotalAmount]", order.getTotalAmount().subtract(order.getVipmemberDiscount()).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()));
-        				if (orderItems.get(0).getRealPlayTime() != null && !"".equals(orderItems.get(0).getRealPlayTime())) {
-        					message = message.replace("[PlayTime]", orderItems.get(0).getRealPlayTime());
-        				} else {
-        					message = message.replace("[PlayTime]", DateUtil.int2TeeTime(Integer.parseInt(orderItems.get(0).getTeeTime())));
-        				}
-        				message = message.replace("[ProductName]", orderItems.get(0).getProductName());
-        				System.out.println("message ================>"+ message);
-                	} 
-                }
-	
+			} else if (messageId == 7 || messageId == 5) {
+
 			}
-			
+	
 		}
 		if (message != null) {
 			Sms sms = new Sms();
@@ -262,7 +241,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
 				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]));
+            		Voucher voucher = voucherDao.findById(Integer.parseInt(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()));
@@ -375,13 +354,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
 		return operationMessageDao;
 	}
 
-	public VoucherDao getVoucherDao() {
-		return voucherDao;
-	}
 
-	public void setVoucherDao(VoucherDao voucherDao) {
-		this.voucherDao = voucherDao;
-	}
 
 	public void setOperationMessageDao(OperationMessageDao operationMessageDao) {
 		this.operationMessageDao = operationMessageDao;