From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java | 94 ++--------------------------------------------
1 files changed, 5 insertions(+), 89 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 4d38958..7b2ab84 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
@@ -20,30 +20,23 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import org.yeshi.utils.NumberUtil;
import com.yeshi.fanli.dao.mybatis.ThreeSaleGiftMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.dao.order.OrderDao;
-import com.yeshi.fanli.dao.order.PidOrderDao;
-import com.yeshi.fanli.entity.bus.user.HongBao;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.Order;
-import com.yeshi.fanli.entity.bus.user.OrderItem;
-import com.yeshi.fanli.entity.bus.user.ThreeSaleGift;
-import com.yeshi.fanli.entity.taobao.PidOrder;
-import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
-import com.yeshi.fanli.exception.ObjectStateException;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleGiftService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.order.OrderItemServcie;
+import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.user.ShareManageService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.Utils;
-import org.yeshi.utils.NumberUtil;
@Service
public class OrderServiceImpl implements OrderService {
@@ -58,16 +51,10 @@
private ShareManageService shareManageService;
@Resource
- private HongBaoService hongBaoService;
-
- @Resource
private ConfigService configService;
@Resource
private ThreeSaleSerivce threeSaleSerivce;
-
- @Resource
- private OrderItemServcie orderItemService;
@Resource
private ThreeSaleGiftService threeSaleGiftService;
@@ -79,7 +66,7 @@
private OrderItemMapper orderItemMapper;
@Resource
- private PidOrderDao pidOrderDao;
+ private HongBaoOrderService hongBaoOrderService;
@Resource
private ThreeSaleGiftMapper threeSaleGiftMapper;
@@ -114,10 +101,7 @@
return false;
}
// 鏌ユ壘鏄惁瀛樺湪鍒嗕韩璧氳鍗�
-
- List<PidOrder> orderList = pidOrderDao.list("from PidOrder p where p.orderId=?",
- new Serializable[] { order.getOrderId() });
- if (orderList != null && orderList.size() > 0)
+ if (hongBaoOrderService.countByOrderNoAndHongBaoType(order.getOrderId(), HongBaoV2.TYPE_SHARE_GOODS) > 0)
return false;
orderDao.save(order);
@@ -331,64 +315,6 @@
});
}
- @Transactional(propagation = Propagation.REQUIRED)
- public void failureOrder(final String orderid, final int orderType) throws ObjectStateException {
- // 澶辨晥鐨勮鍗�
- List<Order> orderList = orderService.setOrderState(orderid, orderType);
- if (orderList != null && orderList.size() > 0) {
- for (Order order : orderList) {
- // 鎵惧埌杩欎釜澶辨晥璁㈠崟浠ュ墠鍙戠殑绾㈠寘
- List<HongBao> hongBaoList = hongBaoService.findHongBaoByOrderList(order.getId());
- if (hongBaoList != null)
- for (HongBao hongBao : hongBaoList)
- // 鎶婄孩鍖呮悶鎴愬け鏁堢殑,鍒嗛攢鐨勭孩鍖呬篃瑕佹悶澶辨晥
- hongBaoService.relevantInvalid(hongBao.getId());
- }
- }
- }
-
- @Transactional
- public void failureOrderWithWeiQuan(final String orderid, final int orderType) throws ObjectStateException {
- // 澶辨晥鐨勮鍗�
- List<Order> orderList = orderService.setOrderState(orderid, orderType);
- if (orderList != null && orderList.size() > 0) {
- for (Order order : orderList) {
- // if (order.getState() == Order.STATE_SHIXIAO)
- // continue;
- // 鎵惧埌杩欎釜澶辨晥璁㈠崟浠ュ墠鍙戠殑绾㈠寘
- List<HongBao> hongBaoList = hongBaoService.findHongBaoByOrderList(order.getId());
- if (hongBaoList != null)
- for (HongBao hongBao : hongBaoList)
- // 鎶婄孩鍖呮悶鎴愬け鏁堢殑,鍒嗛攢鐨勭孩鍖呬篃瑕佹悶澶辨晥
- hongBaoService.relevantInvalidVersion2(hongBao.getId());
-
- List<OrderItem> orderItremList = orderItemService.findByOrderId(order.getId());
- if (orderItremList != null)
- for (OrderItem orderItem : orderItremList) {
- OrderItem updateOrderItem = new OrderItem(orderItem.getId());
-
- updateOrderItem.setState(OrderItem.STATE_TUIKUAN);
- // 鏌ヨ
- List<ThreeSaleGift> giftList = threeSaleGiftService.findThreeSaleGiftList(orderItem.getId());
- for (ThreeSaleGift tsg : giftList) {
- if (tsg.getState().intValue() != OrderItem.STATE_DAOZHANG
- && tsg.getState().intValue() != OrderItem.STATE_SHOUHOU) {
- ThreeSaleGift updateTsg = new ThreeSaleGift();
- updateTsg.setId(tsg.getId());
- updateTsg.setState(OrderItem.STATE_TUIKUAN);
- threeSaleGiftMapper.updateByPrimaryKeySelective(updateTsg);
- }
- }
- orderItemMapper.updateByPrimaryKeySelective(updateOrderItem);
- }
- Order updateOrder = new Order();
- updateOrder.setId(order.getId());
- updateOrder.setState(Order.STATE_SHIXIAO);
- orderMapper.updateByPrimaryKeySelective(updateOrder);
- }
- }
- }
-
@Transactional
public List<Order> setOrderState(final String orderid, final int orderType) {
List<Order> orderList = orderMapper.selectOrderByOrderIdAndOrderType(orderid, orderType);
@@ -474,16 +400,6 @@
List<Order> list = orderDao.list("from Order or where or.version=1");
return list;
- }
-
- // 澶勭悊缁存潈璁㈠崟
- @Override
- public void update(TaoBaoWeiQuanOrder order) {
- try {
- failureOrderWithWeiQuan(order.getOrderId(), Order.ORDER_TYPE_TAOBAO);
- } catch (ObjectStateException e) {
- e.printStackTrace();
- }
}
@Override
--
Gitblit v1.8.0