Skip to content

caosy / fun-golf-service

Go to a project
Commit f541bb6c by caosy
Options

球场短信

parent 0cfb804b
Inline Side-by-side
Showing with 35 additions and 11 deletions
src/main/java/com/ctrip/fun/golf/service/basic/OperationMessageService.java
...@@ -108,12 +108,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao, ...@@ -108,12 +108,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
sms.setMessage(message); sms.setMessage(message);
sms.setStatus(SmsStatus.NO_SEND.getKey()); sms.setStatus(SmsStatus.NO_SEND.getKey());
sms.setMessageId(System.currentTimeMillis()); sms.setMessageId(System.currentTimeMillis());
if(messageId != 120){
sms.setMobileNo(order.getContactTel()); sms.setMobileNo(order.getContactTel());
}else{
sms.setMobileNo("19821271996");
}
this.getSmsDao().save(sms); this.getSmsDao().save(sms);
} }
} }
...@@ -250,6 +245,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao, ...@@ -250,6 +245,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
if (orderItems != null && orderItems.size() >= 0) { if (orderItems != null && orderItems.size() >= 0) {
OperationMessage operationMessage = this.getOperationMessageDao().findById(messageId); OperationMessage operationMessage = this.getOperationMessageDao().findById(messageId);
message = operationMessage.getMessage(); message = operationMessage.getMessage();
if(messageId != 120){
message = message.replace("[OrderNo]", order.getOrderNo() + "").replace("[PlayDate]", DateUtil.getDateStrC(orderItems.get(0).getPlayDate())); 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("[PlayTime]", orderItems.get(0).getStartTime());
message = message.replace("[ProductName]", orderItems.get(0).getProductName()); message = message.replace("[ProductName]", orderItems.get(0).getProductName());
...@@ -260,13 +256,34 @@ public class OperationMessageService extends GenericService<OperationMessageDao, ...@@ -260,13 +256,34 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
message = message.replace("[RefundAmount]", order.getLaunchRefundAmount().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) { if (message != null) {
Sms sms = new Sms(); Sms sms = new Sms();
sms.setMessage(message); sms.setMessage(message);
sms.setStatus(SmsStatus.NO_SEND.getKey()); sms.setStatus(SmsStatus.NO_SEND.getKey());
sms.setMessageId(System.currentTimeMillis()); sms.setMessageId(System.currentTimeMillis());
if(messageId == 120){
sms.setMobileNo("19821271996");
}else{
sms.setMobileNo(order.getContactTel()); sms.setMobileNo(order.getContactTel());
}
this.getSmsDao().save(sms); this.getSmsDao().save(sms);
} }
} }
......
src/main/java/com/ctrip/fun/golf/service/payment/EventActivityNotifyService.java
...@@ -82,13 +82,12 @@ public class EventActivityNotifyService extends AbstractNotifyService { ...@@ -82,13 +82,12 @@ public class EventActivityNotifyService extends AbstractNotifyService {
protected void doPaySuccess(Order order) { protected void doPaySuccess(Order order) {
eventCustomerInfoService.updateEventCustomerInfosByOrderId(order.getOrderId(), true); eventCustomerInfoService.updateEventCustomerInfosByOrderId(order.getOrderId(), true);
this.sendMessage(order, 100); this.sendMessage(order, 100);
if(order.getVoucherIDList() != null){ if(order.getVoucherIDList() != null && !("").equals(order.getVoucherIDList())){
System.out.println("order.getVoucherIDList() ================>"+ order.getVoucherIDList()); System.out.println("order.getVoucherIDList() ================>"+ order.getVoucherIDList());
String[] split = order.getVoucherIDList().split(","); for(String usedVoucherId: order.getVoucherIDList().split(",")){
for (int i = 0; i < split.length; i++) { System.out.println("usedVoucherId ================>"+ usedVoucherId);
System.out.println("split[i] ================>"+ split[i]); Voucher voucher = this.voucherService.getVoucherById(Integer.parseInt(usedVoucherId));
Voucher voucher = voucherService.getVoucherById(Integer.valueOf(split[i])); System.out.println("voucher ================>"+ voucher);
System.out.println("voucher1 ================>"+ voucher);
if(voucher.getVoucherType() == 2){ if(voucher.getVoucherType() == 2){
this.sendMessage(order, 120); this.sendMessage(order, 120);
} }
...@@ -217,4 +216,12 @@ public class EventActivityNotifyService extends AbstractNotifyService { ...@@ -217,4 +216,12 @@ public class EventActivityNotifyService extends AbstractNotifyService {
this.eventCustomerInfoService = eventCustomerInfoService; this.eventCustomerInfoService = eventCustomerInfoService;
} }
public VoucherService getVoucherService() {
return voucherService;
}
public void setVoucherService(VoucherService voucherService) {
this.voucherService = voucherService;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment