Commit 384b9c14 by caosy

注入

parent 71388e89
......@@ -51,7 +51,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
private UserExtDao userExtDao = null;
private MallOrderConnectDao mallOrderConnectDao = null;
private MallMerchantDao mallMerchantDao = null;
private VoucherDao voucherDao = null;
// private VoucherDao voucherDao = null;
......@@ -226,7 +226,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
if (orderItems != null && orderItems.size() >= 0) {
OperationMessage operationMessage = this.getOperationMessageDao().findById(messageId);
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("[PlayTime]", orderItems.get(0).getStartTime());
message = message.replace("[ProductName]", orderItems.get(0).getProductName());
......@@ -237,31 +237,31 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
message = message.replace("[RefundAmount]", order.getLaunchRefundAmount().toPlainString());
}
}
}else{
// 体验卷赛事下单 发球场信息
System.out.println("发球场 ================>"+ "发球场");
for(String usedVoucherId: order.getVoucherIDList().split(",")){
System.out.println("usedVoucherId ================>"+ usedVoucherId);
Voucher voucher = this.voucherDao.findById(Integer.parseInt(usedVoucherId));
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);
}
}
}
// }else{
// // 体验卷赛事下单 发球场信息
// System.out.println("发球场 ================>"+ "发球场");
// for(String usedVoucherId: order.getVoucherIDList().split(",")){
// System.out.println("usedVoucherId ================>"+ usedVoucherId);
// Voucher voucher = this.voucherDao.findById(Integer.parseInt(usedVoucherId));
// 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());
if(messageId == 120){
sms.setMobileNo("19821271996");
}else{
// if(messageId == 120){
// sms.setMobileNo("19821271996");
// }else{
sms.setMobileNo(order.getContactTel());
}
// }
this.getSmsDao().save(sms);
}
}
......@@ -399,12 +399,12 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
this.eventActivityOrderItemDao = eventActivityOrderItemDao;
}
public VoucherDao getVoucherDao() {
return voucherDao;
}
public void setVoucherDao(VoucherDao voucherDao) {
this.voucherDao = voucherDao;
}
// public VoucherDao getVoucherDao() {
// return voucherDao;
// }
//
// public void setVoucherDao(VoucherDao voucherDao) {
// this.voucherDao = voucherDao;
// }
}
......@@ -84,14 +84,14 @@ public class EventActivityNotifyService extends AbstractNotifyService {
protected void doPaySuccess(Order order) {
eventCustomerInfoService.updateEventCustomerInfosByOrderId(order.getOrderId(), true);
this.sendMessage(order, 100);
if(order.getVoucherIDList() != null && !("").equals(order.getVoucherIDList())){
for(String usedVoucherId: order.getVoucherIDList().split(",")){
Voucher voucher = this.voucherService.getVoucherById(Integer.parseInt(usedVoucherId));
if(voucher.getVoucherType() == 2){
this.sendMessage(order, 120);
}
}
}
// if(order.getVoucherIDList() != null && !("").equals(order.getVoucherIDList())){
// for(String usedVoucherId: order.getVoucherIDList().split(",")){
// Voucher voucher = this.voucherService.getVoucherById(Integer.parseInt(usedVoucherId));
// if(voucher.getVoucherType() == 2){
// this.sendMessage(order, 120);
// }
// }
// }
}
/**
......
......@@ -231,7 +231,7 @@
<property name="eventActivityOrderItemDao" ref="eventActivityOrderItemDao" />
<property name="operationMessageDao" ref="operationMessageDao" />
<property name="smsDao" ref="smsDao" />
<property name="voucherDao" ref="voucherDao" />
<property name="userExtDao" ref="userExtDao" />
<property name="mallOrderConnectDao" ref="mallOrderConnectDao" />
<property name="mallMerchantDao" ref="mallMerchantDao" />
......
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