Skip to content

caosy / fun-golf-service

Go to a project
Commit b469fc76 by caosy
Options

删除发短信球场

parent c6566d7f
Inline Side-by-side
Showing with 27 additions and 27 deletions
src/main/java/com/ctrip/fun/golf/service/basic/OperationMessageService.java
...@@ -224,7 +224,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao, ...@@ -224,7 +224,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){ // 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());
...@@ -235,31 +235,31 @@ public class OperationMessageService extends GenericService<OperationMessageDao, ...@@ -235,31 +235,31 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
message = message.replace("[RefundAmount]", order.getLaunchRefundAmount().toPlainString()); message = message.replace("[RefundAmount]", order.getLaunchRefundAmount().toPlainString());
} }
} }
}else{ // }else{
// 体验卷赛事下单 发球场信息 // // 体验卷赛事下单 发球场信息
System.out.println("发球场 ================>"+ "发球场"); // System.out.println("发球场 ================>"+ "发球场");
for(String usedVoucherId: order.getVoucherIDList().split(",")){ // for(String usedVoucherId: order.getVoucherIDList().split(",")){
System.out.println("usedVoucherId ================>"+ usedVoucherId); // System.out.println("usedVoucherId ================>"+ usedVoucherId);
Voucher voucher = this.voucherDao.findById(Integer.parseInt(usedVoucherId)); // Voucher voucher = this.voucherDao.findById(Integer.parseInt(usedVoucherId));
if(voucher.getVoucherType() == 2){ // if(voucher.getVoucherType() == 2){
message = message.replace("[realName]", voucher.getRealName() + "").replace("[PlayDate]", DateUtil.getDateStrC(orderItems.get(0).getPlayDate())); // 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("[PlayTime]", orderItems.get(0).getStartTime());
message = message.replace("[ProductName]", orderItems.get(0).getProductName()); // message = message.replace("[ProductName]", orderItems.get(0).getProductName());
System.out.println("message ================>"+ message); // 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){ // if(messageId == 120){
sms.setMobileNo("19821271996"); // sms.setMobileNo("19821271996");
}else{ // }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,14 +82,14 @@ public class EventActivityNotifyService extends AbstractNotifyService { ...@@ -82,14 +82,14 @@ 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 && !("").equals(order.getVoucherIDList())){ // if(order.getVoucherIDList() != null && !("").equals(order.getVoucherIDList())){
for(String usedVoucherId: order.getVoucherIDList().split(",")){ // for(String usedVoucherId: order.getVoucherIDList().split(",")){
Voucher voucher = this.voucherService.getVoucherById(Integer.parseInt(usedVoucherId)); // Voucher voucher = this.voucherService.getVoucherById(Integer.parseInt(usedVoucherId));
if(voucher.getVoucherType() == 2){ // if(voucher.getVoucherType() == 2){
this.sendMessage(order, 120); // this.sendMessage(order, 120);
} // }
} // }
} // }
} }
/** /**
......
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