Skip to content

caosy / fun-golf-service

Go to a project
Commit 8247b58e by caosy
Options

注入

parent 384b9c14
Inline Side-by-side
Showing with 42 additions and 41 deletions
src/main/java/com/ctrip/fun/golf/service/basic/OperationMessageService.java
...@@ -51,7 +51,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao, ...@@ -51,7 +51,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
private UserExtDao userExtDao = null; private UserExtDao userExtDao = null;
private MallOrderConnectDao mallOrderConnectDao = null; private MallOrderConnectDao mallOrderConnectDao = null;
private MallMerchantDao mallMerchantDao = null; private MallMerchantDao mallMerchantDao = null;
// private VoucherDao voucherDao = null; private VoucherDao voucherDao = null;
...@@ -226,7 +226,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao, ...@@ -226,7 +226,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());
...@@ -237,31 +237,31 @@ public class OperationMessageService extends GenericService<OperationMessageDao, ...@@ -237,31 +237,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);
} }
} }
...@@ -399,12 +399,12 @@ public class OperationMessageService extends GenericService<OperationMessageDao, ...@@ -399,12 +399,12 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
this.eventActivityOrderItemDao = eventActivityOrderItemDao; this.eventActivityOrderItemDao = eventActivityOrderItemDao;
} }
// public VoucherDao getVoucherDao() { public VoucherDao getVoucherDao() {
// return voucherDao; return voucherDao;
// } }
//
// public void setVoucherDao(VoucherDao voucherDao) { public void setVoucherDao(VoucherDao voucherDao) {
// this.voucherDao = voucherDao; this.voucherDao = voucherDao;
// } }
} }
src/main/java/com/ctrip/fun/golf/service/payment/EventActivityNotifyService.java
...@@ -13,6 +13,7 @@ import com.ctrip.fun.common.vo.operation.ResourceConfirmTypeEnum; ...@@ -13,6 +13,7 @@ import com.ctrip.fun.common.vo.operation.ResourceConfirmTypeEnum;
import com.ctrip.fun.common.vo.payment.NotifyRequestBean; import com.ctrip.fun.common.vo.payment.NotifyRequestBean;
import com.ctrip.fun.common.vo.product.ResourceCategoryEnum; import com.ctrip.fun.common.vo.product.ResourceCategoryEnum;
import com.ctrip.fun.common.vo.product.ResourceInventoryQuery; import com.ctrip.fun.common.vo.product.ResourceInventoryQuery;
import com.ctrip.fun.golf.dao.basic.VoucherDao;
import com.ctrip.fun.golf.dao.order.EventActivityOrderItemDao; import com.ctrip.fun.golf.dao.order.EventActivityOrderItemDao;
import com.ctrip.fun.golf.domain.basic.Voucher; import com.ctrip.fun.golf.domain.basic.Voucher;
import com.ctrip.fun.golf.domain.order.EventActivityOrderItem; import com.ctrip.fun.golf.domain.order.EventActivityOrderItem;
...@@ -40,7 +41,7 @@ public class EventActivityNotifyService extends AbstractNotifyService { ...@@ -40,7 +41,7 @@ public class EventActivityNotifyService extends AbstractNotifyService {
private OperationMessageService operationMessageService; private OperationMessageService operationMessageService;
private VoucherService voucherService; private VoucherDao voucherDao ;
...@@ -84,14 +85,14 @@ public class EventActivityNotifyService extends AbstractNotifyService { ...@@ -84,14 +85,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 = voucherDao.findById(Integer.parseInt(usedVoucherId));
// if(voucher.getVoucherType() == 2){ if(voucher.getVoucherType() == 2){
// this.sendMessage(order, 120); this.sendMessage(order, 120);
// } }
// } }
// } }
} }
/** /**
...@@ -215,11 +216,11 @@ public class EventActivityNotifyService extends AbstractNotifyService { ...@@ -215,11 +216,11 @@ public class EventActivityNotifyService extends AbstractNotifyService {
this.eventCustomerInfoService = eventCustomerInfoService; this.eventCustomerInfoService = eventCustomerInfoService;
} }
public VoucherService getVoucherService() { public VoucherDao getVoucherDao() {
return voucherService; return voucherDao;
} }
public void setVoucherService(VoucherService voucherService) { public void setVoucherDao(VoucherDao voucherDao) {
this.voucherService = voucherService; this.voucherDao = voucherDao;
} }
} }
src/main/resources/basic.spring.xml
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
<property name="eventActivityOrderItemDao" ref="eventActivityOrderItemDao" /> <property name="eventActivityOrderItemDao" ref="eventActivityOrderItemDao" />
<property name="operationMessageDao" ref="operationMessageDao" /> <property name="operationMessageDao" ref="operationMessageDao" />
<property name="smsDao" ref="smsDao" /> <property name="smsDao" ref="smsDao" />
<property name="voucherDao" ref="voucherDao" />
<property name="userExtDao" ref="userExtDao" /> <property name="userExtDao" ref="userExtDao" />
<property name="mallOrderConnectDao" ref="mallOrderConnectDao" /> <property name="mallOrderConnectDao" ref="mallOrderConnectDao" />
<property name="mallMerchantDao" ref="mallMerchantDao" /> <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