Skip to content

caosy / fun-golf-service

Go to a project
Commit d25f8093 by Huang Linyu
Options

Merge branch 'release' of 192.168.10.6:caosy/fun-golf-service into release

parents 3f79626a f9773570
Inline Side-by-side
Showing with 57 additions and 20 deletions
src/main/java/com/ctrip/fun/golf/dao/basic/VoucherDao.java
...@@ -73,7 +73,6 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> { ...@@ -73,7 +73,6 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> {
return this.getEntities(hsql); return this.getEntities(hsql);
} }
@Deprecated
public int useVoucher(String ids, Long orderNo) { public int useVoucher(String ids, Long orderNo) {
String sql = "update Voucher set used=" + VourcherStatusEnum.USED.getValue() String sql = "update Voucher set used=" + VourcherStatusEnum.USED.getValue()
+ " , useDate=now() , orderNo=" + orderNo + " where used=0 and id in (" + " , useDate=now() , orderNo=" + orderNo + " where used=0 and id in ("
...@@ -81,6 +80,11 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> { ...@@ -81,6 +80,11 @@ public class VoucherDao extends GenericHibernateDao<Voucher, Integer> {
Query query = getSession().createQuery(sql); Query query = getSession().createQuery(sql);
return query.executeUpdate(); return query.executeUpdate();
} }
public int useVoucher(String id,BigDecimal amount){
String hql = "update Voucher set amount="+amount+" where used=0 and id ="+id;
Query query = getSession().createQuery(hql);
return query.executeUpdate();
}
public int useVoucher(String id,Long orderNo,BigDecimal amount){ public int useVoucher(String id,Long orderNo,BigDecimal amount){
String hql = "update Voucher set used=" + VourcherStatusEnum.USED.getValue() String hql = "update Voucher set used=" + VourcherStatusEnum.USED.getValue()
+ " , useDate=now() , orderNo=" + orderNo + ",amount="+amount+" where used=0 and id ="+id; + " , useDate=now() , orderNo=" + orderNo + ",amount="+amount+" where used=0 and id ="+id;
......
src/main/java/com/ctrip/fun/golf/service/basic/VoucherService.java
...@@ -162,7 +162,7 @@ public class VoucherService { ...@@ -162,7 +162,7 @@ public class VoucherService {
* @param i * @param i
* @param integer * @param integer
*/ */
@Deprecated /* @Deprecated
public void useVoucher(int count, long orderNO, String voucherIds, Integer resourceId, Integer productId, Date playDate ) { public void useVoucher(int count, long orderNO, String voucherIds, Integer resourceId, Integer productId, Date playDate ) {
String voucherIdArr[] = voucherIds.split(","); String voucherIdArr[] = voucherIds.split(",");
int useCount = 0; int useCount = 0;
...@@ -187,7 +187,7 @@ public class VoucherService { ...@@ -187,7 +187,7 @@ public class VoucherService {
throw new VoucherException(-10, "抵用劵校验不通过"); throw new VoucherException(-10, "抵用劵校验不通过");
} }
} }*/
/** /**
* 校验抵用劵是否可以使用,事务传播级别为REQUEST_NEW * 校验抵用劵是否可以使用,事务传播级别为REQUEST_NEW
...@@ -196,35 +196,51 @@ public class VoucherService { ...@@ -196,35 +196,51 @@ public class VoucherService {
* @param orderNO * @param orderNO
* @param voucherIds * @param voucherIds
*/ */
public void userVoucher(int count, long orderNO, String voucherIds) { /* public void userVoucher(int count, long orderNO, String voucherIds) {
String voucherIdArr[] = voucherIds.split(","); String voucherIdArr[] = voucherIds.split(",");
int useCount = 0; int useCount = 0;
for(String id :voucherIdArr){ for(String id :voucherIdArr){
Voucher voucher = voucherDao.findById(Integer.parseInt(id)); Voucher voucher = voucherDao.findById(Integer.parseInt(id));
VoucherRule rule = voucherRuleDao.findById(voucher.getRuleId()); VoucherRule rule = voucherRuleDao.findById(voucher.getRuleId());
Order order = orderDao.getOrderByOrderNo(orderNO); Order order = orderDao.getOrderByOrderNo(orderNO);
List<EventActivityOrderItem> eventActivityOrderItemList = eventActivityOrderItemDao.getOrderItemByOrderId(order.getOrderId()); if(rule != null && 1== rule.getMultiple()){
if(eventActivityOrderItemList.size()>0){ List<EventActivityOrderItem> eventActivityOrderItemList = eventActivityOrderItemDao.getOrderItemByOrderId(order.getOrderId());
EventActivityOrderItem item = eventActivityOrderItemList.get(0); if(eventActivityOrderItemList.size()>0){
MultipleCourseConditionBean bean = null; EventActivityOrderItem item = eventActivityOrderItemList.get(0);
try { MultipleCourseConditionBean bean = null;
bean = (MultipleCourseConditionBean)JsonUtil.readValue(rule.getConditionJson(), Class.forName(rule.getConditionBean())); try {
} catch (ClassNotFoundException e) { bean = (MultipleCourseConditionBean)JsonUtil.readValue(rule.getConditionJson(), Class.forName(rule.getConditionBean()));
e.printStackTrace(); } catch (ClassNotFoundException e) {
} e.printStackTrace();
CourseRuleConditionBaseBean t = new CourseRuleConditionBaseBean(); }
t.setPlayDate(item.getPlayDate()); CourseRuleConditionBaseBean t = new CourseRuleConditionBaseBean();
t.setResourceId(item.getResourceId()); t.setPlayDate(item.getPlayDate());
t.setProductId(item.getCourseProductId()); t.setResourceId(item.getResourceId());
BigDecimal amount = bean.getEnableAmount(t); t.setProductId(item.getCourseProductId());
BigDecimal amount = bean.getEnableAmount(t);
useCount += voucherDao.useVoucher(id, orderNO,amount);
}
useCount += voucherDao.useVoucher(id, orderNO,amount); }else{
//只更新y
useCount = voucherDao.useVoucher(voucherIds, orderNO);
break;
} }
} }
if (count != useCount) { if (count != useCount) {
throw new VoucherException(-10, "抵用劵校验不通过"); throw new VoucherException(-10, "抵用劵校验不通过");
} }
}*/
public void userVoucher(int count, long orderNO, String voucherIds) {
int useCount = voucherDao.useVoucher(voucherIds, orderNO);
if (count != useCount) {
throw new VoucherException(-10, "抵用劵校验不通过");
}
} }
/** /**
......
src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java
...@@ -933,6 +933,19 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex ...@@ -933,6 +933,19 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
order.setOrderUserStatus(UserOrderStatusEnum.WAITING_PAY.getValue()); order.setOrderUserStatus(UserOrderStatusEnum.WAITING_PAY.getValue());
getOrderDao().update(order); getOrderDao().update(order);
placeOrderResponseBean.setPayParameter(JsonUtil.writeValueAsString(result.getBody())); placeOrderResponseBean.setPayParameter(JsonUtil.writeValueAsString(result.getBody()));
//为了多球场抵用券，所以在这一步就更新bsc_voucher中的amount
if (order.getVoucherAmount().doubleValue() > 0) {
List<VoucherItemBean> beanlist = abstractOrderBean.getVoucherList();
int usedCount = 0;
if(beanlist.size()>0){
for(VoucherItemBean bean: beanlist){
usedCount += voucherDao.useVoucher(bean.getId()+"", bean.getAmount());
}
if(usedCount != order.getVoucherCount()){
throw new OrderException(-100, "您的抵用劵使用错误");
}
}
}
} else { } else {
// 注释掉发起支付的时候失败，导致库存多余的问题 // 注释掉发起支付的时候失败，导致库存多余的问题
...@@ -957,9 +970,13 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex ...@@ -957,9 +970,13 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
} }
if (order.getVoucherAmount().doubleValue() > 0) { if (order.getVoucherAmount().doubleValue() > 0) {
List<VoucherItemBean> beanlist = abstractOrderBean.getVoucherList(); List<VoucherItemBean> beanlist = abstractOrderBean.getVoucherList();
int usedCount = 0;
if(beanlist.size()>0){ if(beanlist.size()>0){
for(VoucherItemBean bean: beanlist){ for(VoucherItemBean bean: beanlist){
voucherDao.useVoucher(bean.getId()+"", order.getOrderNo(), bean.getAmount()); usedCount += voucherDao.useVoucher(bean.getId()+"", order.getOrderNo(), bean.getAmount());
}
if(usedCount != order.getVoucherCount()){
throw new OrderException(-100, "您的抵用劵使用错误");
} }
} }
} }
......
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