From 7e3d4837b8464c32c4c25f40eb01222a8759eeb9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 10:57:56 +0800
Subject: [PATCH] 删除PidOrder相关代码
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 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..19b3879 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,30 @@
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.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.OrderItemServcie;
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 {
@@ -79,7 +79,7 @@
private OrderItemMapper orderItemMapper;
@Resource
- private PidOrderDao pidOrderDao;
+ private HongBaoOrderService hongBaoOrderService;
@Resource
private ThreeSaleGiftMapper threeSaleGiftMapper;
@@ -114,10 +114,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);
--
Gitblit v1.8.0