Skip to content

caosy / fun-golf-service

Go to a project
Commit 48a5dcd7 by caosy
Options

调用voucherDao

parent ef2ad083
Inline Side-by-side
Showing with 23 additions and 4 deletions
src/main/java/com/ctrip/fun/golf/service/basic/OperationMessageService.java
...@@ -82,9 +82,12 @@ public class OperationMessageService extends GenericService<OperationMessageDao, ...@@ -82,9 +82,12 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
} }
}else{ }else{
//发球场 //发球场
System.out.println("发球场 ================>"+ "发球场");
String[] split = order.getVoucherIDList().split(","); String[] split = order.getVoucherIDList().split(",");
for (int i = 0; i < split.length; i++) { 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.valueOf(split[i]));
System.out.println("voucher ================>"+ voucher);
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()));
if (orderItems.get(0).getRealPlayTime() != null && !"".equals(orderItems.get(0).getRealPlayTime())) { if (orderItems.get(0).getRealPlayTime() != null && !"".equals(orderItems.get(0).getRealPlayTime())) {
...@@ -93,6 +96,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao, ...@@ -93,6 +96,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
message = message.replace("[PlayTime]", DateUtil.int2TeeTime(Integer.parseInt(orderItems.get(0).getTeeTime()))); message = message.replace("[PlayTime]", DateUtil.int2TeeTime(Integer.parseInt(orderItems.get(0).getTeeTime())));
} }
message = message.replace("[ProductName]", orderItems.get(0).getProductName()); message = message.replace("[ProductName]", orderItems.get(0).getProductName());
System.out.println("message ================>"+ message);
} }
} }
......
src/main/java/com/ctrip/fun/golf/service/basic/VoucherService.java
...@@ -119,6 +119,18 @@ public class VoucherService { ...@@ -119,6 +119,18 @@ public class VoucherService {
this.voucherDao = voucherDao; this.voucherDao = voucherDao;
} }
/**
* 根据id 获取卷信息
* @param id
* @return
*/
public Voucher getVoucherById (int id){
Voucher voucher = voucherDao.findById(id);
return voucher;
}
/** /**
* 删除现金券，并同步规则中的uid * 删除现金券，并同步规则中的uid
* *
......
src/main/java/com/ctrip/fun/golf/service/order/EventActivityOrderService.java
...@@ -57,7 +57,6 @@ import com.ctrip.fun.common.vo.product.ResourceInventoryQuery; ...@@ -57,7 +57,6 @@ import com.ctrip.fun.common.vo.product.ResourceInventoryQuery;
import com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum; import com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum;
import com.ctrip.fun.common.vo.product.ResourceRealTimeTeeTimeTypeEnum; import com.ctrip.fun.common.vo.product.ResourceRealTimeTeeTimeTypeEnum;
import com.ctrip.fun.golf.dao.assemble.AsmCourseResourceDao; import com.ctrip.fun.golf.dao.assemble.AsmCourseResourceDao;
import com.ctrip.fun.golf.dao.basic.VoucherDao;
import com.ctrip.fun.golf.dao.notification.EventDao; import com.ctrip.fun.golf.dao.notification.EventDao;
import com.ctrip.fun.golf.dao.operation.SupplierDao; import com.ctrip.fun.golf.dao.operation.SupplierDao;
import com.ctrip.fun.golf.dao.order.EventActivityOrderItemDao; import com.ctrip.fun.golf.dao.order.EventActivityOrderItemDao;
...@@ -83,6 +82,7 @@ import com.ctrip.fun.golf.domain.product.ResourcePrice; ...@@ -83,6 +82,7 @@ import com.ctrip.fun.golf.domain.product.ResourcePrice;
import com.ctrip.fun.golf.domain.user.UserExt; import com.ctrip.fun.golf.domain.user.UserExt;
import com.ctrip.fun.golf.exceptions.OrderException; import com.ctrip.fun.golf.exceptions.OrderException;
import com.ctrip.fun.golf.service.basic.OperationMessageService; import com.ctrip.fun.golf.service.basic.OperationMessageService;
import com.ctrip.fun.golf.service.basic.VoucherService;
import com.ctrip.fun.golf.service.product.CourseResourceService; import com.ctrip.fun.golf.service.product.CourseResourceService;
import com.ctrip.fun.golf.service.user.UserService; import com.ctrip.fun.golf.service.user.UserService;
import com.ctrip.fun.golf.utils.JobUtil; import com.ctrip.fun.golf.utils.JobUtil;
...@@ -135,7 +135,7 @@ public class EventActivityOrderService extends ...@@ -135,7 +135,7 @@ public class EventActivityOrderService extends
private EventCustomerInfoService eventCustomerInfoService = null; private EventCustomerInfoService eventCustomerInfoService = null;
@Autowired @Autowired
private VoucherDao voucherDao ; private VoucherService voucherService = null;
public Order findByResourceId(String uid, int resourceId, Date playDate) { public Order findByResourceId(String uid, int resourceId, Date playDate) {
...@@ -316,9 +316,12 @@ public class EventActivityOrderService extends ...@@ -316,9 +316,12 @@ public class EventActivityOrderService extends
if (null != eventActivityOrderItemList && eventActivityOrderItemList.size() > 0) { if (null != eventActivityOrderItemList && eventActivityOrderItemList.size() > 0) {
this.sendMessage(order, 5); this.sendMessage(order, 5);
if(order.getVoucherIDList() != null){ if(order.getVoucherIDList() != null){
System.out.println("order.getVoucherIDList() ================>"+ order.getVoucherIDList());
String[] split = order.getVoucherIDList().split(","); String[] split = order.getVoucherIDList().split(",");
for (int i = 0; i < split.length; i++) { for (int i = 0; i < split.length; i++) {
Voucher voucher = voucherDao.findById(Integer.valueOf(split[i])); System.out.println("split[i] ================>"+ split[i]);
Voucher voucher = voucherService.getVoucherById(Integer.valueOf(split[i]));
System.out.println("voucher1 ================>"+ voucher);
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