From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java | 39 ++++++++++-----------------------------
1 files changed, 10 insertions(+), 29 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
index 9eb6697..90470af 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
@@ -6,16 +6,14 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.OrderService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
@Service
public class OrderServiceImpl implements OrderService {
@@ -32,7 +30,8 @@
@Resource
private HongBaoOrderService hongBaoOrderService;
- @Transactional(propagation = Propagation.NESTED, rollbackFor = Exception.class)
+ // @Transactional(propagation = Propagation.NESTED, rollbackFor =
+ // Exception.class)
public boolean addOrder(Order order) throws Exception {
order.setVersion(2);
WriteLock writeLock = orderLock.writeLock();
@@ -44,9 +43,12 @@
if (find != null) {
return false;
}
-
+ Integer orderType = order.getOrderType();
+ if (orderType == null) {
+ orderType = Order.ORDER_TYPE_TAOBAO;
+ }
// 鏌ユ壘鏄惁瀛樺湪鍒嗕韩璧氳鍗�
- if (hongBaoOrderService.countByOrderNoAndHongBaoType(order.getOrderId(), HongBaoV2.TYPE_SHARE_GOODS) > 0)
+ if (hongBaoOrderService.countByOrderNoAndHongBaoType(order.getOrderId(), HongBaoV2.TYPE_SHARE_GOODS, orderType) > 0)
return false;
orderMapper.insertSelective(order);
} finally {
@@ -79,31 +81,10 @@
return true;
}
- @Transactional
- public List<Order> setOrderState(final String orderid, final int orderType) {
- List<Order> orderList = orderMapper.selectOrderByOrderIdAndOrderType(orderid, orderType);
- if (orderList != null)
- for (Order order : orderList) {
- if (order.getDrawbackTime() == null || order.getDrawbackTime() <= 0) {
- Order updateOrder = new Order();
- updateOrder.setId(order.getId());
- updateOrder.setDrawbackTime(java.lang.System.currentTimeMillis());
- updateOrder.setState(Order.STATE_SHIXIAO);
- orderMapper.updateByPrimaryKeySelective(updateOrder);
- order.setDrawbackTime(updateOrder.getDrawbackTime());
- order.setState(updateOrder.getState());
- }
- }
- return orderList;
- }
-
@Override
public Order findOrderByOrderIdAndType(String orderId, int type) {
- List<Order> list = orderMapper.selectOrderByOrderIdAndOrderType(orderId, type);
- if (list.size() > 0) {
- return list.get(0);
- }
- return null;
+ Order order = orderMapper.selectOrderByOrderIdAndOrderType(orderId, type);
+ return order;
}
@Override
--
Gitblit v1.8.0